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.48 by jsr166, Mon Jun 2 19:07:14 2014 UTC vs.
Revision 1.105 by dl, Thu Sep 3 16:30:05 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.TimeUnit;
25   import java.util.concurrent.atomic.AtomicInteger;
26 < 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;
26 > import java.util.concurrent.atomic.AtomicReference;
27   import java.util.function.BiConsumer;
30 import java.util.function.Function;
28   import java.util.function.BiFunction;
29 + import java.util.function.Consumer;
30 + import java.util.function.Function;
31 + import java.util.function.Supplier;
32 +
33 + import junit.framework.Test;
34 + import junit.framework.TestSuite;
35  
36   public class CompletableFutureTest extends JSR166TestCase {
37  
38      public static void main(String[] args) {
39 <        junit.textui.TestRunner.run(suite());
39 >        main(suite(), args);
40      }
41      public static Test suite() {
42          return new TestSuite(CompletableFutureTest.class);
# Line 44 | Line 47 | public class CompletableFutureTest exten
47      void checkIncomplete(CompletableFuture<?> f) {
48          assertFalse(f.isDone());
49          assertFalse(f.isCancelled());
50 <        assertTrue(f.toString().contains("[Not completed]"));
50 >        assertTrue(f.toString().contains("Not completed"));
51          try {
52              assertNull(f.getNow(null));
53          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 57 | Line 60 | public class CompletableFutureTest exten
60      }
61  
62      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
63 <        try {
64 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
63 >        checkTimedGet(f, value);
64 >
65          try {
66              assertEquals(value, f.join());
67          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 76 | Line 78 | public class CompletableFutureTest exten
78      }
79  
80      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
81 +        long startTime = System.nanoTime();
82 +        long timeoutMillis = LONG_DELAY_MS;
83          try {
84 <            f.get(LONG_DELAY_MS, MILLISECONDS);
84 >            f.get(timeoutMillis, MILLISECONDS);
85              shouldThrow();
86          } catch (ExecutionException success) {
87              assertTrue(success.getCause() instanceof CFException);
88          } catch (Throwable fail) { threadUnexpectedException(fail); }
89 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
90 +
91          try {
92              f.join();
93              shouldThrow();
# Line 105 | Line 111 | public class CompletableFutureTest exten
111          assertTrue(f.toString().contains("[Completed exceptionally]"));
112      }
113  
114 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
115 <                                              CFException ex) {
114 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
115 >                                                      Throwable ex) {
116 >        long startTime = System.nanoTime();
117 >        long timeoutMillis = LONG_DELAY_MS;
118          try {
119 <            f.get(LONG_DELAY_MS, MILLISECONDS);
119 >            f.get(timeoutMillis, MILLISECONDS);
120              shouldThrow();
121          } catch (ExecutionException success) {
122              assertSame(ex, success.getCause());
123          } catch (Throwable fail) { threadUnexpectedException(fail); }
124 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
125 +
126          try {
127              f.join();
128              shouldThrow();
# Line 131 | Line 141 | public class CompletableFutureTest exten
141          } catch (ExecutionException success) {
142              assertSame(ex, success.getCause());
143          } catch (Throwable fail) { threadUnexpectedException(fail); }
144 +
145          assertTrue(f.isDone());
146          assertFalse(f.isCancelled());
147          assertTrue(f.toString().contains("[Completed exceptionally]"));
148      }
149  
150 +    <U> void checkCompletedExceptionallyWithTimeout(CompletableFuture<U> f) {
151 +        long startTime = System.nanoTime();
152 +        long timeoutMillis = LONG_DELAY_MS;
153 +        try {
154 +            f.get(timeoutMillis, MILLISECONDS);
155 +            shouldThrow();
156 +        } catch (ExecutionException ex) {
157 +            assertTrue(ex.getCause() instanceof TimeoutException);
158 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
159 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
160 +
161 +        try {
162 +            f.join();
163 +            shouldThrow();
164 +        } catch (Throwable ex) {
165 +            assertTrue(ex.getCause() instanceof TimeoutException);
166 +        }
167 +
168 +        try {
169 +            f.getNow(null);
170 +            shouldThrow();
171 +        } catch (Throwable ex) {
172 +            assertTrue(ex.getCause() instanceof TimeoutException);
173 +        }
174 +
175 +        try {
176 +            f.get();
177 +            shouldThrow();
178 +        } catch (ExecutionException ex) {
179 +            assertTrue(ex.getCause() instanceof TimeoutException);
180 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
181 +
182 +        assertTrue(f.isDone());
183 +        assertFalse(f.isCancelled());
184 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
185 +    }
186 +
187 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
188 +                                                Throwable ex) {
189 +        checkCompletedExceptionallyWithRootCause(f, ex);
190 +        try {
191 +            CompletableFuture<Throwable> spy = f.handle
192 +                ((U u, Throwable t) -> t);
193 +            assertTrue(spy.join() instanceof CompletionException);
194 +            assertSame(ex, spy.join().getCause());
195 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
196 +    }
197 +
198 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
199 +        checkCompletedExceptionallyWithRootCause(f, ex);
200 +        try {
201 +            CompletableFuture<Throwable> spy = f.handle
202 +                ((U u, Throwable t) -> t);
203 +            assertSame(ex, spy.join());
204 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
205 +    }
206 +
207      void checkCancelled(CompletableFuture<?> f) {
208 +        long startTime = System.nanoTime();
209 +        long timeoutMillis = LONG_DELAY_MS;
210          try {
211 <            f.get(LONG_DELAY_MS, MILLISECONDS);
211 >            f.get(timeoutMillis, MILLISECONDS);
212              shouldThrow();
213          } catch (CancellationException success) {
214          } catch (Throwable fail) { threadUnexpectedException(fail); }
215 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
216 +
217          try {
218              f.join();
219              shouldThrow();
# Line 162 | Line 234 | public class CompletableFutureTest exten
234      }
235  
236      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
237 +        long startTime = System.nanoTime();
238 +        long timeoutMillis = LONG_DELAY_MS;
239          try {
240 <            f.get(LONG_DELAY_MS, MILLISECONDS);
240 >            f.get(timeoutMillis, MILLISECONDS);
241              shouldThrow();
242          } catch (ExecutionException success) {
243              assertTrue(success.getCause() instanceof CancellationException);
244          } catch (Throwable fail) { threadUnexpectedException(fail); }
245 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
246 +
247          try {
248              f.join();
249              shouldThrow();
# Line 206 | Line 282 | public class CompletableFutureTest exten
282       * isCancelled, join, get, and getNow
283       */
284      public void testComplete() {
285 +        for (Integer v1 : new Integer[] { 1, null })
286 +    {
287          CompletableFuture<Integer> f = new CompletableFuture<>();
288          checkIncomplete(f);
289 <        f.complete(one);
290 <        checkCompletedNormally(f, one);
291 <    }
289 >        assertTrue(f.complete(v1));
290 >        assertFalse(f.complete(v1));
291 >        checkCompletedNormally(f, v1);
292 >    }}
293  
294      /**
295       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 297 | public class CompletableFutureTest exten
297       */
298      public void testCompleteExceptionally() {
299          CompletableFuture<Integer> f = new CompletableFuture<>();
300 +        CFException ex = new CFException();
301          checkIncomplete(f);
302 <        f.completeExceptionally(new CFException());
303 <        checkCompletedWithWrappedCFException(f);
302 >        f.completeExceptionally(ex);
303 >        checkCompletedExceptionally(f, ex);
304      }
305  
306      /**
# Line 228 | Line 308 | public class CompletableFutureTest exten
308       * methods isDone, isCancelled, join, get, and getNow
309       */
310      public void testCancel() {
311 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
312 +    {
313          CompletableFuture<Integer> f = new CompletableFuture<>();
314          checkIncomplete(f);
315 <        assertTrue(f.cancel(true));
315 >        assertTrue(f.cancel(mayInterruptIfRunning));
316 >        assertTrue(f.cancel(mayInterruptIfRunning));
317 >        assertTrue(f.cancel(!mayInterruptIfRunning));
318          checkCancelled(f);
319 <    }
319 >    }}
320  
321      /**
322       * obtrudeValue forces completion with given value
# Line 240 | Line 324 | public class CompletableFutureTest exten
324      public void testObtrudeValue() {
325          CompletableFuture<Integer> f = new CompletableFuture<>();
326          checkIncomplete(f);
327 <        f.complete(one);
327 >        assertTrue(f.complete(one));
328          checkCompletedNormally(f, one);
329          f.obtrudeValue(three);
330          checkCompletedNormally(f, three);
# Line 261 | Line 345 | public class CompletableFutureTest exten
345       * obtrudeException forces completion with given exception
346       */
347      public void testObtrudeException() {
348 <        CompletableFuture<Integer> f = new CompletableFuture<>();
349 <        checkIncomplete(f);
350 <        f.complete(one);
351 <        checkCompletedNormally(f, one);
352 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
348 >        for (Integer v1 : new Integer[] { 1, null })
349 >    {
350 >        CFException ex;
351 >        CompletableFuture<Integer> f;
352 >
353          f = new CompletableFuture<>();
354 <        f.obtrudeException(new CFException());
355 <        checkCompletedWithWrappedCFException(f);
354 >        assertTrue(f.complete(v1));
355 >        for (int i = 0; i < 2; i++) {
356 >            f.obtrudeException(ex = new CFException());
357 >            checkCompletedExceptionally(f, ex);
358 >        }
359 >
360          f = new CompletableFuture<>();
361 +        for (int i = 0; i < 2; i++) {
362 +            f.obtrudeException(ex = new CFException());
363 +            checkCompletedExceptionally(f, ex);
364 +        }
365 +
366 +        f = new CompletableFuture<>();
367 +        f.completeExceptionally(ex = new CFException());
368 +        f.obtrudeValue(v1);
369 +        checkCompletedNormally(f, v1);
370 +        f.obtrudeException(ex = new CFException());
371 +        checkCompletedExceptionally(f, ex);
372          f.completeExceptionally(new CFException());
373 <        f.obtrudeValue(four);
374 <        checkCompletedNormally(f, four);
375 <        f.obtrudeException(new CFException());
376 <        checkCompletedWithWrappedCFException(f);
279 <    }
373 >        checkCompletedExceptionally(f, ex);
374 >        assertFalse(f.complete(v1));
375 >        checkCompletedExceptionally(f, ex);
376 >    }}
377  
378      /**
379       * getNumberOfDependents returns number of dependent tasks
380       */
381      public void testGetNumberOfDependents() {
382 +        for (ExecutionMode m : ExecutionMode.values())
383 +        for (Integer v1 : new Integer[] { 1, null })
384 +    {
385          CompletableFuture<Integer> f = new CompletableFuture<>();
386          assertEquals(0, f.getNumberOfDependents());
387 <        CompletableFuture g = f.thenRun(new Noop());
387 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
388          assertEquals(1, f.getNumberOfDependents());
389          assertEquals(0, g.getNumberOfDependents());
390 <        CompletableFuture h = f.thenRun(new Noop());
390 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
391          assertEquals(2, f.getNumberOfDependents());
392 <        f.complete(1);
392 >        assertEquals(0, h.getNumberOfDependents());
393 >        assertTrue(f.complete(v1));
394          checkCompletedNormally(g, null);
395 +        checkCompletedNormally(h, null);
396          assertEquals(0, f.getNumberOfDependents());
397          assertEquals(0, g.getNumberOfDependents());
398 <    }
398 >        assertEquals(0, h.getNumberOfDependents());
399 >    }}
400  
401      /**
402       * toString indicates current completion state
# Line 304 | Line 407 | public class CompletableFutureTest exten
407          f = new CompletableFuture<String>();
408          assertTrue(f.toString().contains("[Not completed]"));
409  
410 <        f.complete("foo");
410 >        assertTrue(f.complete("foo"));
411          assertTrue(f.toString().contains("[Completed normally]"));
412  
413          f = new CompletableFuture<String>();
414 <        f.completeExceptionally(new IndexOutOfBoundsException());
414 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
415          assertTrue(f.toString().contains("[Completed exceptionally]"));
416 +
417 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
418 +            f = new CompletableFuture<String>();
419 +            assertTrue(f.cancel(mayInterruptIfRunning));
420 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
421 +        }
422      }
423  
424      /**
# Line 320 | Line 429 | public class CompletableFutureTest exten
429          checkCompletedNormally(f, "test");
430      }
431  
432 <    // Choose non-commutative actions for better coverage
432 >    abstract class CheckedAction {
433 >        int invocationCount = 0;
434 >        final ExecutionMode m;
435 >        CheckedAction(ExecutionMode m) { this.m = m; }
436 >        void invoked() {
437 >            m.checkExecutionMode();
438 >            assertEquals(0, invocationCount++);
439 >        }
440 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
441 >        void assertInvoked() { assertEquals(1, invocationCount); }
442 >    }
443  
444 <    // A non-commutative function that handles and produces null values as well.
445 <    static Integer subtract(Integer x, Integer y) {
446 <        return (x == null && y == null) ? null :
447 <            ((x == null) ? 42 : x.intValue())
448 <            - ((y == null) ? 99 : y.intValue());
444 >    abstract class CheckedIntegerAction extends CheckedAction {
445 >        Integer value;
446 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
447 >        void assertValue(Integer expected) {
448 >            assertInvoked();
449 >            assertEquals(expected, value);
450 >        }
451 >    }
452 >
453 >    class IntegerSupplier extends CheckedAction
454 >        implements Supplier<Integer>
455 >    {
456 >        final Integer value;
457 >        IntegerSupplier(ExecutionMode m, Integer value) {
458 >            super(m);
459 >            this.value = value;
460 >        }
461 >        public Integer get() {
462 >            invoked();
463 >            return value;
464 >        }
465      }
466  
467      // A function that handles and produces null values as well.
# Line 334 | Line 469 | public class CompletableFutureTest exten
469          return (x == null) ? null : x + 1;
470      }
471  
472 <    static final Supplier<Integer> supplyOne =
473 <        () -> Integer.valueOf(1);
474 <    static final Function<Integer, Integer> inc =
475 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
341 <    static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> subtract(x, y);
343 <    static final class IncAction implements Consumer<Integer> {
344 <        int invocationCount = 0;
345 <        Integer value;
472 >    class NoopConsumer extends CheckedIntegerAction
473 >        implements Consumer<Integer>
474 >    {
475 >        NoopConsumer(ExecutionMode m) { super(m); }
476          public void accept(Integer x) {
477 <            invocationCount++;
478 <            value = inc(x);
477 >            invoked();
478 >            value = x;
479          }
480      }
481 <    static final class IncFunction implements Function<Integer,Integer> {
482 <        int invocationCount = 0;
483 <        Integer value;
481 >
482 >    class IncFunction extends CheckedIntegerAction
483 >        implements Function<Integer,Integer>
484 >    {
485 >        IncFunction(ExecutionMode m) { super(m); }
486          public Integer apply(Integer x) {
487 <            invocationCount++;
487 >            invoked();
488              return value = inc(x);
489          }
490      }
491 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
492 <        int invocationCount = 0;
493 <        Integer value;
494 <        // Check this action was invoked exactly once when result is computed.
491 >
492 >    // Choose non-commutative actions for better coverage
493 >    // A non-commutative function that handles and produces null values as well.
494 >    static Integer subtract(Integer x, Integer y) {
495 >        return (x == null && y == null) ? null :
496 >            ((x == null) ? 42 : x.intValue())
497 >            - ((y == null) ? 99 : y.intValue());
498 >    }
499 >
500 >    class SubtractAction extends CheckedIntegerAction
501 >        implements BiConsumer<Integer, Integer>
502 >    {
503 >        SubtractAction(ExecutionMode m) { super(m); }
504          public void accept(Integer x, Integer y) {
505 <            invocationCount++;
505 >            invoked();
506              value = subtract(x, y);
507          }
508      }
509 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
510 <        int invocationCount = 0;
511 <        Integer value;
512 <        // Check this action was invoked exactly once when result is computed.
509 >
510 >    class SubtractFunction extends CheckedIntegerAction
511 >        implements BiFunction<Integer, Integer, Integer>
512 >    {
513 >        SubtractFunction(ExecutionMode m) { super(m); }
514          public Integer apply(Integer x, Integer y) {
515 <            invocationCount++;
515 >            invoked();
516              return value = subtract(x, y);
517          }
518      }
519 <    static final class Noop implements Runnable {
520 <        int invocationCount = 0;
519 >
520 >    class Noop extends CheckedAction implements Runnable {
521 >        Noop(ExecutionMode m) { super(m); }
522          public void run() {
523 <            invocationCount++;
523 >            invoked();
524          }
525      }
526  
527 <    static final class FailingSupplier implements Supplier<Integer> {
528 <        int invocationCount = 0;
527 >    class FailingSupplier extends CheckedAction
528 >        implements Supplier<Integer>
529 >    {
530 >        FailingSupplier(ExecutionMode m) { super(m); }
531          public Integer get() {
532 <            invocationCount++;
532 >            invoked();
533              throw new CFException();
534          }
535      }
536 <    static final class FailingConsumer implements Consumer<Integer> {
537 <        int invocationCount = 0;
536 >
537 >    class FailingConsumer extends CheckedIntegerAction
538 >        implements Consumer<Integer>
539 >    {
540 >        FailingConsumer(ExecutionMode m) { super(m); }
541          public void accept(Integer x) {
542 <            invocationCount++;
542 >            invoked();
543 >            value = x;
544              throw new CFException();
545          }
546      }
547 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
548 <        int invocationCount = 0;
547 >
548 >    class FailingBiConsumer extends CheckedIntegerAction
549 >        implements BiConsumer<Integer, Integer>
550 >    {
551 >        FailingBiConsumer(ExecutionMode m) { super(m); }
552          public void accept(Integer x, Integer y) {
553 <            invocationCount++;
553 >            invoked();
554 >            value = subtract(x, y);
555              throw new CFException();
556          }
557      }
558 <    static final class FailingFunction implements Function<Integer, Integer> {
559 <        int invocationCount = 0;
558 >
559 >    class FailingFunction extends CheckedIntegerAction
560 >        implements Function<Integer, Integer>
561 >    {
562 >        FailingFunction(ExecutionMode m) { super(m); }
563          public Integer apply(Integer x) {
564 <            invocationCount++;
564 >            invoked();
565 >            value = x;
566              throw new CFException();
567          }
568      }
569 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
570 <        int invocationCount = 0;
569 >
570 >    class FailingBiFunction extends CheckedIntegerAction
571 >        implements BiFunction<Integer, Integer, Integer>
572 >    {
573 >        FailingBiFunction(ExecutionMode m) { super(m); }
574          public Integer apply(Integer x, Integer y) {
575 <            invocationCount++;
575 >            invoked();
576 >            value = subtract(x, y);
577              throw new CFException();
578          }
579      }
580 <    static final class FailingNoop implements Runnable {
581 <        int invocationCount = 0;
580 >
581 >    class FailingRunnable extends CheckedAction implements Runnable {
582 >        FailingRunnable(ExecutionMode m) { super(m); }
583          public void run() {
584 <            invocationCount++;
584 >            invoked();
585              throw new CFException();
586          }
587      }
588  
589 <    static final class CompletableFutureInc
590 <        implements Function<Integer, CompletableFuture<Integer>> {
591 <        int invocationCount = 0;
589 >    class CompletableFutureInc extends CheckedIntegerAction
590 >        implements Function<Integer, CompletableFuture<Integer>>
591 >    {
592 >        CompletableFutureInc(ExecutionMode m) { super(m); }
593          public CompletableFuture<Integer> apply(Integer x) {
594 <            invocationCount++;
594 >            invoked();
595 >            value = x;
596              CompletableFuture<Integer> f = new CompletableFuture<>();
597 <            f.complete(inc(x));
597 >            assertTrue(f.complete(inc(x)));
598              return f;
599          }
600      }
601  
602 <    static final class FailingCompletableFutureFunction
603 <        implements Function<Integer, CompletableFuture<Integer>> {
604 <        int invocationCount = 0;
602 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
603 >        implements Function<Integer, CompletableFuture<Integer>>
604 >    {
605 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
606          public CompletableFuture<Integer> apply(Integer x) {
607 <            invocationCount++;
607 >            invoked();
608 >            value = x;
609              throw new CFException();
610          }
611      }
612  
613      // Used for explicit executor tests
614      static final class ThreadExecutor implements Executor {
615 <        AtomicInteger count = new AtomicInteger(0);
615 >        final AtomicInteger count = new AtomicInteger(0);
616 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
617 >        static boolean startedCurrentThread() {
618 >            return Thread.currentThread().getThreadGroup() == tg;
619 >        }
620  
621          public void execute(Runnable r) {
622              count.getAndIncrement();
623 <            new Thread(r).start();
623 >            new Thread(tg, r).start();
624          }
625      }
626  
627 +    static final boolean defaultExecutorIsCommonPool
628 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
629 +
630      /**
631       * Permits the testing of parallel code for the 3 different
632 <     * execution modes without repeating all the testing code.
632 >     * execution modes without copy/pasting all the test methods.
633       */
634      enum ExecutionMode {
635 <        DEFAULT {
635 >        SYNC {
636              public void checkExecutionMode() {
637 +                assertFalse(ThreadExecutor.startedCurrentThread());
638                  assertNull(ForkJoinTask.getPool());
639              }
640 +            public CompletableFuture<Void> runAsync(Runnable a) {
641 +                throw new UnsupportedOperationException();
642 +            }
643 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
644 +                throw new UnsupportedOperationException();
645 +            }
646              public <T> CompletableFuture<Void> thenRun
647                  (CompletableFuture<T> f, Runnable a) {
648                  return f.thenRun(a);
# Line 528 | Line 708 | public class CompletableFutureTest exten
708  
709          ASYNC {
710              public void checkExecutionMode() {
711 <                assertSame(ForkJoinPool.commonPool(),
712 <                           ForkJoinTask.getPool());
711 >                assertEquals(defaultExecutorIsCommonPool,
712 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
713 >            }
714 >            public CompletableFuture<Void> runAsync(Runnable a) {
715 >                return CompletableFuture.runAsync(a);
716 >            }
717 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
718 >                return CompletableFuture.supplyAsync(a);
719              }
720              public <T> CompletableFuture<Void> thenRun
721                  (CompletableFuture<T> f, Runnable a) {
# Line 596 | Line 782 | public class CompletableFutureTest exten
782  
783          EXECUTOR {
784              public void checkExecutionMode() {
785 <                //TODO
785 >                assertTrue(ThreadExecutor.startedCurrentThread());
786 >            }
787 >            public CompletableFuture<Void> runAsync(Runnable a) {
788 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
789 >            }
790 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
791 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
792              }
793              public <T> CompletableFuture<Void> thenRun
794                  (CompletableFuture<T> f, Runnable a) {
# Line 662 | Line 854 | public class CompletableFutureTest exten
854          };
855  
856          public abstract void checkExecutionMode();
857 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
858 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
859          public abstract <T> CompletableFuture<Void> thenRun
860              (CompletableFuture<T> f, Runnable a);
861          public abstract <T> CompletableFuture<Void> thenAccept
# Line 711 | Line 905 | public class CompletableFutureTest exten
905      {
906          final AtomicInteger a = new AtomicInteger(0);
907          final CompletableFuture<Integer> f = new CompletableFuture<>();
908 <        if (!createIncomplete) f.complete(v1);
908 >        if (!createIncomplete) assertTrue(f.complete(v1));
909          final CompletableFuture<Integer> g = f.exceptionally
910              ((Throwable t) -> {
911                  // Should not be called
912                  a.getAndIncrement();
913                  throw new AssertionError();
914              });
915 <        if (createIncomplete) f.complete(v1);
915 >        if (createIncomplete) assertTrue(f.complete(v1));
916  
917          checkCompletedNormally(g, v1);
918          checkCompletedNormally(f, v1);
919          assertEquals(0, a.get());
920      }}
921  
728
922      /**
923       * exceptionally action completes with function value on source
924       * exception
# Line 740 | Line 933 | public class CompletableFutureTest exten
933          if (!createIncomplete) f.completeExceptionally(ex);
934          final CompletableFuture<Integer> g = f.exceptionally
935              ((Throwable t) -> {
936 +                ExecutionMode.SYNC.checkExecutionMode();
937                  threadAssertSame(t, ex);
938                  a.getAndIncrement();
939                  return v1;
# Line 752 | Line 946 | public class CompletableFutureTest exten
946  
947      public void testExceptionally_exceptionalCompletionActionFailed() {
948          for (boolean createIncomplete : new boolean[] { true, false })
755        for (Integer v1 : new Integer[] { 1, null })
949      {
950          final AtomicInteger a = new AtomicInteger(0);
951          final CFException ex1 = new CFException();
# Line 761 | Line 954 | public class CompletableFutureTest exten
954          if (!createIncomplete) f.completeExceptionally(ex1);
955          final CompletableFuture<Integer> g = f.exceptionally
956              ((Throwable t) -> {
957 +                ExecutionMode.SYNC.checkExecutionMode();
958 +                threadAssertSame(t, ex1);
959 +                a.getAndIncrement();
960 +                throw ex2;
961 +            });
962 +        if (createIncomplete) f.completeExceptionally(ex1);
963 +
964 +        checkCompletedWithWrappedException(g, ex2);
965 +        assertEquals(1, a.get());
966 +    }}
967 +
968 +    /**
969 +     * whenComplete action executes on normal completion, propagating
970 +     * source result.
971 +     */
972 +    public void testWhenComplete_normalCompletion1() {
973 +        for (ExecutionMode m : ExecutionMode.values())
974 +        for (boolean createIncomplete : new boolean[] { true, false })
975 +        for (Integer v1 : new Integer[] { 1, null })
976 +    {
977 +        final AtomicInteger a = new AtomicInteger(0);
978 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
979 +        if (!createIncomplete) assertTrue(f.complete(v1));
980 +        final CompletableFuture<Integer> g = m.whenComplete
981 +            (f,
982 +             (Integer x, Throwable t) -> {
983 +                m.checkExecutionMode();
984 +                threadAssertSame(x, v1);
985 +                threadAssertNull(t);
986 +                a.getAndIncrement();
987 +            });
988 +        if (createIncomplete) assertTrue(f.complete(v1));
989 +
990 +        checkCompletedNormally(g, v1);
991 +        checkCompletedNormally(f, v1);
992 +        assertEquals(1, a.get());
993 +    }}
994 +
995 +    /**
996 +     * whenComplete action executes on exceptional completion, propagating
997 +     * source result.
998 +     */
999 +    public void testWhenComplete_exceptionalCompletion() {
1000 +        for (ExecutionMode m : ExecutionMode.values())
1001 +        for (boolean createIncomplete : new boolean[] { true, false })
1002 +    {
1003 +        final AtomicInteger a = new AtomicInteger(0);
1004 +        final CFException ex = new CFException();
1005 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 +        if (!createIncomplete) f.completeExceptionally(ex);
1007 +        final CompletableFuture<Integer> g = m.whenComplete
1008 +            (f,
1009 +             (Integer x, Throwable t) -> {
1010 +                m.checkExecutionMode();
1011 +                threadAssertNull(x);
1012 +                threadAssertSame(t, ex);
1013 +                a.getAndIncrement();
1014 +            });
1015 +        if (createIncomplete) f.completeExceptionally(ex);
1016 +
1017 +        checkCompletedWithWrappedException(g, ex);
1018 +        checkCompletedExceptionally(f, ex);
1019 +        assertEquals(1, a.get());
1020 +    }}
1021 +
1022 +    /**
1023 +     * whenComplete action executes on cancelled source, propagating
1024 +     * CancellationException.
1025 +     */
1026 +    public void testWhenComplete_sourceCancelled() {
1027 +        for (ExecutionMode m : ExecutionMode.values())
1028 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1029 +        for (boolean createIncomplete : new boolean[] { true, false })
1030 +    {
1031 +        final AtomicInteger a = new AtomicInteger(0);
1032 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1033 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1034 +        final CompletableFuture<Integer> g = m.whenComplete
1035 +            (f,
1036 +             (Integer x, Throwable t) -> {
1037 +                m.checkExecutionMode();
1038 +                threadAssertNull(x);
1039 +                threadAssertTrue(t instanceof CancellationException);
1040 +                a.getAndIncrement();
1041 +            });
1042 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1043 +
1044 +        checkCompletedWithWrappedCancellationException(g);
1045 +        checkCancelled(f);
1046 +        assertEquals(1, a.get());
1047 +    }}
1048 +
1049 +    /**
1050 +     * If a whenComplete action throws an exception when triggered by
1051 +     * a normal completion, it completes exceptionally
1052 +     */
1053 +    public void testWhenComplete_actionFailed() {
1054 +        for (boolean createIncomplete : new boolean[] { true, false })
1055 +        for (ExecutionMode m : ExecutionMode.values())
1056 +        for (Integer v1 : new Integer[] { 1, null })
1057 +    {
1058 +        final AtomicInteger a = new AtomicInteger(0);
1059 +        final CFException ex = new CFException();
1060 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1061 +        if (!createIncomplete) assertTrue(f.complete(v1));
1062 +        final CompletableFuture<Integer> g = m.whenComplete
1063 +            (f,
1064 +             (Integer x, Throwable t) -> {
1065 +                m.checkExecutionMode();
1066 +                threadAssertSame(x, v1);
1067 +                threadAssertNull(t);
1068 +                a.getAndIncrement();
1069 +                throw ex;
1070 +            });
1071 +        if (createIncomplete) assertTrue(f.complete(v1));
1072 +
1073 +        checkCompletedWithWrappedException(g, ex);
1074 +        checkCompletedNormally(f, v1);
1075 +        assertEquals(1, a.get());
1076 +    }}
1077 +
1078 +    /**
1079 +     * If a whenComplete action throws an exception when triggered by
1080 +     * a source completion that also throws an exception, the source
1081 +     * exception takes precedence.
1082 +     */
1083 +    public void testWhenComplete_actionFailedSourceFailed() {
1084 +        for (boolean createIncomplete : new boolean[] { true, false })
1085 +        for (ExecutionMode m : ExecutionMode.values())
1086 +    {
1087 +        final AtomicInteger a = new AtomicInteger(0);
1088 +        final CFException ex1 = new CFException();
1089 +        final CFException ex2 = new CFException();
1090 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1091 +
1092 +        if (!createIncomplete) f.completeExceptionally(ex1);
1093 +        final CompletableFuture<Integer> g = m.whenComplete
1094 +            (f,
1095 +             (Integer x, Throwable t) -> {
1096 +                m.checkExecutionMode();
1097                  threadAssertSame(t, ex1);
1098 +                threadAssertNull(x);
1099                  a.getAndIncrement();
1100                  throw ex2;
1101              });
1102          if (createIncomplete) f.completeExceptionally(ex1);
1103  
1104 <        checkCompletedWithWrappedCFException(g, ex2);
1104 >        checkCompletedWithWrappedException(g, ex1);
1105 >        checkCompletedExceptionally(f, ex1);
1106          assertEquals(1, a.get());
1107      }}
1108  
# Line 782 | Line 1117 | public class CompletableFutureTest exten
1117      {
1118          final CompletableFuture<Integer> f = new CompletableFuture<>();
1119          final AtomicInteger a = new AtomicInteger(0);
1120 <        if (!createIncomplete) f.complete(v1);
1120 >        if (!createIncomplete) assertTrue(f.complete(v1));
1121          final CompletableFuture<Integer> g = m.handle
1122              (f,
1123               (Integer x, Throwable t) -> {
1124 +                m.checkExecutionMode();
1125                  threadAssertSame(x, v1);
1126                  threadAssertNull(t);
1127                  a.getAndIncrement();
1128                  return inc(v1);
1129              });
1130 <        if (createIncomplete) f.complete(v1);
1130 >        if (createIncomplete) assertTrue(f.complete(v1));
1131  
1132          checkCompletedNormally(g, inc(v1));
1133          checkCompletedNormally(f, v1);
# Line 814 | Line 1150 | public class CompletableFutureTest exten
1150          final CompletableFuture<Integer> g = m.handle
1151              (f,
1152               (Integer x, Throwable t) -> {
1153 +                m.checkExecutionMode();
1154                  threadAssertNull(x);
1155                  threadAssertSame(t, ex);
1156                  a.getAndIncrement();
# Line 822 | Line 1159 | public class CompletableFutureTest exten
1159          if (createIncomplete) f.completeExceptionally(ex);
1160  
1161          checkCompletedNormally(g, v1);
1162 <        checkCompletedWithWrappedCFException(f, ex);
1162 >        checkCompletedExceptionally(f, ex);
1163          assertEquals(1, a.get());
1164      }}
1165  
# Line 842 | Line 1179 | public class CompletableFutureTest exten
1179          final CompletableFuture<Integer> g = m.handle
1180              (f,
1181               (Integer x, Throwable t) -> {
1182 +                m.checkExecutionMode();
1183                  threadAssertNull(x);
1184                  threadAssertTrue(t instanceof CancellationException);
1185                  a.getAndIncrement();
# Line 869 | Line 1207 | public class CompletableFutureTest exten
1207          final CompletableFuture<Integer> g = m.handle
1208              (f,
1209               (Integer x, Throwable t) -> {
1210 +                m.checkExecutionMode();
1211                  threadAssertNull(x);
1212                  threadAssertSame(ex1, t);
1213                  a.getAndIncrement();
# Line 876 | Line 1215 | public class CompletableFutureTest exten
1215              });
1216          if (createIncomplete) f.completeExceptionally(ex1);
1217  
1218 <        checkCompletedWithWrappedCFException(g, ex2);
1219 <        checkCompletedWithWrappedCFException(f, ex1);
1218 >        checkCompletedWithWrappedException(g, ex2);
1219 >        checkCompletedExceptionally(f, ex1);
1220          assertEquals(1, a.get());
1221      }}
1222  
# Line 889 | Line 1228 | public class CompletableFutureTest exten
1228          final CompletableFuture<Integer> f = new CompletableFuture<>();
1229          final AtomicInteger a = new AtomicInteger(0);
1230          final CFException ex = new CFException();
1231 <        if (!createIncomplete) f.complete(v1);
1231 >        if (!createIncomplete) assertTrue(f.complete(v1));
1232          final CompletableFuture<Integer> g = m.handle
1233              (f,
1234               (Integer x, Throwable t) -> {
1235 +                m.checkExecutionMode();
1236                  threadAssertSame(x, v1);
1237                  threadAssertNull(t);
1238                  a.getAndIncrement();
1239                  throw ex;
1240              });
1241 <        if (createIncomplete) f.complete(v1);
1241 >        if (createIncomplete) assertTrue(f.complete(v1));
1242  
1243 <        checkCompletedWithWrappedCFException(g, ex);
1243 >        checkCompletedWithWrappedException(g, ex);
1244          checkCompletedNormally(f, v1);
1245          assertEquals(1, a.get());
1246      }}
# Line 908 | Line 1248 | public class CompletableFutureTest exten
1248      /**
1249       * runAsync completes after running Runnable
1250       */
1251 <    public void testRunAsync() {
1252 <        Noop r = new Noop();
1253 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1254 <        assertNull(f.join());
1255 <        assertEquals(1, r.invocationCount);
1256 <        checkCompletedNormally(f, null);
1257 <    }
1258 <
1259 <    /**
920 <     * runAsync with executor completes after running Runnable
921 <     */
922 <    public void testRunAsync2() {
923 <        Noop r = new Noop();
924 <        ThreadExecutor exec = new ThreadExecutor();
925 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1251 >    public void testRunAsync_normalCompletion() {
1252 >        ExecutionMode[] executionModes = {
1253 >            ExecutionMode.ASYNC,
1254 >            ExecutionMode.EXECUTOR,
1255 >        };
1256 >        for (ExecutionMode m : executionModes)
1257 >    {
1258 >        final Noop r = new Noop(m);
1259 >        final CompletableFuture<Void> f = m.runAsync(r);
1260          assertNull(f.join());
927        assertEquals(1, r.invocationCount);
1261          checkCompletedNormally(f, null);
1262 <        assertEquals(1, exec.count.get());
1263 <    }
1262 >        r.assertInvoked();
1263 >    }}
1264  
1265      /**
1266       * failing runAsync completes exceptionally after running Runnable
1267       */
1268 <    public void testRunAsync3() {
1269 <        FailingNoop r = new FailingNoop();
1270 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1268 >    public void testRunAsync_exceptionalCompletion() {
1269 >        ExecutionMode[] executionModes = {
1270 >            ExecutionMode.ASYNC,
1271 >            ExecutionMode.EXECUTOR,
1272 >        };
1273 >        for (ExecutionMode m : executionModes)
1274 >    {
1275 >        final FailingRunnable r = new FailingRunnable(m);
1276 >        final CompletableFuture<Void> f = m.runAsync(r);
1277          checkCompletedWithWrappedCFException(f);
1278 <        assertEquals(1, r.invocationCount);
1279 <    }
1278 >        r.assertInvoked();
1279 >    }}
1280  
1281      /**
1282       * supplyAsync completes with result of supplier
1283       */
1284 <    public void testSupplyAsync() {
1285 <        CompletableFuture<Integer> f;
1286 <        f = CompletableFuture.supplyAsync(supplyOne);
1287 <        assertEquals(f.join(), one);
1288 <        checkCompletedNormally(f, one);
1289 <    }
1290 <
1291 <    /**
1292 <     * supplyAsync with executor completes with result of supplier
1293 <     */
1294 <    public void testSupplyAsync2() {
1295 <        CompletableFuture<Integer> f;
1296 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1297 <        assertEquals(f.join(), one);
959 <        checkCompletedNormally(f, one);
960 <    }
1284 >    public void testSupplyAsync_normalCompletion() {
1285 >        ExecutionMode[] executionModes = {
1286 >            ExecutionMode.ASYNC,
1287 >            ExecutionMode.EXECUTOR,
1288 >        };
1289 >        for (ExecutionMode m : executionModes)
1290 >        for (Integer v1 : new Integer[] { 1, null })
1291 >    {
1292 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1293 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1294 >        assertSame(v1, f.join());
1295 >        checkCompletedNormally(f, v1);
1296 >        r.assertInvoked();
1297 >    }}
1298  
1299      /**
1300       * Failing supplyAsync completes exceptionally
1301       */
1302 <    public void testSupplyAsync3() {
1303 <        FailingSupplier r = new FailingSupplier();
1304 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1302 >    public void testSupplyAsync_exceptionalCompletion() {
1303 >        ExecutionMode[] executionModes = {
1304 >            ExecutionMode.ASYNC,
1305 >            ExecutionMode.EXECUTOR,
1306 >        };
1307 >        for (ExecutionMode m : executionModes)
1308 >    {
1309 >        FailingSupplier r = new FailingSupplier(m);
1310 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1311          checkCompletedWithWrappedCFException(f);
1312 <        assertEquals(1, r.invocationCount);
1313 <    }
1312 >        r.assertInvoked();
1313 >    }}
1314  
1315      // seq completion methods
1316  
# Line 976 | Line 1319 | public class CompletableFutureTest exten
1319       */
1320      public void testThenRun_normalCompletion() {
1321          for (ExecutionMode m : ExecutionMode.values())
979        for (boolean createIncomplete : new boolean[] { true, false })
1322          for (Integer v1 : new Integer[] { 1, null })
1323      {
1324          final CompletableFuture<Integer> f = new CompletableFuture<>();
1325 <        final Noop r = new Noop();
1326 <        if (!createIncomplete) f.complete(v1);
985 <        final CompletableFuture<Void> g = m.thenRun(f, r);
986 <        if (createIncomplete) f.complete(v1);
1325 >        final Noop[] rs = new Noop[6];
1326 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1327  
1328 <        checkCompletedNormally(g, null);
1328 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1329 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1330 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1331 >        checkIncomplete(h0);
1332 >        checkIncomplete(h1);
1333 >        checkIncomplete(h2);
1334 >        assertTrue(f.complete(v1));
1335 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1336 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1337 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1338 >
1339 >        checkCompletedNormally(h0, null);
1340 >        checkCompletedNormally(h1, null);
1341 >        checkCompletedNormally(h2, null);
1342 >        checkCompletedNormally(h3, null);
1343 >        checkCompletedNormally(h4, null);
1344 >        checkCompletedNormally(h5, null);
1345          checkCompletedNormally(f, v1);
1346 <        assertEquals(1, r.invocationCount);
1346 >        for (Noop r : rs) r.assertInvoked();
1347      }}
1348  
1349      /**
# Line 996 | Line 1352 | public class CompletableFutureTest exten
1352       */
1353      public void testThenRun_exceptionalCompletion() {
1354          for (ExecutionMode m : ExecutionMode.values())
999        for (boolean createIncomplete : new boolean[] { true, false })
1355      {
1356          final CFException ex = new CFException();
1357          final CompletableFuture<Integer> f = new CompletableFuture<>();
1358 <        final Noop r = new Noop();
1359 <        if (!createIncomplete) f.completeExceptionally(ex);
1005 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 <        if (createIncomplete) f.completeExceptionally(ex);
1358 >        final Noop[] rs = new Noop[6];
1359 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1360  
1361 <        checkCompletedWithWrappedCFException(g, ex);
1362 <        checkCompletedWithWrappedCFException(f, ex);
1363 <        assertEquals(0, r.invocationCount);
1361 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1362 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1363 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1364 >        checkIncomplete(h0);
1365 >        checkIncomplete(h1);
1366 >        checkIncomplete(h2);
1367 >        assertTrue(f.completeExceptionally(ex));
1368 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1369 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1370 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1371 >
1372 >        checkCompletedWithWrappedException(h0, ex);
1373 >        checkCompletedWithWrappedException(h1, ex);
1374 >        checkCompletedWithWrappedException(h2, ex);
1375 >        checkCompletedWithWrappedException(h3, ex);
1376 >        checkCompletedWithWrappedException(h4, ex);
1377 >        checkCompletedWithWrappedException(h5, ex);
1378 >        checkCompletedExceptionally(f, ex);
1379 >        for (Noop r : rs) r.assertNotInvoked();
1380      }}
1381  
1382      /**
# Line 1015 | Line 1384 | public class CompletableFutureTest exten
1384       */
1385      public void testThenRun_sourceCancelled() {
1386          for (ExecutionMode m : ExecutionMode.values())
1018        for (boolean createIncomplete : new boolean[] { true, false })
1387          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1388      {
1389          final CompletableFuture<Integer> f = new CompletableFuture<>();
1390 <        final Noop r = new Noop();
1391 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 <        final CompletableFuture<Void> g = f.thenRun(r);
1025 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1390 >        final Noop[] rs = new Noop[6];
1391 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1392  
1393 <        checkCompletedWithWrappedCancellationException(g);
1393 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1394 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1395 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1396 >        checkIncomplete(h0);
1397 >        checkIncomplete(h1);
1398 >        checkIncomplete(h2);
1399 >        assertTrue(f.cancel(mayInterruptIfRunning));
1400 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1401 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1402 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1403 >
1404 >        checkCompletedWithWrappedCancellationException(h0);
1405 >        checkCompletedWithWrappedCancellationException(h1);
1406 >        checkCompletedWithWrappedCancellationException(h2);
1407 >        checkCompletedWithWrappedCancellationException(h3);
1408 >        checkCompletedWithWrappedCancellationException(h4);
1409 >        checkCompletedWithWrappedCancellationException(h5);
1410          checkCancelled(f);
1411 <        assertEquals(0, r.invocationCount);
1411 >        for (Noop r : rs) r.assertNotInvoked();
1412      }}
1413  
1414      /**
# Line 1034 | Line 1416 | public class CompletableFutureTest exten
1416       */
1417      public void testThenRun_actionFailed() {
1418          for (ExecutionMode m : ExecutionMode.values())
1037        for (boolean createIncomplete : new boolean[] { true, false })
1419          for (Integer v1 : new Integer[] { 1, null })
1420      {
1421          final CompletableFuture<Integer> f = new CompletableFuture<>();
1422 <        final FailingNoop r = new FailingNoop();
1423 <        if (!createIncomplete) f.complete(v1);
1043 <        final CompletableFuture<Void> g = f.thenRun(r);
1044 <        if (createIncomplete) f.complete(v1);
1422 >        final FailingRunnable[] rs = new FailingRunnable[6];
1423 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1424  
1425 <        checkCompletedWithWrappedCFException(g);
1425 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1426 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1427 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1428 >        assertTrue(f.complete(v1));
1429 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1430 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1431 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1432 >
1433 >        checkCompletedWithWrappedCFException(h0);
1434 >        checkCompletedWithWrappedCFException(h1);
1435 >        checkCompletedWithWrappedCFException(h2);
1436 >        checkCompletedWithWrappedCFException(h3);
1437 >        checkCompletedWithWrappedCFException(h4);
1438 >        checkCompletedWithWrappedCFException(h5);
1439          checkCompletedNormally(f, v1);
1440      }}
1441  
1442      /**
1443       * thenApply result completes normally after normal completion of source
1444       */
1445 <    public void testThenApply() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1055 <        CompletableFuture<Integer> g = f.thenApply(inc);
1056 <        f.complete(one);
1057 <        checkCompletedNormally(g, two);
1058 <    }
1059 <
1060 <    /**
1061 <     * thenApply result completes exceptionally after exceptional
1062 <     * completion of source
1063 <     */
1064 <    public void testThenApply2() {
1065 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1066 <        CompletableFuture<Integer> g = f.thenApply(inc);
1067 <        f.completeExceptionally(new CFException());
1068 <        checkCompletedWithWrappedCFException(g);
1069 <    }
1070 <
1071 <    /**
1072 <     * thenApply result completes exceptionally if action does
1073 <     */
1074 <    public void testThenApply3() {
1075 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1077 <        f.complete(one);
1078 <        checkCompletedWithWrappedCFException(g);
1079 <    }
1080 <
1081 <    /**
1082 <     * thenApply result completes exceptionally if source cancelled
1083 <     */
1084 <    public void testThenApply4() {
1085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1086 <        CompletableFuture<Integer> g = f.thenApply(inc);
1087 <        assertTrue(f.cancel(true));
1088 <        checkCompletedWithWrappedCancellationException(g);
1089 <    }
1090 <
1091 <    /**
1092 <     * thenAccept result completes normally after normal completion of source
1093 <     */
1094 <    public void testThenAccept() {
1095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1096 <        IncAction r = new IncAction();
1097 <        CompletableFuture<Void> g = f.thenAccept(r);
1098 <        f.complete(one);
1099 <        checkCompletedNormally(g, null);
1100 <        assertEquals(r.value, (Integer) 2);
1101 <    }
1102 <
1103 <    /**
1104 <     * thenAccept result completes exceptionally after exceptional
1105 <     * completion of source
1106 <     */
1107 <    public void testThenAccept2() {
1108 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1109 <        IncAction r = new IncAction();
1110 <        CompletableFuture<Void> g = f.thenAccept(r);
1111 <        f.completeExceptionally(new CFException());
1112 <        checkCompletedWithWrappedCFException(g);
1113 <    }
1114 <
1115 <    /**
1116 <     * thenAccept result completes exceptionally if action does
1117 <     */
1118 <    public void testThenAccept3() {
1119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1120 <        FailingConsumer r = new FailingConsumer();
1121 <        CompletableFuture<Void> g = f.thenAccept(r);
1122 <        f.complete(one);
1123 <        checkCompletedWithWrappedCFException(g);
1124 <        assertEquals(1, r.invocationCount);
1125 <    }
1126 <
1127 <    /**
1128 <     * thenAccept result completes exceptionally if source cancelled
1129 <     */
1130 <    public void testThenAccept4() {
1131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1132 <        IncAction r = new IncAction();
1133 <        CompletableFuture<Void> g = f.thenAccept(r);
1134 <        assertTrue(f.cancel(true));
1135 <        checkCompletedWithWrappedCancellationException(g);
1136 <    }
1137 <
1138 <    /**
1139 <     * thenCombine result completes normally after normal completion
1140 <     * of sources
1141 <     */
1142 <    public void testThenCombine_normalCompletion1() {
1143 <        for (boolean createIncomplete : new boolean[] { true, false })
1144 <        for (boolean fFirst : new boolean[] { true, false })
1445 >    public void testThenApply_normalCompletion() {
1446          for (ExecutionMode m : ExecutionMode.values())
1447          for (Integer v1 : new Integer[] { 1, null })
1147        for (Integer v2 : new Integer[] { 2, null })
1448      {
1449          final CompletableFuture<Integer> f = new CompletableFuture<>();
1450 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1451 <        final SubtractFunction r = new SubtractFunction();
1452 <        CompletableFuture<Integer> h = null;
1453 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1454 <
1455 <        if (fFirst)
1456 <            f.complete(v1);
1457 <        else
1458 <            g.complete(v2);
1459 <        if (createIncomplete) checkIncomplete(h);
1160 <        assertEquals(0, r.invocationCount);
1161 <        if (!fFirst)
1162 <            f.complete(v1);
1163 <        else
1164 <            g.complete(v2);
1165 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1450 >        final IncFunction[] rs = new IncFunction[4];
1451 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1452 >
1453 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1454 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1455 >        checkIncomplete(h0);
1456 >        checkIncomplete(h1);
1457 >        assertTrue(f.complete(v1));
1458 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1459 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1460  
1461 <        checkCompletedNormally(h, subtract(v1, v2));
1461 >        checkCompletedNormally(h0, inc(v1));
1462 >        checkCompletedNormally(h1, inc(v1));
1463 >        checkCompletedNormally(h2, inc(v1));
1464 >        checkCompletedNormally(h3, inc(v1));
1465          checkCompletedNormally(f, v1);
1466 <        checkCompletedNormally(g, v2);
1170 <        assertEquals(1, r.invocationCount);
1466 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1467      }}
1468  
1469      /**
1470 <     * thenCombine result completes exceptionally after exceptional
1471 <     * completion of either source
1470 >     * thenApply result completes exceptionally after exceptional
1471 >     * completion of source
1472       */
1473 <    public void testThenCombine_exceptionalCompletion1() {
1473 >    public void testThenApply_exceptionalCompletion() {
1474          for (ExecutionMode m : ExecutionMode.values())
1179        for (Integer v1 : new Integer[] { 1, null })
1475      {
1181        final CompletableFuture<Integer> f = new CompletableFuture<>();
1182        final CompletableFuture<Integer> g = new CompletableFuture<>();
1183        final SubtractFunction r = new SubtractFunction();
1184        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1476          final CFException ex = new CFException();
1186
1187        f.completeExceptionally(ex);
1188        checkIncomplete(h);
1189        g.complete(v1);
1190
1191        checkCompletedWithWrappedCFException(h, ex);
1192        checkCompletedWithWrappedCFException(f, ex);
1193        assertEquals(0, r.invocationCount);
1194        checkCompletedNormally(g, v1);
1195    }}
1196
1197    public void testThenCombine_exceptionalCompletion2() {
1198        for (ExecutionMode m : ExecutionMode.values())
1199        for (Integer v1 : new Integer[] { 1, null })
1200    {
1477          final CompletableFuture<Integer> f = new CompletableFuture<>();
1478 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1479 <        final SubtractFunction r = new SubtractFunction();
1204 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1205 <        final CFException ex = new CFException();
1478 >        final IncFunction[] rs = new IncFunction[4];
1479 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1480  
1481 <        g.completeExceptionally(ex);
1482 <        checkIncomplete(h);
1483 <        f.complete(v1);
1481 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1482 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1483 >        assertTrue(f.completeExceptionally(ex));
1484 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1485 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1486  
1487 <        checkCompletedWithWrappedCFException(h, ex);
1488 <        checkCompletedWithWrappedCFException(g, ex);
1489 <        assertEquals(0, r.invocationCount);
1490 <        checkCompletedNormally(f, v1);
1491 <    }}
1492 <
1217 <    public void testThenCombine_exceptionalCompletion3() {
1218 <        for (ExecutionMode m : ExecutionMode.values())
1219 <        for (Integer v1 : new Integer[] { 1, null })
1220 <    {
1221 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1223 <        final SubtractFunction r = new SubtractFunction();
1224 <        final CFException ex = new CFException();
1225 <
1226 <        g.completeExceptionally(ex);
1227 <        f.complete(v1);
1228 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1229 <
1230 <        checkCompletedWithWrappedCFException(h, ex);
1231 <        checkCompletedWithWrappedCFException(g, ex);
1232 <        assertEquals(0, r.invocationCount);
1233 <        checkCompletedNormally(f, v1);
1234 <    }}
1235 <
1236 <    public void testThenCombine_exceptionalCompletion4() {
1237 <        for (ExecutionMode m : ExecutionMode.values())
1238 <        for (Integer v1 : new Integer[] { 1, null })
1239 <    {
1240 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1241 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1242 <        final SubtractFunction r = new SubtractFunction();
1243 <        final CFException ex = new CFException();
1244 <
1245 <        f.completeExceptionally(ex);
1246 <        g.complete(v1);
1247 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1248 <
1249 <        checkCompletedWithWrappedCFException(h, ex);
1250 <        checkCompletedWithWrappedCFException(f, ex);
1251 <        assertEquals(0, r.invocationCount);
1252 <        checkCompletedNormally(g, v1);
1487 >        checkCompletedWithWrappedException(h0, ex);
1488 >        checkCompletedWithWrappedException(h1, ex);
1489 >        checkCompletedWithWrappedException(h2, ex);
1490 >        checkCompletedWithWrappedException(h3, ex);
1491 >        checkCompletedExceptionally(f, ex);
1492 >        for (IncFunction r : rs) r.assertNotInvoked();
1493      }}
1494  
1495      /**
1496 <     * thenCombine result completes exceptionally if action does
1496 >     * thenApply result completes exceptionally if source cancelled
1497       */
1498 <    public void testThenCombine_actionFailed1() {
1498 >    public void testThenApply_sourceCancelled() {
1499          for (ExecutionMode m : ExecutionMode.values())
1500 <        for (Integer v1 : new Integer[] { 1, null })
1261 <        for (Integer v2 : new Integer[] { 2, null })
1500 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1501      {
1502          final CompletableFuture<Integer> f = new CompletableFuture<>();
1503 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1504 <        final FailingBiFunction r = new FailingBiFunction();
1266 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1503 >        final IncFunction[] rs = new IncFunction[4];
1504 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1505  
1506 <        f.complete(v1);
1507 <        checkIncomplete(h);
1508 <        g.complete(v2);
1506 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1507 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1508 >        assertTrue(f.cancel(mayInterruptIfRunning));
1509 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1510 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1511  
1512 <        checkCompletedWithWrappedCFException(h);
1513 <        checkCompletedNormally(f, v1);
1514 <        checkCompletedNormally(g, v2);
1512 >        checkCompletedWithWrappedCancellationException(h0);
1513 >        checkCompletedWithWrappedCancellationException(h1);
1514 >        checkCompletedWithWrappedCancellationException(h2);
1515 >        checkCompletedWithWrappedCancellationException(h3);
1516 >        checkCancelled(f);
1517 >        for (IncFunction r : rs) r.assertNotInvoked();
1518      }}
1519  
1520 <    public void testThenCombine_actionFailed2() {
1520 >    /**
1521 >     * thenApply result completes exceptionally if action does
1522 >     */
1523 >    public void testThenApply_actionFailed() {
1524          for (ExecutionMode m : ExecutionMode.values())
1525          for (Integer v1 : new Integer[] { 1, null })
1280        for (Integer v2 : new Integer[] { 2, null })
1526      {
1527          final CompletableFuture<Integer> f = new CompletableFuture<>();
1528 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1529 <        final FailingBiFunction r = new FailingBiFunction();
1285 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1528 >        final FailingFunction[] rs = new FailingFunction[4];
1529 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1530  
1531 <        g.complete(v2);
1532 <        checkIncomplete(h);
1533 <        f.complete(v1);
1531 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1532 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1533 >        assertTrue(f.complete(v1));
1534 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1535 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1536  
1537 <        checkCompletedWithWrappedCFException(h);
1537 >        checkCompletedWithWrappedCFException(h0);
1538 >        checkCompletedWithWrappedCFException(h1);
1539 >        checkCompletedWithWrappedCFException(h2);
1540 >        checkCompletedWithWrappedCFException(h3);
1541          checkCompletedNormally(f, v1);
1293        checkCompletedNormally(g, v2);
1542      }}
1543  
1544      /**
1545 <     * thenCombine result completes exceptionally if either source cancelled
1545 >     * thenAccept result completes normally after normal completion of source
1546       */
1547 <    public void testThenCombine_sourceCancelled1() {
1300 <        for (ExecutionMode m : ExecutionMode.values())
1301 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1302 <        for (Integer v1 : new Integer[] { 1, null })
1303 <    {
1304 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1305 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1306 <        final SubtractFunction r = new SubtractFunction();
1307 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1308 <
1309 <        assertTrue(f.cancel(mayInterruptIfRunning));
1310 <        checkIncomplete(h);
1311 <        g.complete(v1);
1312 <
1313 <        checkCompletedWithWrappedCancellationException(h);
1314 <        checkCancelled(f);
1315 <        assertEquals(0, r.invocationCount);
1316 <        checkCompletedNormally(g, v1);
1317 <    }}
1318 <
1319 <    public void testThenCombine_sourceCancelled2() {
1547 >    public void testThenAccept_normalCompletion() {
1548          for (ExecutionMode m : ExecutionMode.values())
1321        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1549          for (Integer v1 : new Integer[] { 1, null })
1550      {
1551          final CompletableFuture<Integer> f = new CompletableFuture<>();
1552 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1553 <        final SubtractFunction r = new SubtractFunction();
1327 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1552 >        final NoopConsumer[] rs = new NoopConsumer[4];
1553 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1554  
1555 <        assertTrue(g.cancel(mayInterruptIfRunning));
1556 <        checkIncomplete(h);
1557 <        f.complete(v1);
1555 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1556 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1557 >        checkIncomplete(h0);
1558 >        checkIncomplete(h1);
1559 >        assertTrue(f.complete(v1));
1560 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1561 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1562  
1563 <        checkCompletedWithWrappedCancellationException(h);
1564 <        checkCancelled(g);
1565 <        assertEquals(0, r.invocationCount);
1563 >        checkCompletedNormally(h0, null);
1564 >        checkCompletedNormally(h1, null);
1565 >        checkCompletedNormally(h2, null);
1566 >        checkCompletedNormally(h3, null);
1567          checkCompletedNormally(f, v1);
1568 +        for (NoopConsumer r : rs) r.assertValue(v1);
1569      }}
1570  
1571 <    public void testThenCombine_sourceCancelled3() {
1571 >    /**
1572 >     * thenAccept result completes exceptionally after exceptional
1573 >     * completion of source
1574 >     */
1575 >    public void testThenAccept_exceptionalCompletion() {
1576          for (ExecutionMode m : ExecutionMode.values())
1341        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1342        for (Integer v1 : new Integer[] { 1, null })
1577      {
1578 +        final CFException ex = new CFException();
1579          final CompletableFuture<Integer> f = new CompletableFuture<>();
1580 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1581 <        final SubtractFunction r = new SubtractFunction();
1580 >        final NoopConsumer[] rs = new NoopConsumer[4];
1581 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1582  
1583 <        assertTrue(g.cancel(mayInterruptIfRunning));
1584 <        f.complete(v1);
1585 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1583 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1584 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1585 >        assertTrue(f.completeExceptionally(ex));
1586 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1587 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1588  
1589 <        checkCompletedWithWrappedCancellationException(h);
1590 <        checkCancelled(g);
1591 <        assertEquals(0, r.invocationCount);
1592 <        checkCompletedNormally(f, v1);
1589 >        checkCompletedWithWrappedException(h0, ex);
1590 >        checkCompletedWithWrappedException(h1, ex);
1591 >        checkCompletedWithWrappedException(h2, ex);
1592 >        checkCompletedWithWrappedException(h3, ex);
1593 >        checkCompletedExceptionally(f, ex);
1594 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1595      }}
1596  
1597 <    public void testThenCombine_sourceCancelled4() {
1597 >    /**
1598 >     * thenAccept result completes exceptionally if source cancelled
1599 >     */
1600 >    public void testThenAccept_sourceCancelled() {
1601          for (ExecutionMode m : ExecutionMode.values())
1602          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1361        for (Integer v1 : new Integer[] { 1, null })
1603      {
1604          final CompletableFuture<Integer> f = new CompletableFuture<>();
1605 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1606 <        final SubtractFunction r = new SubtractFunction();
1605 >        final NoopConsumer[] rs = new NoopConsumer[4];
1606 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1607  
1608 +        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1609 +        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1610          assertTrue(f.cancel(mayInterruptIfRunning));
1611 <        g.complete(v1);
1612 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1611 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1612 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1613  
1614 <        checkCompletedWithWrappedCancellationException(h);
1614 >        checkCompletedWithWrappedCancellationException(h0);
1615 >        checkCompletedWithWrappedCancellationException(h1);
1616 >        checkCompletedWithWrappedCancellationException(h2);
1617 >        checkCompletedWithWrappedCancellationException(h3);
1618          checkCancelled(f);
1619 <        assertEquals(0, r.invocationCount);
1374 <        checkCompletedNormally(g, v1);
1619 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1620      }}
1621  
1622      /**
1623 <     * thenAcceptBoth result completes normally after normal
1379 <     * completion of sources
1623 >     * thenAccept result completes exceptionally if action does
1624       */
1625 <    public void testThenAcceptBoth_normalCompletion1() {
1625 >    public void testThenAccept_actionFailed() {
1626          for (ExecutionMode m : ExecutionMode.values())
1627          for (Integer v1 : new Integer[] { 1, null })
1384        for (Integer v2 : new Integer[] { 2, null })
1385    {
1386        final CompletableFuture<Integer> f = new CompletableFuture<>();
1387        final CompletableFuture<Integer> g = new CompletableFuture<>();
1388        final SubtractAction r = new SubtractAction();
1389        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1390
1391        f.complete(v1);
1392        checkIncomplete(h);
1393        assertEquals(0, r.invocationCount);
1394        g.complete(v2);
1395
1396        checkCompletedNormally(h, null);
1397        assertEquals(subtract(v1, v2), r.value);
1398        checkCompletedNormally(f, v1);
1399        checkCompletedNormally(g, v2);
1400    }}
1401
1402    public void testThenAcceptBoth_normalCompletion2() {
1403        for (ExecutionMode m : ExecutionMode.values())
1404        for (Integer v1 : new Integer[] { 1, null })
1405        for (Integer v2 : new Integer[] { 2, null })
1406    {
1407        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409        final SubtractAction r = new SubtractAction();
1410        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1411
1412        g.complete(v2);
1413        checkIncomplete(h);
1414        assertEquals(0, r.invocationCount);
1415        f.complete(v1);
1416
1417        checkCompletedNormally(h, null);
1418        assertEquals(subtract(v1, v2), r.value);
1419        checkCompletedNormally(f, v1);
1420        checkCompletedNormally(g, v2);
1421    }}
1422
1423    public void testThenAcceptBoth_normalCompletion3() {
1424        for (ExecutionMode m : ExecutionMode.values())
1425        for (Integer v1 : new Integer[] { 1, null })
1426        for (Integer v2 : new Integer[] { 2, null })
1628      {
1629          final CompletableFuture<Integer> f = new CompletableFuture<>();
1630 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1631 <        final SubtractAction r = new SubtractAction();
1630 >        final FailingConsumer[] rs = new FailingConsumer[4];
1631 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1632  
1633 <        g.complete(v2);
1634 <        f.complete(v1);
1635 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1633 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1634 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1635 >        assertTrue(f.complete(v1));
1636 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1637 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1638  
1639 <        checkCompletedNormally(h, null);
1640 <        assertEquals(subtract(v1, v2), r.value);
1639 >        checkCompletedWithWrappedCFException(h0);
1640 >        checkCompletedWithWrappedCFException(h1);
1641 >        checkCompletedWithWrappedCFException(h2);
1642 >        checkCompletedWithWrappedCFException(h3);
1643          checkCompletedNormally(f, v1);
1439        checkCompletedNormally(g, v2);
1644      }}
1645  
1646 <    public void testThenAcceptBoth_normalCompletion4() {
1646 >    /**
1647 >     * thenCombine result completes normally after normal completion
1648 >     * of sources
1649 >     */
1650 >    public void testThenCombine_normalCompletion() {
1651          for (ExecutionMode m : ExecutionMode.values())
1652 +        for (boolean fFirst : new boolean[] { true, false })
1653          for (Integer v1 : new Integer[] { 1, null })
1654          for (Integer v2 : new Integer[] { 2, null })
1655      {
1656          final CompletableFuture<Integer> f = new CompletableFuture<>();
1657          final CompletableFuture<Integer> g = new CompletableFuture<>();
1658 <        final SubtractAction r = new SubtractAction();
1658 >        final SubtractFunction[] rs = new SubtractFunction[6];
1659 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1660  
1661 <        f.complete(v1);
1662 <        g.complete(v2);
1663 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1661 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1662 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1663 >        final Integer w1 =  fFirst ? v1 : v2;
1664 >        final Integer w2 = !fFirst ? v1 : v2;
1665 >
1666 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1667 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1668 >        assertTrue(fst.complete(w1));
1669 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1670 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1671 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1672 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1673 >        checkCompletedNormally(h1, subtract(w1, w1));
1674 >        checkCompletedNormally(h3, subtract(w1, w1));
1675 >        rs[1].assertValue(subtract(w1, w1));
1676 >        rs[3].assertValue(subtract(w1, w1));
1677 >        assertTrue(snd.complete(w2));
1678 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1679 >
1680 >        checkCompletedNormally(h0, subtract(v1, v2));
1681 >        checkCompletedNormally(h2, subtract(v1, v2));
1682 >        checkCompletedNormally(h4, subtract(v1, v2));
1683 >        rs[0].assertValue(subtract(v1, v2));
1684 >        rs[2].assertValue(subtract(v1, v2));
1685 >        rs[4].assertValue(subtract(v1, v2));
1686  
1455        checkCompletedNormally(h, null);
1456        assertEquals(subtract(v1, v2), r.value);
1687          checkCompletedNormally(f, v1);
1688          checkCompletedNormally(g, v2);
1689      }}
1690  
1691      /**
1692 <     * thenAcceptBoth result completes exceptionally after exceptional
1692 >     * thenCombine result completes exceptionally after exceptional
1693       * completion of either source
1694       */
1695 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1466 <        for (ExecutionMode m : ExecutionMode.values())
1467 <        for (Integer v1 : new Integer[] { 1, null })
1468 <    {
1469 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471 <        final SubtractAction r = new SubtractAction();
1472 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1473 <        final CFException ex = new CFException();
1474 <
1475 <        f.completeExceptionally(ex);
1476 <        checkIncomplete(h);
1477 <        g.complete(v1);
1478 <
1479 <        checkCompletedWithWrappedCFException(h, ex);
1480 <        checkCompletedWithWrappedCFException(f, ex);
1481 <        assertEquals(0, r.invocationCount);
1482 <        checkCompletedNormally(g, v1);
1483 <    }}
1484 <
1485 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1486 <        for (ExecutionMode m : ExecutionMode.values())
1487 <        for (Integer v1 : new Integer[] { 1, null })
1488 <    {
1489 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1490 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1491 <        final SubtractAction r = new SubtractAction();
1492 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1493 <        final CFException ex = new CFException();
1494 <
1495 <        g.completeExceptionally(ex);
1496 <        checkIncomplete(h);
1497 <        f.complete(v1);
1498 <
1499 <        checkCompletedWithWrappedCFException(h, ex);
1500 <        checkCompletedWithWrappedCFException(g, ex);
1501 <        assertEquals(0, r.invocationCount);
1502 <        checkCompletedNormally(f, v1);
1503 <    }}
1504 <
1505 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1695 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1696          for (ExecutionMode m : ExecutionMode.values())
1697 +        for (boolean fFirst : new boolean[] { true, false })
1698 +        for (boolean failFirst : new boolean[] { true, false })
1699          for (Integer v1 : new Integer[] { 1, null })
1700      {
1701          final CompletableFuture<Integer> f = new CompletableFuture<>();
1702          final CompletableFuture<Integer> g = new CompletableFuture<>();
1511        final SubtractAction r = new SubtractAction();
1703          final CFException ex = new CFException();
1704 <
1705 <        g.completeExceptionally(ex);
1706 <        f.complete(v1);
1707 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1708 <
1709 <        checkCompletedWithWrappedCFException(h, ex);
1710 <        checkCompletedWithWrappedCFException(g, ex);
1711 <        assertEquals(0, r.invocationCount);
1712 <        checkCompletedNormally(f, v1);
1704 >        final SubtractFunction r1 = new SubtractFunction(m);
1705 >        final SubtractFunction r2 = new SubtractFunction(m);
1706 >        final SubtractFunction r3 = new SubtractFunction(m);
1707 >
1708 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1709 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1710 >        final Callable<Boolean> complete1 = failFirst ?
1711 >            () -> fst.completeExceptionally(ex) :
1712 >            () -> fst.complete(v1);
1713 >        final Callable<Boolean> complete2 = failFirst ?
1714 >            () -> snd.complete(v1) :
1715 >            () -> snd.completeExceptionally(ex);
1716 >
1717 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1718 >        assertTrue(complete1.call());
1719 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1720 >        checkIncomplete(h1);
1721 >        checkIncomplete(h2);
1722 >        assertTrue(complete2.call());
1723 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1724 >
1725 >        checkCompletedWithWrappedException(h1, ex);
1726 >        checkCompletedWithWrappedException(h2, ex);
1727 >        checkCompletedWithWrappedException(h3, ex);
1728 >        r1.assertNotInvoked();
1729 >        r2.assertNotInvoked();
1730 >        r3.assertNotInvoked();
1731 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1732 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1733      }}
1734  
1735 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1735 >    /**
1736 >     * thenCombine result completes exceptionally if either source cancelled
1737 >     */
1738 >    public void testThenCombine_sourceCancelled() throws Throwable {
1739          for (ExecutionMode m : ExecutionMode.values())
1740 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1741 +        for (boolean fFirst : new boolean[] { true, false })
1742 +        for (boolean failFirst : new boolean[] { true, false })
1743          for (Integer v1 : new Integer[] { 1, null })
1744      {
1745          final CompletableFuture<Integer> f = new CompletableFuture<>();
1746          final CompletableFuture<Integer> g = new CompletableFuture<>();
1747 <        final SubtractAction r = new SubtractAction();
1748 <        final CFException ex = new CFException();
1749 <
1750 <        f.completeExceptionally(ex);
1751 <        g.complete(v1);
1752 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1753 <
1754 <        checkCompletedWithWrappedCFException(h, ex);
1755 <        checkCompletedWithWrappedCFException(f, ex);
1756 <        assertEquals(0, r.invocationCount);
1757 <        checkCompletedNormally(g, v1);
1747 >        final SubtractFunction r1 = new SubtractFunction(m);
1748 >        final SubtractFunction r2 = new SubtractFunction(m);
1749 >        final SubtractFunction r3 = new SubtractFunction(m);
1750 >
1751 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1752 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1753 >        final Callable<Boolean> complete1 = failFirst ?
1754 >            () -> fst.cancel(mayInterruptIfRunning) :
1755 >            () -> fst.complete(v1);
1756 >        final Callable<Boolean> complete2 = failFirst ?
1757 >            () -> snd.complete(v1) :
1758 >            () -> snd.cancel(mayInterruptIfRunning);
1759 >
1760 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1761 >        assertTrue(complete1.call());
1762 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1763 >        checkIncomplete(h1);
1764 >        checkIncomplete(h2);
1765 >        assertTrue(complete2.call());
1766 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1767 >
1768 >        checkCompletedWithWrappedCancellationException(h1);
1769 >        checkCompletedWithWrappedCancellationException(h2);
1770 >        checkCompletedWithWrappedCancellationException(h3);
1771 >        r1.assertNotInvoked();
1772 >        r2.assertNotInvoked();
1773 >        r3.assertNotInvoked();
1774 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1775 >        checkCancelled(failFirst ? fst : snd);
1776      }}
1777  
1778      /**
1779 <     * thenAcceptBoth result completes exceptionally if action does
1779 >     * thenCombine result completes exceptionally if action does
1780       */
1781 <    public void testThenAcceptBoth_actionFailed1() {
1781 >    public void testThenCombine_actionFailed() {
1782          for (ExecutionMode m : ExecutionMode.values())
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 FailingBiConsumer r = new FailingBiConsumer();
1790 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1791 <
1792 <        f.complete(v1);
1793 <        checkIncomplete(h);
1794 <        g.complete(v2);
1795 <
1796 <        checkCompletedWithWrappedCFException(h);
1789 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1790 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1791 >        final FailingBiFunction r3 = new FailingBiFunction(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<Integer> h1 = m.thenCombine(f, g, r1);
1799 >        assertTrue(fst.complete(w1));
1800 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1801 >        assertTrue(snd.complete(w2));
1802 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1803 >
1804 >        checkCompletedWithWrappedCFException(h1);
1805 >        checkCompletedWithWrappedCFException(h2);
1806 >        checkCompletedWithWrappedCFException(h3);
1807 >        r1.assertInvoked();
1808 >        r2.assertInvoked();
1809 >        r3.assertInvoked();
1810          checkCompletedNormally(f, v1);
1811          checkCompletedNormally(g, v2);
1812      }}
1813  
1814 <    public void testThenAcceptBoth_actionFailed2() {
1814 >    /**
1815 >     * thenAcceptBoth result completes normally after normal
1816 >     * completion of sources
1817 >     */
1818 >    public void testThenAcceptBoth_normalCompletion() {
1819          for (ExecutionMode m : ExecutionMode.values())
1820 +        for (boolean fFirst : new boolean[] { true, false })
1821          for (Integer v1 : new Integer[] { 1, null })
1822          for (Integer v2 : new Integer[] { 2, null })
1823      {
1824          final CompletableFuture<Integer> f = new CompletableFuture<>();
1825          final CompletableFuture<Integer> g = new CompletableFuture<>();
1826 <        final FailingBiConsumer r = new FailingBiConsumer();
1827 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1828 <
1829 <        g.complete(v2);
1830 <        checkIncomplete(h);
1831 <        f.complete(v1);
1832 <
1833 <        checkCompletedWithWrappedCFException(h);
1826 >        final SubtractAction r1 = new SubtractAction(m);
1827 >        final SubtractAction r2 = new SubtractAction(m);
1828 >        final SubtractAction r3 = new SubtractAction(m);
1829 >
1830 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1831 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1832 >        final Integer w1 =  fFirst ? v1 : v2;
1833 >        final Integer w2 = !fFirst ? v1 : v2;
1834 >
1835 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1836 >        assertTrue(fst.complete(w1));
1837 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1838 >        checkIncomplete(h1);
1839 >        checkIncomplete(h2);
1840 >        r1.assertNotInvoked();
1841 >        r2.assertNotInvoked();
1842 >        assertTrue(snd.complete(w2));
1843 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1844 >
1845 >        checkCompletedNormally(h1, null);
1846 >        checkCompletedNormally(h2, null);
1847 >        checkCompletedNormally(h3, null);
1848 >        r1.assertValue(subtract(v1, v2));
1849 >        r2.assertValue(subtract(v1, v2));
1850 >        r3.assertValue(subtract(v1, v2));
1851          checkCompletedNormally(f, v1);
1852          checkCompletedNormally(g, v2);
1853      }}
1854  
1855      /**
1856 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1856 >     * thenAcceptBoth result completes exceptionally after exceptional
1857 >     * completion of either source
1858       */
1859 <    public void testThenAcceptBoth_sourceCancelled1() {
1859 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1860          for (ExecutionMode m : ExecutionMode.values())
1861 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1862 <        for (Integer v1 : new Integer[] { 1, null })
1591 <    {
1592 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1593 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1594 <        final SubtractAction r = new SubtractAction();
1595 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1596 <
1597 <        assertTrue(f.cancel(mayInterruptIfRunning));
1598 <        checkIncomplete(h);
1599 <        g.complete(v1);
1600 <
1601 <        checkCompletedWithWrappedCancellationException(h);
1602 <        checkCancelled(f);
1603 <        assertEquals(0, r.invocationCount);
1604 <        checkCompletedNormally(g, v1);
1605 <    }}
1606 <
1607 <    public void testThenAcceptBoth_sourceCancelled2() {
1608 <        for (ExecutionMode m : ExecutionMode.values())
1609 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1610 <        for (Integer v1 : new Integer[] { 1, null })
1611 <    {
1612 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1613 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1614 <        final SubtractAction r = new SubtractAction();
1615 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1616 <
1617 <        assertTrue(g.cancel(mayInterruptIfRunning));
1618 <        checkIncomplete(h);
1619 <        f.complete(v1);
1620 <
1621 <        checkCompletedWithWrappedCancellationException(h);
1622 <        checkCancelled(g);
1623 <        assertEquals(0, r.invocationCount);
1624 <        checkCompletedNormally(f, v1);
1625 <    }}
1626 <
1627 <    public void testThenAcceptBoth_sourceCancelled3() {
1628 <        for (ExecutionMode m : ExecutionMode.values())
1629 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1861 >        for (boolean fFirst : new boolean[] { true, false })
1862 >        for (boolean failFirst : new boolean[] { true, false })
1863          for (Integer v1 : new Integer[] { 1, null })
1864      {
1865          final CompletableFuture<Integer> f = new CompletableFuture<>();
1866          final CompletableFuture<Integer> g = new CompletableFuture<>();
1867 <        final SubtractAction r = new SubtractAction();
1868 <
1869 <        assertTrue(g.cancel(mayInterruptIfRunning));
1870 <        f.complete(v1);
1871 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1872 <
1873 <        checkCompletedWithWrappedCancellationException(h);
1874 <        checkCancelled(g);
1875 <        assertEquals(0, r.invocationCount);
1876 <        checkCompletedNormally(f, v1);
1867 >        final CFException ex = new CFException();
1868 >        final SubtractAction r1 = new SubtractAction(m);
1869 >        final SubtractAction r2 = new SubtractAction(m);
1870 >        final SubtractAction r3 = new SubtractAction(m);
1871 >
1872 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1873 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1874 >        final Callable<Boolean> complete1 = failFirst ?
1875 >            () -> fst.completeExceptionally(ex) :
1876 >            () -> fst.complete(v1);
1877 >        final Callable<Boolean> complete2 = failFirst ?
1878 >            () -> snd.complete(v1) :
1879 >            () -> snd.completeExceptionally(ex);
1880 >
1881 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1882 >        assertTrue(complete1.call());
1883 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1884 >        checkIncomplete(h1);
1885 >        checkIncomplete(h2);
1886 >        assertTrue(complete2.call());
1887 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1888 >
1889 >        checkCompletedWithWrappedException(h1, ex);
1890 >        checkCompletedWithWrappedException(h2, ex);
1891 >        checkCompletedWithWrappedException(h3, ex);
1892 >        r1.assertNotInvoked();
1893 >        r2.assertNotInvoked();
1894 >        r3.assertNotInvoked();
1895 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1896 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1897      }}
1898  
1899 <    public void testThenAcceptBoth_sourceCancelled4() {
1899 >    /**
1900 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1901 >     */
1902 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1903          for (ExecutionMode m : ExecutionMode.values())
1904          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1905 +        for (boolean fFirst : new boolean[] { true, false })
1906 +        for (boolean failFirst : new boolean[] { true, false })
1907          for (Integer v1 : new Integer[] { 1, null })
1908      {
1909          final CompletableFuture<Integer> f = new CompletableFuture<>();
1910          final CompletableFuture<Integer> g = new CompletableFuture<>();
1911 <        final SubtractAction r = new SubtractAction();
1912 <
1913 <        assertTrue(f.cancel(mayInterruptIfRunning));
1914 <        g.complete(v1);
1915 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1916 <
1917 <        checkCompletedWithWrappedCancellationException(h);
1918 <        checkCancelled(f);
1919 <        assertEquals(0, r.invocationCount);
1920 <        checkCompletedNormally(g, v1);
1911 >        final SubtractAction r1 = new SubtractAction(m);
1912 >        final SubtractAction r2 = new SubtractAction(m);
1913 >        final SubtractAction r3 = new SubtractAction(m);
1914 >
1915 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1916 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1917 >        final Callable<Boolean> complete1 = failFirst ?
1918 >            () -> fst.cancel(mayInterruptIfRunning) :
1919 >            () -> fst.complete(v1);
1920 >        final Callable<Boolean> complete2 = failFirst ?
1921 >            () -> snd.complete(v1) :
1922 >            () -> snd.cancel(mayInterruptIfRunning);
1923 >
1924 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1925 >        assertTrue(complete1.call());
1926 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1927 >        checkIncomplete(h1);
1928 >        checkIncomplete(h2);
1929 >        assertTrue(complete2.call());
1930 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1931 >
1932 >        checkCompletedWithWrappedCancellationException(h1);
1933 >        checkCompletedWithWrappedCancellationException(h2);
1934 >        checkCompletedWithWrappedCancellationException(h3);
1935 >        r1.assertNotInvoked();
1936 >        r2.assertNotInvoked();
1937 >        r3.assertNotInvoked();
1938 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1939 >        checkCancelled(failFirst ? fst : snd);
1940      }}
1941  
1942      /**
1943 <     * runAfterBoth result completes normally after normal
1667 <     * completion of sources
1943 >     * thenAcceptBoth result completes exceptionally if action does
1944       */
1945 <    public void testRunAfterBoth_normalCompletion1() {
1670 <        for (ExecutionMode m : ExecutionMode.values())
1671 <        for (Integer v1 : new Integer[] { 1, null })
1672 <        for (Integer v2 : new Integer[] { 2, null })
1673 <    {
1674 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1675 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1676 <        final Noop r = new Noop();
1677 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1678 <
1679 <        f.complete(v1);
1680 <        checkIncomplete(h);
1681 <        assertEquals(0, r.invocationCount);
1682 <        g.complete(v2);
1683 <
1684 <        checkCompletedNormally(h, null);
1685 <        assertEquals(1, r.invocationCount);
1686 <        checkCompletedNormally(f, v1);
1687 <        checkCompletedNormally(g, v2);
1688 <    }}
1689 <
1690 <    public void testRunAfterBoth_normalCompletion2() {
1691 <        for (ExecutionMode m : ExecutionMode.values())
1692 <        for (Integer v1 : new Integer[] { 1, null })
1693 <        for (Integer v2 : new Integer[] { 2, null })
1694 <    {
1695 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1696 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final Noop r = new Noop();
1698 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1699 <
1700 <        g.complete(v2);
1701 <        checkIncomplete(h);
1702 <        assertEquals(0, r.invocationCount);
1703 <        f.complete(v1);
1704 <
1705 <        checkCompletedNormally(h, null);
1706 <        assertEquals(1, r.invocationCount);
1707 <        checkCompletedNormally(f, v1);
1708 <        checkCompletedNormally(g, v2);
1709 <    }}
1710 <
1711 <    public void testRunAfterBoth_normalCompletion3() {
1945 >    public void testThenAcceptBoth_actionFailed() {
1946          for (ExecutionMode m : ExecutionMode.values())
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();
1954 <
1955 <        g.complete(v2);
1956 <        f.complete(v1);
1957 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1958 <
1959 <        checkCompletedNormally(h, null);
1960 <        assertEquals(1, r.invocationCount);
1953 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1954 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1955 >        final FailingBiConsumer r3 = new FailingBiConsumer(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.thenAcceptBoth(f, g, r1);
1963 >        assertTrue(fst.complete(w1));
1964 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1965 >        assertTrue(snd.complete(w2));
1966 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1967 >
1968 >        checkCompletedWithWrappedCFException(h1);
1969 >        checkCompletedWithWrappedCFException(h2);
1970 >        checkCompletedWithWrappedCFException(h3);
1971 >        r1.assertInvoked();
1972 >        r2.assertInvoked();
1973 >        r3.assertInvoked();
1974          checkCompletedNormally(f, v1);
1975          checkCompletedNormally(g, v2);
1976      }}
1977  
1978 <    public void testRunAfterBoth_normalCompletion4() {
1978 >    /**
1979 >     * runAfterBoth result completes normally after normal
1980 >     * completion of sources
1981 >     */
1982 >    public void testRunAfterBoth_normalCompletion() {
1983          for (ExecutionMode m : ExecutionMode.values())
1984 +        for (boolean fFirst : new boolean[] { true, false })
1985          for (Integer v1 : new Integer[] { 1, null })
1986          for (Integer v2 : new Integer[] { 2, null })
1987      {
1988          final CompletableFuture<Integer> f = new CompletableFuture<>();
1989          final CompletableFuture<Integer> g = new CompletableFuture<>();
1990 <        final Noop r = new Noop();
1991 <
1992 <        f.complete(v1);
1993 <        g.complete(v2);
1994 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1995 <
1996 <        checkCompletedNormally(h, null);
1997 <        assertEquals(1, r.invocationCount);
1990 >        final Noop r1 = new Noop(m);
1991 >        final Noop r2 = new Noop(m);
1992 >        final Noop r3 = new Noop(m);
1993 >
1994 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1995 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1996 >        final Integer w1 =  fFirst ? v1 : v2;
1997 >        final Integer w2 = !fFirst ? v1 : v2;
1998 >
1999 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2000 >        assertTrue(fst.complete(w1));
2001 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2002 >        checkIncomplete(h1);
2003 >        checkIncomplete(h2);
2004 >        r1.assertNotInvoked();
2005 >        r2.assertNotInvoked();
2006 >        assertTrue(snd.complete(w2));
2007 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2008 >
2009 >        checkCompletedNormally(h1, null);
2010 >        checkCompletedNormally(h2, null);
2011 >        checkCompletedNormally(h3, null);
2012 >        r1.assertInvoked();
2013 >        r2.assertInvoked();
2014 >        r3.assertInvoked();
2015          checkCompletedNormally(f, v1);
2016          checkCompletedNormally(g, v2);
2017      }}
# Line 1750 | Line 2020 | public class CompletableFutureTest exten
2020       * runAfterBoth result completes exceptionally after exceptional
2021       * completion of either source
2022       */
2023 <    public void testRunAfterBoth_exceptionalCompletion1() {
1754 <        for (ExecutionMode m : ExecutionMode.values())
1755 <        for (Integer v1 : new Integer[] { 1, null })
1756 <    {
1757 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1758 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1759 <        final Noop r = new Noop();
1760 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1761 <        final CFException ex = new CFException();
1762 <
1763 <        f.completeExceptionally(ex);
1764 <        checkIncomplete(h);
1765 <        g.complete(v1);
1766 <
1767 <        checkCompletedWithWrappedCFException(h, ex);
1768 <        checkCompletedWithWrappedCFException(f, ex);
1769 <        assertEquals(0, r.invocationCount);
1770 <        checkCompletedNormally(g, v1);
1771 <    }}
1772 <
1773 <    public void testRunAfterBoth_exceptionalCompletion2() {
1774 <        for (ExecutionMode m : ExecutionMode.values())
1775 <        for (Integer v1 : new Integer[] { 1, null })
1776 <    {
1777 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1778 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1779 <        final Noop r = new Noop();
1780 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1781 <        final CFException ex = new CFException();
1782 <
1783 <        g.completeExceptionally(ex);
1784 <        checkIncomplete(h);
1785 <        f.complete(v1);
1786 <
1787 <        checkCompletedWithWrappedCFException(h, ex);
1788 <        checkCompletedWithWrappedCFException(g, ex);
1789 <        assertEquals(0, r.invocationCount);
1790 <        checkCompletedNormally(f, v1);
1791 <    }}
1792 <
1793 <    public void testRunAfterBoth_exceptionalCompletion3() {
2023 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2024          for (ExecutionMode m : ExecutionMode.values())
2025 +        for (boolean fFirst : new boolean[] { true, false })
2026 +        for (boolean failFirst : new boolean[] { true, false })
2027          for (Integer v1 : new Integer[] { 1, null })
2028      {
2029          final CompletableFuture<Integer> f = new CompletableFuture<>();
2030          final CompletableFuture<Integer> g = new CompletableFuture<>();
1799        final Noop r = new Noop();
2031          final CFException ex = new CFException();
2032 <
2033 <        g.completeExceptionally(ex);
2034 <        f.complete(v1);
2035 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2036 <
2037 <        checkCompletedWithWrappedCFException(h, ex);
2038 <        checkCompletedWithWrappedCFException(g, ex);
2039 <        assertEquals(0, r.invocationCount);
2040 <        checkCompletedNormally(f, v1);
2032 >        final Noop r1 = new Noop(m);
2033 >        final Noop r2 = new Noop(m);
2034 >        final Noop r3 = new Noop(m);
2035 >
2036 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2037 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2038 >        final Callable<Boolean> complete1 = failFirst ?
2039 >            () -> fst.completeExceptionally(ex) :
2040 >            () -> fst.complete(v1);
2041 >        final Callable<Boolean> complete2 = failFirst ?
2042 >            () -> snd.complete(v1) :
2043 >            () -> snd.completeExceptionally(ex);
2044 >
2045 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2046 >        assertTrue(complete1.call());
2047 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2048 >        checkIncomplete(h1);
2049 >        checkIncomplete(h2);
2050 >        assertTrue(complete2.call());
2051 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2052 >
2053 >        checkCompletedWithWrappedException(h1, ex);
2054 >        checkCompletedWithWrappedException(h2, ex);
2055 >        checkCompletedWithWrappedException(h3, ex);
2056 >        r1.assertNotInvoked();
2057 >        r2.assertNotInvoked();
2058 >        r3.assertNotInvoked();
2059 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2060 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2061      }}
2062  
2063 <    public void testRunAfterBoth_exceptionalCompletion4() {
2063 >    /**
2064 >     * runAfterBoth result completes exceptionally if either source cancelled
2065 >     */
2066 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2067          for (ExecutionMode m : ExecutionMode.values())
2068 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2069 +        for (boolean fFirst : new boolean[] { true, false })
2070 +        for (boolean failFirst : new boolean[] { true, false })
2071          for (Integer v1 : new Integer[] { 1, null })
2072      {
2073          final CompletableFuture<Integer> f = new CompletableFuture<>();
2074          final CompletableFuture<Integer> g = new CompletableFuture<>();
2075 <        final Noop r = new Noop();
2076 <        final CFException ex = new CFException();
2077 <
2078 <        f.completeExceptionally(ex);
2079 <        g.complete(v1);
2080 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2081 <
2082 <        checkCompletedWithWrappedCFException(h, ex);
2083 <        checkCompletedWithWrappedCFException(f, ex);
2084 <        assertEquals(0, r.invocationCount);
2085 <        checkCompletedNormally(g, v1);
2075 >        final Noop r1 = new Noop(m);
2076 >        final Noop r2 = new Noop(m);
2077 >        final Noop r3 = new Noop(m);
2078 >
2079 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2080 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2081 >        final Callable<Boolean> complete1 = failFirst ?
2082 >            () -> fst.cancel(mayInterruptIfRunning) :
2083 >            () -> fst.complete(v1);
2084 >        final Callable<Boolean> complete2 = failFirst ?
2085 >            () -> snd.complete(v1) :
2086 >            () -> snd.cancel(mayInterruptIfRunning);
2087 >
2088 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2089 >        assertTrue(complete1.call());
2090 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2091 >        checkIncomplete(h1);
2092 >        checkIncomplete(h2);
2093 >        assertTrue(complete2.call());
2094 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2095 >
2096 >        checkCompletedWithWrappedCancellationException(h1);
2097 >        checkCompletedWithWrappedCancellationException(h2);
2098 >        checkCompletedWithWrappedCancellationException(h3);
2099 >        r1.assertNotInvoked();
2100 >        r2.assertNotInvoked();
2101 >        r3.assertNotInvoked();
2102 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2103 >        checkCancelled(failFirst ? fst : snd);
2104      }}
2105  
2106      /**
2107       * runAfterBoth result completes exceptionally if action does
2108       */
2109 <    public void testRunAfterBoth_actionFailed1() {
1835 <        for (ExecutionMode m : ExecutionMode.values())
1836 <        for (Integer v1 : new Integer[] { 1, null })
1837 <        for (Integer v2 : new Integer[] { 2, null })
1838 <    {
1839 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1840 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1841 <        final FailingNoop r = new FailingNoop();
1842 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1843 <
1844 <        f.complete(v1);
1845 <        checkIncomplete(h);
1846 <        g.complete(v2);
1847 <
1848 <        checkCompletedWithWrappedCFException(h);
1849 <        checkCompletedNormally(f, v1);
1850 <        checkCompletedNormally(g, v2);
1851 <    }}
1852 <
1853 <    public void testRunAfterBoth_actionFailed2() {
2109 >    public void testRunAfterBoth_actionFailed() {
2110          for (ExecutionMode m : ExecutionMode.values())
2111 +        for (boolean fFirst : new boolean[] { true, false })
2112          for (Integer v1 : new Integer[] { 1, null })
2113          for (Integer v2 : new Integer[] { 2, null })
2114      {
2115          final CompletableFuture<Integer> f = new CompletableFuture<>();
2116          final CompletableFuture<Integer> g = new CompletableFuture<>();
2117 <        final FailingNoop r = new FailingNoop();
2118 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2119 <
2120 <        g.complete(v2);
2121 <        checkIncomplete(h);
2122 <        f.complete(v1);
2123 <
2124 <        checkCompletedWithWrappedCFException(h);
2117 >        final FailingRunnable r1 = new FailingRunnable(m);
2118 >        final FailingRunnable r2 = new FailingRunnable(m);
2119 >        final FailingRunnable r3 = new FailingRunnable(m);
2120 >
2121 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2122 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2123 >        final Integer w1 =  fFirst ? v1 : v2;
2124 >        final Integer w2 = !fFirst ? v1 : v2;
2125 >
2126 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2127 >        assertTrue(fst.complete(w1));
2128 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2129 >        assertTrue(snd.complete(w2));
2130 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2131 >
2132 >        checkCompletedWithWrappedCFException(h1);
2133 >        checkCompletedWithWrappedCFException(h2);
2134 >        checkCompletedWithWrappedCFException(h3);
2135 >        r1.assertInvoked();
2136 >        r2.assertInvoked();
2137 >        r3.assertInvoked();
2138          checkCompletedNormally(f, v1);
2139          checkCompletedNormally(g, v2);
2140      }}
2141  
2142      /**
1873     * runAfterBoth result completes exceptionally if either source cancelled
1874     */
1875    public void testRunAfterBoth_sourceCancelled1() {
1876        for (ExecutionMode m : ExecutionMode.values())
1877        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1878        for (Integer v1 : new Integer[] { 1, null })
1879    {
1880        final CompletableFuture<Integer> f = new CompletableFuture<>();
1881        final CompletableFuture<Integer> g = new CompletableFuture<>();
1882        final Noop r = new Noop();
1883        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1884
1885        assertTrue(f.cancel(mayInterruptIfRunning));
1886        checkIncomplete(h);
1887        g.complete(v1);
1888
1889        checkCompletedWithWrappedCancellationException(h);
1890        checkCancelled(f);
1891        assertEquals(0, r.invocationCount);
1892        checkCompletedNormally(g, v1);
1893    }}
1894
1895    public void testRunAfterBoth_sourceCancelled2() {
1896        for (ExecutionMode m : ExecutionMode.values())
1897        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1898        for (Integer v1 : new Integer[] { 1, null })
1899    {
1900        final CompletableFuture<Integer> f = new CompletableFuture<>();
1901        final CompletableFuture<Integer> g = new CompletableFuture<>();
1902        final Noop r = new Noop();
1903        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1904
1905        assertTrue(g.cancel(mayInterruptIfRunning));
1906        checkIncomplete(h);
1907        f.complete(v1);
1908
1909        checkCompletedWithWrappedCancellationException(h);
1910        checkCancelled(g);
1911        assertEquals(0, r.invocationCount);
1912        checkCompletedNormally(f, v1);
1913    }}
1914
1915    public void testRunAfterBoth_sourceCancelled3() {
1916        for (ExecutionMode m : ExecutionMode.values())
1917        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1918        for (Integer v1 : new Integer[] { 1, null })
1919    {
1920        final CompletableFuture<Integer> f = new CompletableFuture<>();
1921        final CompletableFuture<Integer> g = new CompletableFuture<>();
1922        final Noop r = new Noop();
1923
1924        assertTrue(g.cancel(mayInterruptIfRunning));
1925        f.complete(v1);
1926        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1927
1928        checkCompletedWithWrappedCancellationException(h);
1929        checkCancelled(g);
1930        assertEquals(0, r.invocationCount);
1931        checkCompletedNormally(f, v1);
1932    }}
1933
1934    public void testRunAfterBoth_sourceCancelled4() {
1935        for (ExecutionMode m : ExecutionMode.values())
1936        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1937        for (Integer v1 : new Integer[] { 1, null })
1938    {
1939        final CompletableFuture<Integer> f = new CompletableFuture<>();
1940        final CompletableFuture<Integer> g = new CompletableFuture<>();
1941        final Noop r = new Noop();
1942
1943        assertTrue(f.cancel(mayInterruptIfRunning));
1944        g.complete(v1);
1945        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1946
1947        checkCompletedWithWrappedCancellationException(h);
1948        checkCancelled(f);
1949        assertEquals(0, r.invocationCount);
1950        checkCompletedNormally(g, v1);
1951    }}
1952
1953    /**
2143       * applyToEither result completes normally after normal completion
2144       * of either source
2145       */
2146 <    public void testApplyToEither_normalCompletion1() {
2146 >    public void testApplyToEither_normalCompletion() {
2147          for (ExecutionMode m : ExecutionMode.values())
2148          for (Integer v1 : new Integer[] { 1, null })
2149          for (Integer v2 : new Integer[] { 2, null })
2150      {
2151          final CompletableFuture<Integer> f = new CompletableFuture<>();
2152          final CompletableFuture<Integer> g = new CompletableFuture<>();
2153 <        final IncFunction r = new IncFunction();
2154 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2153 >        final IncFunction[] rs = new IncFunction[6];
2154 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2155  
2156 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2157 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2158 +        checkIncomplete(h0);
2159 +        checkIncomplete(h1);
2160 +        rs[0].assertNotInvoked();
2161 +        rs[1].assertNotInvoked();
2162          f.complete(v1);
2163 <        checkCompletedNormally(h, inc(v1));
2163 >        checkCompletedNormally(h0, inc(v1));
2164 >        checkCompletedNormally(h1, inc(v1));
2165 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2166 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2167 >        checkCompletedNormally(h2, inc(v1));
2168 >        checkCompletedNormally(h3, inc(v1));
2169          g.complete(v2);
2170  
2171 <        checkCompletedNormally(f, v1);
2172 <        checkCompletedNormally(g, v2);
2173 <        checkCompletedNormally(h, inc(v1));
2174 <    }}
2175 <
2176 <    public void testApplyToEither_normalCompletion2() {
2177 <        for (ExecutionMode m : ExecutionMode.values())
2178 <        for (Integer v1 : new Integer[] { 1, null })
2179 <        for (Integer v2 : new Integer[] { 2, null })
1980 <    {
1981 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1982 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1983 <        final IncFunction r = new IncFunction();
1984 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1985 <
1986 <        g.complete(v2);
1987 <        checkCompletedNormally(h, inc(v2));
1988 <        f.complete(v1);
2171 >        // unspecified behavior - both source completions available
2172 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2173 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2174 >        rs[4].assertValue(h4.join());
2175 >        rs[5].assertValue(h5.join());
2176 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2177 >                   Objects.equals(inc(v2), h4.join()));
2178 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2179 >                   Objects.equals(inc(v2), h5.join()));
2180  
2181          checkCompletedNormally(f, v1);
2182          checkCompletedNormally(g, v2);
2183 <        checkCompletedNormally(h, inc(v2));
2184 <        }}
2185 <
2186 <    public void testApplyToEither_normalCompletion3() {
2187 <        for (ExecutionMode m : ExecutionMode.values())
1997 <        for (Integer v1 : new Integer[] { 1, null })
1998 <        for (Integer v2 : new Integer[] { 2, null })
1999 <    {
2000 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 <        final IncFunction r = new IncFunction();
2003 <
2004 <        f.complete(v1);
2005 <        g.complete(v2);
2006 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2007 <
2008 <        checkCompletedNormally(f, v1);
2009 <        checkCompletedNormally(g, v2);
2010 <
2011 <        // unspecified behavior
2012 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2013 <                   Objects.equals(h.join(), inc(v2)));
2014 <        assertEquals(1, r.invocationCount);
2183 >        checkCompletedNormally(h0, inc(v1));
2184 >        checkCompletedNormally(h1, inc(v1));
2185 >        checkCompletedNormally(h2, inc(v1));
2186 >        checkCompletedNormally(h3, inc(v1));
2187 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2188      }}
2189  
2190      /**
2191       * applyToEither result completes exceptionally after exceptional
2192       * completion of either source
2193       */
2194 <    public void testApplyToEither_exceptionalCompletion1() {
2194 >    public void testApplyToEither_exceptionalCompletion() {
2195          for (ExecutionMode m : ExecutionMode.values())
2196          for (Integer v1 : new Integer[] { 1, null })
2197      {
2198          final CompletableFuture<Integer> f = new CompletableFuture<>();
2199          final CompletableFuture<Integer> g = new CompletableFuture<>();
2027        final IncFunction r = new IncFunction();
2028        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2200          final CFException ex = new CFException();
2201 +        final IncFunction[] rs = new IncFunction[6];
2202 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2203  
2204 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2205 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2206 +        checkIncomplete(h0);
2207 +        checkIncomplete(h1);
2208 +        rs[0].assertNotInvoked();
2209 +        rs[1].assertNotInvoked();
2210          f.completeExceptionally(ex);
2211 <        checkCompletedWithWrappedCFException(h, ex);
2211 >        checkCompletedWithWrappedException(h0, ex);
2212 >        checkCompletedWithWrappedException(h1, ex);
2213 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2214 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2215 >        checkCompletedWithWrappedException(h2, ex);
2216 >        checkCompletedWithWrappedException(h3, ex);
2217          g.complete(v1);
2218  
2219 <        assertEquals(0, r.invocationCount);
2219 >        // unspecified behavior - both source completions available
2220 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2221 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2222 >        try {
2223 >            assertEquals(inc(v1), h4.join());
2224 >            rs[4].assertValue(inc(v1));
2225 >        } catch (CompletionException ok) {
2226 >            checkCompletedWithWrappedException(h4, ex);
2227 >            rs[4].assertNotInvoked();
2228 >        }
2229 >        try {
2230 >            assertEquals(inc(v1), h5.join());
2231 >            rs[5].assertValue(inc(v1));
2232 >        } catch (CompletionException ok) {
2233 >            checkCompletedWithWrappedException(h5, ex);
2234 >            rs[5].assertNotInvoked();
2235 >        }
2236 >
2237 >        checkCompletedExceptionally(f, ex);
2238          checkCompletedNormally(g, v1);
2239 <        checkCompletedWithWrappedCFException(f, ex);
2240 <        checkCompletedWithWrappedCFException(h, ex);
2239 >        checkCompletedWithWrappedException(h0, ex);
2240 >        checkCompletedWithWrappedException(h1, ex);
2241 >        checkCompletedWithWrappedException(h2, ex);
2242 >        checkCompletedWithWrappedException(h3, ex);
2243 >        checkCompletedWithWrappedException(h4, ex);
2244 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2245      }}
2246  
2247      public void testApplyToEither_exceptionalCompletion2() {
2248          for (ExecutionMode m : ExecutionMode.values())
2249 +        for (boolean fFirst : new boolean[] { true, false })
2250          for (Integer v1 : new Integer[] { 1, null })
2251      {
2252          final CompletableFuture<Integer> f = new CompletableFuture<>();
2253          final CompletableFuture<Integer> g = new CompletableFuture<>();
2047        final IncFunction r = new IncFunction();
2048        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2049        final CFException ex = new CFException();
2050
2051        g.completeExceptionally(ex);
2052        checkCompletedWithWrappedCFException(h, ex);
2053        f.complete(v1);
2054
2055        assertEquals(0, r.invocationCount);
2056        checkCompletedNormally(f, v1);
2057        checkCompletedWithWrappedCFException(g, ex);
2058        checkCompletedWithWrappedCFException(h, ex);
2059    }}
2060
2061    public void testApplyToEither_exceptionalCompletion3() {
2062        for (ExecutionMode m : ExecutionMode.values())
2063        for (Integer v1 : new Integer[] { 1, null })
2064    {
2065        final CompletableFuture<Integer> f = new CompletableFuture<>();
2066        final CompletableFuture<Integer> g = new CompletableFuture<>();
2067        final IncFunction r = new IncFunction();
2254          final CFException ex = new CFException();
2255 +        final IncFunction[] rs = new IncFunction[6];
2256 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2257  
2258 <        g.completeExceptionally(ex);
2259 <        f.complete(v1);
2260 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2258 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2259 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2260 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2261 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2262 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2263 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2264  
2265 <        // unspecified behavior
2075 <        Integer v;
2265 >        // unspecified behavior - both source completions available
2266          try {
2267 <            assertEquals(inc(v1), h.join());
2268 <            assertEquals(1, r.invocationCount);
2267 >            assertEquals(inc(v1), h0.join());
2268 >            rs[0].assertValue(inc(v1));
2269          } catch (CompletionException ok) {
2270 <            checkCompletedWithWrappedCFException(h, ex);
2271 <            assertEquals(0, r.invocationCount);
2270 >            checkCompletedWithWrappedException(h0, ex);
2271 >            rs[0].assertNotInvoked();
2272          }
2083
2084        checkCompletedWithWrappedCFException(g, ex);
2085        checkCompletedNormally(f, v1);
2086    }}
2087
2088    public void testApplyToEither_exceptionalCompletion4() {
2089        for (ExecutionMode m : ExecutionMode.values())
2090        for (Integer v1 : new Integer[] { 1, null })
2091    {
2092        final CompletableFuture<Integer> f = new CompletableFuture<>();
2093        final CompletableFuture<Integer> g = new CompletableFuture<>();
2094        final IncFunction r = new IncFunction();
2095        final CFException ex = new CFException();
2096
2097        f.completeExceptionally(ex);
2098        g.complete(v1);
2099        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2100
2101        // unspecified behavior
2102        Integer v;
2273          try {
2274 <            assertEquals(inc(v1), h.join());
2275 <            assertEquals(1, r.invocationCount);
2274 >            assertEquals(inc(v1), h1.join());
2275 >            rs[1].assertValue(inc(v1));
2276          } catch (CompletionException ok) {
2277 <            checkCompletedWithWrappedCFException(h, ex);
2278 <            assertEquals(0, r.invocationCount);
2277 >            checkCompletedWithWrappedException(h1, ex);
2278 >            rs[1].assertNotInvoked();
2279 >        }
2280 >        try {
2281 >            assertEquals(inc(v1), h2.join());
2282 >            rs[2].assertValue(inc(v1));
2283 >        } catch (CompletionException ok) {
2284 >            checkCompletedWithWrappedException(h2, ex);
2285 >            rs[2].assertNotInvoked();
2286 >        }
2287 >        try {
2288 >            assertEquals(inc(v1), h3.join());
2289 >            rs[3].assertValue(inc(v1));
2290 >        } catch (CompletionException ok) {
2291 >            checkCompletedWithWrappedException(h3, ex);
2292 >            rs[3].assertNotInvoked();
2293          }
2294  
2111        checkCompletedWithWrappedCFException(f, ex);
2112        checkCompletedNormally(g, v1);
2113    }}
2114
2115    /**
2116     * applyToEither result completes exceptionally if action does
2117     */
2118    public void testApplyToEither_actionFailed1() {
2119        for (ExecutionMode m : ExecutionMode.values())
2120        for (Integer v1 : new Integer[] { 1, null })
2121        for (Integer v2 : new Integer[] { 2, null })
2122    {
2123        final CompletableFuture<Integer> f = new CompletableFuture<>();
2124        final CompletableFuture<Integer> g = new CompletableFuture<>();
2125        final FailingFunction r = new FailingFunction();
2126        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2127
2128        f.complete(v1);
2129        checkCompletedWithWrappedCFException(h);
2130        g.complete(v2);
2131        checkCompletedNormally(f, v1);
2132        checkCompletedNormally(g, v2);
2133    }}
2134
2135    public void testApplyToEither_actionFailed2() {
2136        for (ExecutionMode m : ExecutionMode.values())
2137        for (Integer v1 : new Integer[] { 1, null })
2138        for (Integer v2 : new Integer[] { 2, null })
2139    {
2140        final CompletableFuture<Integer> f = new CompletableFuture<>();
2141        final CompletableFuture<Integer> g = new CompletableFuture<>();
2142        final FailingFunction r = new FailingFunction();
2143        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2144
2145        g.complete(v2);
2146        checkCompletedWithWrappedCFException(h);
2147        f.complete(v1);
2295          checkCompletedNormally(f, v1);
2296 <        checkCompletedNormally(g, v2);
2296 >        checkCompletedExceptionally(g, ex);
2297      }}
2298  
2299      /**
2300       * applyToEither result completes exceptionally if either source cancelled
2301       */
2302 <    public void testApplyToEither_sourceCancelled1() {
2302 >    public void testApplyToEither_sourceCancelled() {
2303          for (ExecutionMode m : ExecutionMode.values())
2304          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2305          for (Integer v1 : new Integer[] { 1, null })
2306      {
2307          final CompletableFuture<Integer> f = new CompletableFuture<>();
2308          final CompletableFuture<Integer> g = new CompletableFuture<>();
2309 <        final IncFunction r = new IncFunction();
2310 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2309 >        final IncFunction[] rs = new IncFunction[6];
2310 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2311  
2312 <        assertTrue(f.cancel(mayInterruptIfRunning));
2313 <        checkCompletedWithWrappedCancellationException(h);
2312 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2313 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2314 >        checkIncomplete(h0);
2315 >        checkIncomplete(h1);
2316 >        rs[0].assertNotInvoked();
2317 >        rs[1].assertNotInvoked();
2318 >        f.cancel(mayInterruptIfRunning);
2319 >        checkCompletedWithWrappedCancellationException(h0);
2320 >        checkCompletedWithWrappedCancellationException(h1);
2321 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2322 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2323 >        checkCompletedWithWrappedCancellationException(h2);
2324 >        checkCompletedWithWrappedCancellationException(h3);
2325          g.complete(v1);
2326  
2327 +        // unspecified behavior - both source completions available
2328 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2329 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2330 +        try {
2331 +            assertEquals(inc(v1), h4.join());
2332 +            rs[4].assertValue(inc(v1));
2333 +        } catch (CompletionException ok) {
2334 +            checkCompletedWithWrappedCancellationException(h4);
2335 +            rs[4].assertNotInvoked();
2336 +        }
2337 +        try {
2338 +            assertEquals(inc(v1), h5.join());
2339 +            rs[5].assertValue(inc(v1));
2340 +        } catch (CompletionException ok) {
2341 +            checkCompletedWithWrappedCancellationException(h5);
2342 +            rs[5].assertNotInvoked();
2343 +        }
2344 +
2345          checkCancelled(f);
2170        assertEquals(0, r.invocationCount);
2346          checkCompletedNormally(g, v1);
2347 <        checkCompletedWithWrappedCancellationException(h);
2347 >        checkCompletedWithWrappedCancellationException(h0);
2348 >        checkCompletedWithWrappedCancellationException(h1);
2349 >        checkCompletedWithWrappedCancellationException(h2);
2350 >        checkCompletedWithWrappedCancellationException(h3);
2351 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2352      }}
2353  
2354      public void testApplyToEither_sourceCancelled2() {
2355          for (ExecutionMode m : ExecutionMode.values())
2356          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2357 +        for (boolean fFirst : new boolean[] { true, false })
2358          for (Integer v1 : new Integer[] { 1, null })
2359      {
2360          final CompletableFuture<Integer> f = new CompletableFuture<>();
2361          final CompletableFuture<Integer> g = new CompletableFuture<>();
2362 <        final IncFunction r = new IncFunction();
2363 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2184 <
2185 <        assertTrue(g.cancel(mayInterruptIfRunning));
2186 <        checkCompletedWithWrappedCancellationException(h);
2187 <        f.complete(v1);
2188 <
2189 <        checkCancelled(g);
2190 <        assertEquals(0, r.invocationCount);
2191 <        checkCompletedNormally(f, v1);
2192 <        checkCompletedWithWrappedCancellationException(h);
2193 <    }}
2194 <
2195 <    public void testApplyToEither_sourceCancelled3() {
2196 <        for (ExecutionMode m : ExecutionMode.values())
2197 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2198 <        for (Integer v1 : new Integer[] { 1, null })
2199 <    {
2200 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2201 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2202 <        final IncFunction r = new IncFunction();
2362 >        final IncFunction[] rs = new IncFunction[6];
2363 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2364  
2365 <        assertTrue(g.cancel(mayInterruptIfRunning));
2366 <        f.complete(v1);
2367 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2365 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2366 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2367 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2368 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2369 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2370 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2371  
2372 <        // unspecified behavior
2209 <        Integer v;
2372 >        // unspecified behavior - both source completions available
2373          try {
2374 <            assertEquals(inc(v1), h.join());
2375 <            assertEquals(1, r.invocationCount);
2374 >            assertEquals(inc(v1), h0.join());
2375 >            rs[0].assertValue(inc(v1));
2376          } catch (CompletionException ok) {
2377 <            checkCompletedWithWrappedCancellationException(h);
2378 <            assertEquals(0, r.invocationCount);
2377 >            checkCompletedWithWrappedCancellationException(h0);
2378 >            rs[0].assertNotInvoked();
2379 >        }
2380 >        try {
2381 >            assertEquals(inc(v1), h1.join());
2382 >            rs[1].assertValue(inc(v1));
2383 >        } catch (CompletionException ok) {
2384 >            checkCompletedWithWrappedCancellationException(h1);
2385 >            rs[1].assertNotInvoked();
2386 >        }
2387 >        try {
2388 >            assertEquals(inc(v1), h2.join());
2389 >            rs[2].assertValue(inc(v1));
2390 >        } catch (CompletionException ok) {
2391 >            checkCompletedWithWrappedCancellationException(h2);
2392 >            rs[2].assertNotInvoked();
2393          }
2217
2218        checkCancelled(g);
2219        checkCompletedNormally(f, v1);
2220    }}
2221
2222    public void testApplyToEither_sourceCancelled4() {
2223        for (ExecutionMode m : ExecutionMode.values())
2224        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2225        for (Integer v1 : new Integer[] { 1, null })
2226    {
2227        final CompletableFuture<Integer> f = new CompletableFuture<>();
2228        final CompletableFuture<Integer> g = new CompletableFuture<>();
2229        final IncFunction r = new IncFunction();
2230
2231        assertTrue(f.cancel(mayInterruptIfRunning));
2232        g.complete(v1);
2233        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2234
2235        // unspecified behavior
2236        Integer v;
2394          try {
2395 <            assertEquals(inc(v1), h.join());
2396 <            assertEquals(1, r.invocationCount);
2395 >            assertEquals(inc(v1), h3.join());
2396 >            rs[3].assertValue(inc(v1));
2397          } catch (CompletionException ok) {
2398 <            checkCompletedWithWrappedCancellationException(h);
2399 <            assertEquals(0, r.invocationCount);
2398 >            checkCompletedWithWrappedCancellationException(h3);
2399 >            rs[3].assertNotInvoked();
2400          }
2401  
2402 <        checkCancelled(f);
2403 <        checkCompletedNormally(g, v1);
2402 >        checkCompletedNormally(f, v1);
2403 >        checkCancelled(g);
2404      }}
2405  
2406      /**
2407 <     * acceptEither result completes normally after normal completion
2251 <     * of either source
2407 >     * applyToEither result completes exceptionally if action does
2408       */
2409 <    public void testAcceptEither_normalCompletion1() {
2409 >    public void testApplyToEither_actionFailed() {
2410          for (ExecutionMode m : ExecutionMode.values())
2411          for (Integer v1 : new Integer[] { 1, null })
2412          for (Integer v2 : new Integer[] { 2, null })
2413      {
2414          final CompletableFuture<Integer> f = new CompletableFuture<>();
2415          final CompletableFuture<Integer> g = new CompletableFuture<>();
2416 <        final IncAction r = new IncAction();
2417 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2416 >        final FailingFunction[] rs = new FailingFunction[6];
2417 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2418  
2419 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2420 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2421          f.complete(v1);
2422 <        checkCompletedNormally(h, null);
2423 <        assertEquals(inc(v1), r.value);
2424 <        g.complete(v2);
2422 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2423 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2424 >        checkCompletedWithWrappedCFException(h0);
2425 >        checkCompletedWithWrappedCFException(h1);
2426 >        checkCompletedWithWrappedCFException(h2);
2427 >        checkCompletedWithWrappedCFException(h3);
2428 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2429  
2430 <        checkCompletedNormally(f, v1);
2269 <        checkCompletedNormally(g, v2);
2270 <        checkCompletedNormally(h, null);
2271 <    }}
2430 >        g.complete(v2);
2431  
2432 <    public void testAcceptEither_normalCompletion2() {
2433 <        for (ExecutionMode m : ExecutionMode.values())
2434 <        for (Integer v1 : new Integer[] { 1, null })
2276 <        for (Integer v2 : new Integer[] { 2, null })
2277 <    {
2278 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2280 <        final IncAction r = new IncAction();
2281 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2432 >        // unspecified behavior - both source completions available
2433 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2434 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2435  
2436 <        g.complete(v2);
2437 <        checkCompletedNormally(h, null);
2438 <        assertEquals(inc(v2), r.value);
2439 <        f.complete(v1);
2436 >        checkCompletedWithWrappedCFException(h4);
2437 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2438 >                   Objects.equals(v2, rs[4].value));
2439 >        checkCompletedWithWrappedCFException(h5);
2440 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2441 >                   Objects.equals(v2, rs[5].value));
2442  
2443          checkCompletedNormally(f, v1);
2444          checkCompletedNormally(g, v2);
2290        checkCompletedNormally(h, null);
2445      }}
2446  
2447 <    public void testAcceptEither_normalCompletion3() {
2447 >    /**
2448 >     * acceptEither result completes normally after normal completion
2449 >     * of either source
2450 >     */
2451 >    public void testAcceptEither_normalCompletion() {
2452          for (ExecutionMode m : ExecutionMode.values())
2453          for (Integer v1 : new Integer[] { 1, null })
2454          for (Integer v2 : new Integer[] { 2, null })
2455      {
2456          final CompletableFuture<Integer> f = new CompletableFuture<>();
2457          final CompletableFuture<Integer> g = new CompletableFuture<>();
2458 <        final IncAction r = new IncAction();
2458 >        final NoopConsumer[] rs = new NoopConsumer[6];
2459 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2460  
2461 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2462 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2463 +        checkIncomplete(h0);
2464 +        checkIncomplete(h1);
2465 +        rs[0].assertNotInvoked();
2466 +        rs[1].assertNotInvoked();
2467          f.complete(v1);
2468 +        checkCompletedNormally(h0, null);
2469 +        checkCompletedNormally(h1, null);
2470 +        rs[0].assertValue(v1);
2471 +        rs[1].assertValue(v1);
2472 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2473 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2474 +        checkCompletedNormally(h2, null);
2475 +        checkCompletedNormally(h3, null);
2476 +        rs[2].assertValue(v1);
2477 +        rs[3].assertValue(v1);
2478          g.complete(v2);
2304        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2479  
2480 <        checkCompletedNormally(h, null);
2480 >        // unspecified behavior - both source completions available
2481 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2482 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2483 >        checkCompletedNormally(h4, null);
2484 >        checkCompletedNormally(h5, null);
2485 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2486 >                   Objects.equals(v2, rs[4].value));
2487 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2488 >                   Objects.equals(v2, rs[5].value));
2489 >
2490          checkCompletedNormally(f, v1);
2491          checkCompletedNormally(g, v2);
2492 <
2493 <        // unspecified behavior
2494 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2495 <                   Objects.equals(r.value, inc(v2)));
2492 >        checkCompletedNormally(h0, null);
2493 >        checkCompletedNormally(h1, null);
2494 >        checkCompletedNormally(h2, null);
2495 >        checkCompletedNormally(h3, null);
2496 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2497      }}
2498  
2499      /**
2500       * acceptEither result completes exceptionally after exceptional
2501       * completion of either source
2502       */
2503 <    public void testAcceptEither_exceptionalCompletion1() {
2503 >    public void testAcceptEither_exceptionalCompletion() {
2504          for (ExecutionMode m : ExecutionMode.values())
2505          for (Integer v1 : new Integer[] { 1, null })
2506      {
2507          final CompletableFuture<Integer> f = new CompletableFuture<>();
2508          final CompletableFuture<Integer> g = new CompletableFuture<>();
2325        final IncAction r = new IncAction();
2326        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2509          final CFException ex = new CFException();
2510 +        final NoopConsumer[] rs = new NoopConsumer[6];
2511 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2512  
2513 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2514 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2515 +        checkIncomplete(h0);
2516 +        checkIncomplete(h1);
2517 +        rs[0].assertNotInvoked();
2518 +        rs[1].assertNotInvoked();
2519          f.completeExceptionally(ex);
2520 <        checkCompletedWithWrappedCFException(h, ex);
2520 >        checkCompletedWithWrappedException(h0, ex);
2521 >        checkCompletedWithWrappedException(h1, ex);
2522 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2523 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2524 >        checkCompletedWithWrappedException(h2, ex);
2525 >        checkCompletedWithWrappedException(h3, ex);
2526 >
2527          g.complete(v1);
2528  
2529 <        assertEquals(0, r.invocationCount);
2529 >        // unspecified behavior - both source completions available
2530 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2531 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2532 >        try {
2533 >            assertNull(h4.join());
2534 >            rs[4].assertValue(v1);
2535 >        } catch (CompletionException ok) {
2536 >            checkCompletedWithWrappedException(h4, ex);
2537 >            rs[4].assertNotInvoked();
2538 >        }
2539 >        try {
2540 >            assertNull(h5.join());
2541 >            rs[5].assertValue(v1);
2542 >        } catch (CompletionException ok) {
2543 >            checkCompletedWithWrappedException(h5, ex);
2544 >            rs[5].assertNotInvoked();
2545 >        }
2546 >
2547 >        checkCompletedExceptionally(f, ex);
2548          checkCompletedNormally(g, v1);
2549 <        checkCompletedWithWrappedCFException(f, ex);
2550 <        checkCompletedWithWrappedCFException(h, ex);
2549 >        checkCompletedWithWrappedException(h0, ex);
2550 >        checkCompletedWithWrappedException(h1, ex);
2551 >        checkCompletedWithWrappedException(h2, ex);
2552 >        checkCompletedWithWrappedException(h3, ex);
2553 >        checkCompletedWithWrappedException(h4, ex);
2554 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2555      }}
2556  
2557      public void testAcceptEither_exceptionalCompletion2() {
2558          for (ExecutionMode m : ExecutionMode.values())
2559 +        for (boolean fFirst : new boolean[] { true, false })
2560          for (Integer v1 : new Integer[] { 1, null })
2561      {
2562          final CompletableFuture<Integer> f = new CompletableFuture<>();
2563          final CompletableFuture<Integer> g = new CompletableFuture<>();
2345        final IncAction r = new IncAction();
2346        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2347        final CFException ex = new CFException();
2348
2349        g.completeExceptionally(ex);
2350        checkCompletedWithWrappedCFException(h, ex);
2351        f.complete(v1);
2352
2353        assertEquals(0, r.invocationCount);
2354        checkCompletedNormally(f, v1);
2355        checkCompletedWithWrappedCFException(g, ex);
2356        checkCompletedWithWrappedCFException(h, ex);
2357    }}
2358
2359    public void testAcceptEither_exceptionalCompletion3() {
2360        for (ExecutionMode m : ExecutionMode.values())
2361        for (Integer v1 : new Integer[] { 1, null })
2362    {
2363        final CompletableFuture<Integer> f = new CompletableFuture<>();
2364        final CompletableFuture<Integer> g = new CompletableFuture<>();
2365        final IncAction r = new IncAction();
2564          final CFException ex = new CFException();
2565 +        final NoopConsumer[] rs = new NoopConsumer[6];
2566 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2567  
2568 <        g.completeExceptionally(ex);
2569 <        f.complete(v1);
2570 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2568 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2569 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2570 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2571 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2572 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2573 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2574  
2575 <        // unspecified behavior
2373 <        Integer v;
2575 >        // unspecified behavior - both source completions available
2576          try {
2577 <            assertNull(h.join());
2578 <            assertEquals(1, r.invocationCount);
2377 <            assertEquals(inc(v1), r.value);
2577 >            assertEquals(null, h0.join());
2578 >            rs[0].assertValue(v1);
2579          } catch (CompletionException ok) {
2580 <            checkCompletedWithWrappedCFException(h, ex);
2581 <            assertEquals(0, r.invocationCount);
2580 >            checkCompletedWithWrappedException(h0, ex);
2581 >            rs[0].assertNotInvoked();
2582          }
2382
2383        checkCompletedWithWrappedCFException(g, ex);
2384        checkCompletedNormally(f, v1);
2385    }}
2386
2387    public void testAcceptEither_exceptionalCompletion4() {
2388        for (ExecutionMode m : ExecutionMode.values())
2389        for (Integer v1 : new Integer[] { 1, null })
2390    {
2391        final CompletableFuture<Integer> f = new CompletableFuture<>();
2392        final CompletableFuture<Integer> g = new CompletableFuture<>();
2393        final IncAction r = new IncAction();
2394        final CFException ex = new CFException();
2395
2396        f.completeExceptionally(ex);
2397        g.complete(v1);
2398        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2399
2400        // unspecified behavior
2401        Integer v;
2583          try {
2584 <            assertNull(h.join());
2585 <            assertEquals(1, r.invocationCount);
2405 <            assertEquals(inc(v1), r.value);
2584 >            assertEquals(null, h1.join());
2585 >            rs[1].assertValue(v1);
2586          } catch (CompletionException ok) {
2587 <            checkCompletedWithWrappedCFException(h, ex);
2588 <            assertEquals(0, r.invocationCount);
2587 >            checkCompletedWithWrappedException(h1, ex);
2588 >            rs[1].assertNotInvoked();
2589 >        }
2590 >        try {
2591 >            assertEquals(null, h2.join());
2592 >            rs[2].assertValue(v1);
2593 >        } catch (CompletionException ok) {
2594 >            checkCompletedWithWrappedException(h2, ex);
2595 >            rs[2].assertNotInvoked();
2596 >        }
2597 >        try {
2598 >            assertEquals(null, h3.join());
2599 >            rs[3].assertValue(v1);
2600 >        } catch (CompletionException ok) {
2601 >            checkCompletedWithWrappedException(h3, ex);
2602 >            rs[3].assertNotInvoked();
2603          }
2604  
2411        checkCompletedWithWrappedCFException(f, ex);
2412        checkCompletedNormally(g, v1);
2413    }}
2414
2415    /**
2416     * acceptEither result completes exceptionally if action does
2417     */
2418    public void testAcceptEither_actionFailed1() {
2419        for (ExecutionMode m : ExecutionMode.values())
2420        for (Integer v1 : new Integer[] { 1, null })
2421        for (Integer v2 : new Integer[] { 2, null })
2422    {
2423        final CompletableFuture<Integer> f = new CompletableFuture<>();
2424        final CompletableFuture<Integer> g = new CompletableFuture<>();
2425        final FailingConsumer r = new FailingConsumer();
2426        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2427
2428        f.complete(v1);
2429        checkCompletedWithWrappedCFException(h);
2430        g.complete(v2);
2431        checkCompletedNormally(f, v1);
2432        checkCompletedNormally(g, v2);
2433    }}
2434
2435    public void testAcceptEither_actionFailed2() {
2436        for (ExecutionMode m : ExecutionMode.values())
2437        for (Integer v1 : new Integer[] { 1, null })
2438        for (Integer v2 : new Integer[] { 2, null })
2439    {
2440        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442        final FailingConsumer r = new FailingConsumer();
2443        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444
2445        g.complete(v2);
2446        checkCompletedWithWrappedCFException(h);
2447        f.complete(v1);
2605          checkCompletedNormally(f, v1);
2606 <        checkCompletedNormally(g, v2);
2606 >        checkCompletedExceptionally(g, ex);
2607      }}
2608  
2609      /**
2610       * acceptEither result completes exceptionally if either source cancelled
2611       */
2612 <    public void testAcceptEither_sourceCancelled1() {
2456 <        for (ExecutionMode m : ExecutionMode.values())
2457 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2458 <        for (Integer v1 : new Integer[] { 1, null })
2459 <    {
2460 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2461 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2462 <        final IncAction r = new IncAction();
2463 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2464 <
2465 <        assertTrue(f.cancel(mayInterruptIfRunning));
2466 <        checkCompletedWithWrappedCancellationException(h);
2467 <        g.complete(v1);
2468 <
2469 <        checkCancelled(f);
2470 <        assertEquals(0, r.invocationCount);
2471 <        checkCompletedNormally(g, v1);
2472 <        checkCompletedWithWrappedCancellationException(h);
2473 <    }}
2474 <
2475 <    public void testAcceptEither_sourceCancelled2() {
2612 >    public void testAcceptEither_sourceCancelled() {
2613          for (ExecutionMode m : ExecutionMode.values())
2614          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2615          for (Integer v1 : new Integer[] { 1, null })
2616      {
2617          final CompletableFuture<Integer> f = new CompletableFuture<>();
2618          final CompletableFuture<Integer> g = new CompletableFuture<>();
2619 <        final IncAction r = new IncAction();
2620 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2619 >        final NoopConsumer[] rs = new NoopConsumer[6];
2620 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2621  
2622 <        assertTrue(g.cancel(mayInterruptIfRunning));
2623 <        checkCompletedWithWrappedCancellationException(h);
2624 <        f.complete(v1);
2622 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2623 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2624 >        checkIncomplete(h0);
2625 >        checkIncomplete(h1);
2626 >        rs[0].assertNotInvoked();
2627 >        rs[1].assertNotInvoked();
2628 >        f.cancel(mayInterruptIfRunning);
2629 >        checkCompletedWithWrappedCancellationException(h0);
2630 >        checkCompletedWithWrappedCancellationException(h1);
2631 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2632 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2633 >        checkCompletedWithWrappedCancellationException(h2);
2634 >        checkCompletedWithWrappedCancellationException(h3);
2635  
2636 <        checkCancelled(g);
2490 <        assertEquals(0, r.invocationCount);
2491 <        checkCompletedNormally(f, v1);
2492 <        checkCompletedWithWrappedCancellationException(h);
2493 <    }}
2494 <
2495 <    public void testAcceptEither_sourceCancelled3() {
2496 <        for (ExecutionMode m : ExecutionMode.values())
2497 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2498 <        for (Integer v1 : new Integer[] { 1, null })
2499 <    {
2500 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2501 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2502 <        final IncAction r = new IncAction();
2503 <
2504 <        assertTrue(g.cancel(mayInterruptIfRunning));
2505 <        f.complete(v1);
2506 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2636 >        g.complete(v1);
2637  
2638 <        // unspecified behavior
2639 <        Integer v;
2638 >        // unspecified behavior - both source completions available
2639 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2640 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2641          try {
2642 <            assertNull(h.join());
2643 <            assertEquals(1, r.invocationCount);
2513 <            assertEquals(inc(v1), r.value);
2642 >            assertNull(h4.join());
2643 >            rs[4].assertValue(v1);
2644          } catch (CompletionException ok) {
2645 <            checkCompletedWithWrappedCancellationException(h);
2646 <            assertEquals(0, r.invocationCount);
2645 >            checkCompletedWithWrappedCancellationException(h4);
2646 >            rs[4].assertNotInvoked();
2647          }
2518
2519        checkCancelled(g);
2520        checkCompletedNormally(f, v1);
2521    }}
2522
2523    public void testAcceptEither_sourceCancelled4() {
2524        for (ExecutionMode m : ExecutionMode.values())
2525        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2526        for (Integer v1 : new Integer[] { 1, null })
2527    {
2528        final CompletableFuture<Integer> f = new CompletableFuture<>();
2529        final CompletableFuture<Integer> g = new CompletableFuture<>();
2530        final IncAction r = new IncAction();
2531
2532        assertTrue(f.cancel(mayInterruptIfRunning));
2533        g.complete(v1);
2534        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2535
2536        // unspecified behavior
2537        Integer v;
2648          try {
2649 <            assertNull(h.join());
2650 <            assertEquals(1, r.invocationCount);
2541 <            assertEquals(inc(v1), r.value);
2649 >            assertNull(h5.join());
2650 >            rs[5].assertValue(v1);
2651          } catch (CompletionException ok) {
2652 <            checkCompletedWithWrappedCancellationException(h);
2653 <            assertEquals(0, r.invocationCount);
2652 >            checkCompletedWithWrappedCancellationException(h5);
2653 >            rs[5].assertNotInvoked();
2654          }
2655  
2656          checkCancelled(f);
2657          checkCompletedNormally(g, v1);
2658 +        checkCompletedWithWrappedCancellationException(h0);
2659 +        checkCompletedWithWrappedCancellationException(h1);
2660 +        checkCompletedWithWrappedCancellationException(h2);
2661 +        checkCompletedWithWrappedCancellationException(h3);
2662 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2663      }}
2664  
2665      /**
2666 <     * runAfterEither result completes normally after normal completion
2553 <     * of either source
2666 >     * acceptEither result completes exceptionally if action does
2667       */
2668 <    public void testRunAfterEither_normalCompletion1() {
2668 >    public void testAcceptEither_actionFailed() {
2669          for (ExecutionMode m : ExecutionMode.values())
2670          for (Integer v1 : new Integer[] { 1, null })
2671          for (Integer v2 : new Integer[] { 2, null })
2672      {
2673          final CompletableFuture<Integer> f = new CompletableFuture<>();
2674          final CompletableFuture<Integer> g = new CompletableFuture<>();
2675 <        final Noop r = new Noop();
2676 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2675 >        final FailingConsumer[] rs = new FailingConsumer[6];
2676 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2677  
2678 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2679 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2680          f.complete(v1);
2681 <        checkCompletedNormally(h, null);
2682 <        assertEquals(1, r.invocationCount);
2683 <        g.complete(v2);
2681 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2682 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2683 >        checkCompletedWithWrappedCFException(h0);
2684 >        checkCompletedWithWrappedCFException(h1);
2685 >        checkCompletedWithWrappedCFException(h2);
2686 >        checkCompletedWithWrappedCFException(h3);
2687 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2688  
2689 <        checkCompletedNormally(f, v1);
2571 <        checkCompletedNormally(g, v2);
2572 <        checkCompletedNormally(h, null);
2573 <        assertEquals(1, r.invocationCount);
2574 <    }}
2689 >        g.complete(v2);
2690  
2691 <    public void testRunAfterEither_normalCompletion2() {
2692 <        for (ExecutionMode m : ExecutionMode.values())
2693 <        for (Integer v1 : new Integer[] { 1, null })
2579 <        for (Integer v2 : new Integer[] { 2, null })
2580 <    {
2581 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2582 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2583 <        final Noop r = new Noop();
2584 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2691 >        // unspecified behavior - both source completions available
2692 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2693 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2694  
2695 <        g.complete(v2);
2696 <        checkCompletedNormally(h, null);
2697 <        assertEquals(1, r.invocationCount);
2698 <        f.complete(v1);
2695 >        checkCompletedWithWrappedCFException(h4);
2696 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2697 >                   Objects.equals(v2, rs[4].value));
2698 >        checkCompletedWithWrappedCFException(h5);
2699 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2700 >                   Objects.equals(v2, rs[5].value));
2701  
2702          checkCompletedNormally(f, v1);
2703          checkCompletedNormally(g, v2);
2704 <        checkCompletedNormally(h, null);
2594 <        assertEquals(1, r.invocationCount);
2595 <        }}
2704 >    }}
2705  
2706 <    public void testRunAfterEither_normalCompletion3() {
2706 >    /**
2707 >     * runAfterEither result completes normally after normal completion
2708 >     * of either source
2709 >     */
2710 >    public void testRunAfterEither_normalCompletion() {
2711          for (ExecutionMode m : ExecutionMode.values())
2712          for (Integer v1 : new Integer[] { 1, null })
2713          for (Integer v2 : new Integer[] { 2, null })
2714      {
2715          final CompletableFuture<Integer> f = new CompletableFuture<>();
2716          final CompletableFuture<Integer> g = new CompletableFuture<>();
2717 <        final Noop r = new Noop();
2717 >        final Noop[] rs = new Noop[6];
2718 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2719  
2720 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2721 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2722 +        checkIncomplete(h0);
2723 +        checkIncomplete(h1);
2724 +        rs[0].assertNotInvoked();
2725 +        rs[1].assertNotInvoked();
2726          f.complete(v1);
2727 +        checkCompletedNormally(h0, null);
2728 +        checkCompletedNormally(h1, null);
2729 +        rs[0].assertInvoked();
2730 +        rs[1].assertInvoked();
2731 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2732 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2733 +        checkCompletedNormally(h2, null);
2734 +        checkCompletedNormally(h3, null);
2735 +        rs[2].assertInvoked();
2736 +        rs[3].assertInvoked();
2737 +
2738          g.complete(v2);
2608        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2739  
2740 <        checkCompletedNormally(h, null);
2740 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2741 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2742 >
2743          checkCompletedNormally(f, v1);
2744          checkCompletedNormally(g, v2);
2745 <        assertEquals(1, r.invocationCount);
2745 >        checkCompletedNormally(h0, null);
2746 >        checkCompletedNormally(h1, null);
2747 >        checkCompletedNormally(h2, null);
2748 >        checkCompletedNormally(h3, null);
2749 >        checkCompletedNormally(h4, null);
2750 >        checkCompletedNormally(h5, null);
2751 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2752      }}
2753  
2754      /**
2755       * runAfterEither result completes exceptionally after exceptional
2756       * completion of either source
2757       */
2758 <    public void testRunAfterEither_exceptionalCompletion1() {
2621 <        for (ExecutionMode m : ExecutionMode.values())
2622 <        for (Integer v1 : new Integer[] { 1, null })
2623 <    {
2624 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2625 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2626 <        final Noop r = new Noop();
2627 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2628 <        final CFException ex = new CFException();
2629 <
2630 <        f.completeExceptionally(ex);
2631 <        checkCompletedWithWrappedCFException(h, ex);
2632 <        g.complete(v1);
2633 <
2634 <        assertEquals(0, r.invocationCount);
2635 <        checkCompletedNormally(g, v1);
2636 <        checkCompletedWithWrappedCFException(f, ex);
2637 <        checkCompletedWithWrappedCFException(h, ex);
2638 <    }}
2639 <
2640 <    public void testRunAfterEither_exceptionalCompletion2() {
2758 >    public void testRunAfterEither_exceptionalCompletion() {
2759          for (ExecutionMode m : ExecutionMode.values())
2760          for (Integer v1 : new Integer[] { 1, null })
2761      {
2762          final CompletableFuture<Integer> f = new CompletableFuture<>();
2763          final CompletableFuture<Integer> g = new CompletableFuture<>();
2646        final Noop r = new Noop();
2647        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2764          final CFException ex = new CFException();
2765 +        final Noop[] rs = new Noop[6];
2766 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2767  
2768 <        g.completeExceptionally(ex);
2769 <        checkCompletedWithWrappedCFException(h, ex);
2770 <        f.complete(v1);
2771 <
2772 <        assertEquals(0, r.invocationCount);
2773 <        checkCompletedNormally(f, v1);
2774 <        checkCompletedWithWrappedCFException(g, ex);
2775 <        checkCompletedWithWrappedCFException(h, ex);
2776 <    }}
2777 <
2778 <    public void testRunAfterEither_exceptionalCompletion3() {
2779 <        for (ExecutionMode m : ExecutionMode.values())
2780 <        for (Integer v1 : new Integer[] { 1, null })
2663 <    {
2664 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2666 <        final Noop r = new Noop();
2667 <        final CFException ex = new CFException();
2768 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2769 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2770 >        checkIncomplete(h0);
2771 >        checkIncomplete(h1);
2772 >        rs[0].assertNotInvoked();
2773 >        rs[1].assertNotInvoked();
2774 >        assertTrue(f.completeExceptionally(ex));
2775 >        checkCompletedWithWrappedException(h0, ex);
2776 >        checkCompletedWithWrappedException(h1, ex);
2777 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2778 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2779 >        checkCompletedWithWrappedException(h2, ex);
2780 >        checkCompletedWithWrappedException(h3, ex);
2781  
2782 <        g.completeExceptionally(ex);
2670 <        f.complete(v1);
2671 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2782 >        assertTrue(g.complete(v1));
2783  
2784 <        // unspecified behavior
2785 <        Integer v;
2784 >        // unspecified behavior - both source completions available
2785 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2786 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2787          try {
2788 <            assertNull(h.join());
2789 <            assertEquals(1, r.invocationCount);
2788 >            assertNull(h4.join());
2789 >            rs[4].assertInvoked();
2790          } catch (CompletionException ok) {
2791 <            checkCompletedWithWrappedCFException(h, ex);
2792 <            assertEquals(0, r.invocationCount);
2791 >            checkCompletedWithWrappedException(h4, ex);
2792 >            rs[4].assertNotInvoked();
2793          }
2682
2683        checkCompletedWithWrappedCFException(g, ex);
2684        checkCompletedNormally(f, v1);
2685    }}
2686
2687    public void testRunAfterEither_exceptionalCompletion4() {
2688        for (ExecutionMode m : ExecutionMode.values())
2689        for (Integer v1 : new Integer[] { 1, null })
2690    {
2691        final CompletableFuture<Integer> f = new CompletableFuture<>();
2692        final CompletableFuture<Integer> g = new CompletableFuture<>();
2693        final Noop r = new Noop();
2694        final CFException ex = new CFException();
2695
2696        f.completeExceptionally(ex);
2697        g.complete(v1);
2698        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2699
2700        // unspecified behavior
2701        Integer v;
2794          try {
2795 <            assertNull(h.join());
2796 <            assertEquals(1, r.invocationCount);
2795 >            assertNull(h5.join());
2796 >            rs[5].assertInvoked();
2797          } catch (CompletionException ok) {
2798 <            checkCompletedWithWrappedCFException(h, ex);
2799 <            assertEquals(0, r.invocationCount);
2798 >            checkCompletedWithWrappedException(h5, ex);
2799 >            rs[5].assertNotInvoked();
2800          }
2801  
2802 <        checkCompletedWithWrappedCFException(f, ex);
2802 >        checkCompletedExceptionally(f, ex);
2803          checkCompletedNormally(g, v1);
2804 +        checkCompletedWithWrappedException(h0, ex);
2805 +        checkCompletedWithWrappedException(h1, ex);
2806 +        checkCompletedWithWrappedException(h2, ex);
2807 +        checkCompletedWithWrappedException(h3, ex);
2808 +        checkCompletedWithWrappedException(h4, ex);
2809 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2810      }}
2811  
2812 <    /**
2715 <     * runAfterEither result completes exceptionally if action does
2716 <     */
2717 <    public void testRunAfterEither_actionFailed1() {
2812 >    public void testRunAfterEither_exceptionalCompletion2() {
2813          for (ExecutionMode m : ExecutionMode.values())
2814 +        for (boolean fFirst : new boolean[] { true, false })
2815          for (Integer v1 : new Integer[] { 1, null })
2720        for (Integer v2 : new Integer[] { 2, null })
2816      {
2817          final CompletableFuture<Integer> f = new CompletableFuture<>();
2818          final CompletableFuture<Integer> g = new CompletableFuture<>();
2819 <        final FailingNoop r = new FailingNoop();
2820 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2819 >        final CFException ex = new CFException();
2820 >        final Noop[] rs = new Noop[6];
2821 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2822  
2823 <        f.complete(v1);
2824 <        checkCompletedWithWrappedCFException(h);
2825 <        g.complete(v2);
2826 <        checkCompletedNormally(f, v1);
2827 <        checkCompletedNormally(g, v2);
2828 <    }}
2823 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2824 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2825 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2826 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2827 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2828 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2829  
2830 <    public void testRunAfterEither_actionFailed2() {
2831 <        for (ExecutionMode m : ExecutionMode.values())
2832 <        for (Integer v1 : new Integer[] { 1, null })
2833 <        for (Integer v2 : new Integer[] { 2, null })
2834 <    {
2835 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2836 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2837 <        final FailingNoop r = new FailingNoop();
2838 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2830 >        // unspecified behavior - both source completions available
2831 >        try {
2832 >            assertEquals(null, h0.join());
2833 >            rs[0].assertInvoked();
2834 >        } catch (CompletionException ok) {
2835 >            checkCompletedWithWrappedException(h0, ex);
2836 >            rs[0].assertNotInvoked();
2837 >        }
2838 >        try {
2839 >            assertEquals(null, h1.join());
2840 >            rs[1].assertInvoked();
2841 >        } catch (CompletionException ok) {
2842 >            checkCompletedWithWrappedException(h1, ex);
2843 >            rs[1].assertNotInvoked();
2844 >        }
2845 >        try {
2846 >            assertEquals(null, h2.join());
2847 >            rs[2].assertInvoked();
2848 >        } catch (CompletionException ok) {
2849 >            checkCompletedWithWrappedException(h2, ex);
2850 >            rs[2].assertNotInvoked();
2851 >        }
2852 >        try {
2853 >            assertEquals(null, h3.join());
2854 >            rs[3].assertInvoked();
2855 >        } catch (CompletionException ok) {
2856 >            checkCompletedWithWrappedException(h3, ex);
2857 >            rs[3].assertNotInvoked();
2858 >        }
2859  
2744        g.complete(v2);
2745        checkCompletedWithWrappedCFException(h);
2746        f.complete(v1);
2860          checkCompletedNormally(f, v1);
2861 <        checkCompletedNormally(g, v2);
2861 >        checkCompletedExceptionally(g, ex);
2862      }}
2863  
2864      /**
2865       * runAfterEither result completes exceptionally if either source cancelled
2866       */
2867 <    public void testRunAfterEither_sourceCancelled1() {
2755 <        for (ExecutionMode m : ExecutionMode.values())
2756 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2757 <        for (Integer v1 : new Integer[] { 1, null })
2758 <    {
2759 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2760 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2761 <        final Noop r = new Noop();
2762 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2763 <
2764 <        assertTrue(f.cancel(mayInterruptIfRunning));
2765 <        checkCompletedWithWrappedCancellationException(h);
2766 <        g.complete(v1);
2767 <
2768 <        checkCancelled(f);
2769 <        assertEquals(0, r.invocationCount);
2770 <        checkCompletedNormally(g, v1);
2771 <        checkCompletedWithWrappedCancellationException(h);
2772 <    }}
2773 <
2774 <    public void testRunAfterEither_sourceCancelled2() {
2867 >    public void testRunAfterEither_sourceCancelled() {
2868          for (ExecutionMode m : ExecutionMode.values())
2869          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2870          for (Integer v1 : new Integer[] { 1, null })
2871      {
2872          final CompletableFuture<Integer> f = new CompletableFuture<>();
2873          final CompletableFuture<Integer> g = new CompletableFuture<>();
2874 <        final Noop r = new Noop();
2875 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2874 >        final Noop[] rs = new Noop[6];
2875 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2876  
2877 <        assertTrue(g.cancel(mayInterruptIfRunning));
2878 <        checkCompletedWithWrappedCancellationException(h);
2879 <        f.complete(v1);
2877 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2878 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2879 >        checkIncomplete(h0);
2880 >        checkIncomplete(h1);
2881 >        rs[0].assertNotInvoked();
2882 >        rs[1].assertNotInvoked();
2883 >        f.cancel(mayInterruptIfRunning);
2884 >        checkCompletedWithWrappedCancellationException(h0);
2885 >        checkCompletedWithWrappedCancellationException(h1);
2886 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2887 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2888 >        checkCompletedWithWrappedCancellationException(h2);
2889 >        checkCompletedWithWrappedCancellationException(h3);
2890  
2891 <        checkCancelled(g);
2789 <        assertEquals(0, r.invocationCount);
2790 <        checkCompletedNormally(f, v1);
2791 <        checkCompletedWithWrappedCancellationException(h);
2792 <    }}
2793 <
2794 <    public void testRunAfterEither_sourceCancelled3() {
2795 <        for (ExecutionMode m : ExecutionMode.values())
2796 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2797 <        for (Integer v1 : new Integer[] { 1, null })
2798 <    {
2799 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2801 <        final Noop r = new Noop();
2802 <
2803 <        assertTrue(g.cancel(mayInterruptIfRunning));
2804 <        f.complete(v1);
2805 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2891 >        assertTrue(g.complete(v1));
2892  
2893 <        // unspecified behavior
2894 <        Integer v;
2893 >        // unspecified behavior - both source completions available
2894 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2895 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2896          try {
2897 <            assertNull(h.join());
2898 <            assertEquals(1, r.invocationCount);
2897 >            assertNull(h4.join());
2898 >            rs[4].assertInvoked();
2899          } catch (CompletionException ok) {
2900 <            checkCompletedWithWrappedCancellationException(h);
2901 <            assertEquals(0, r.invocationCount);
2900 >            checkCompletedWithWrappedCancellationException(h4);
2901 >            rs[4].assertNotInvoked();
2902 >        }
2903 >        try {
2904 >            assertNull(h5.join());
2905 >            rs[5].assertInvoked();
2906 >        } catch (CompletionException ok) {
2907 >            checkCompletedWithWrappedCancellationException(h5);
2908 >            rs[5].assertNotInvoked();
2909          }
2910  
2911 <        checkCancelled(g);
2912 <        checkCompletedNormally(f, v1);
2911 >        checkCancelled(f);
2912 >        checkCompletedNormally(g, v1);
2913 >        checkCompletedWithWrappedCancellationException(h0);
2914 >        checkCompletedWithWrappedCancellationException(h1);
2915 >        checkCompletedWithWrappedCancellationException(h2);
2916 >        checkCompletedWithWrappedCancellationException(h3);
2917 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2918      }}
2919  
2920 <    public void testRunAfterEither_sourceCancelled4() {
2920 >    /**
2921 >     * runAfterEither result completes exceptionally if action does
2922 >     */
2923 >    public void testRunAfterEither_actionFailed() {
2924          for (ExecutionMode m : ExecutionMode.values())
2823        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2925          for (Integer v1 : new Integer[] { 1, null })
2926 +        for (Integer v2 : new Integer[] { 2, null })
2927      {
2928          final CompletableFuture<Integer> f = new CompletableFuture<>();
2929          final CompletableFuture<Integer> g = new CompletableFuture<>();
2930 <        final Noop r = new Noop();
2930 >        final FailingRunnable[] rs = new FailingRunnable[6];
2931 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2932  
2933 <        assertTrue(f.cancel(mayInterruptIfRunning));
2934 <        g.complete(v1);
2935 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2933 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2934 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2935 >        assertTrue(f.complete(v1));
2936 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2937 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2938 >        checkCompletedWithWrappedCFException(h0);
2939 >        checkCompletedWithWrappedCFException(h1);
2940 >        checkCompletedWithWrappedCFException(h2);
2941 >        checkCompletedWithWrappedCFException(h3);
2942 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2943 >        assertTrue(g.complete(v2));
2944 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2945 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2946 >        checkCompletedWithWrappedCFException(h4);
2947 >        checkCompletedWithWrappedCFException(h5);
2948  
2949 <        // unspecified behavior
2950 <        Integer v;
2951 <        try {
2837 <            assertNull(h.join());
2838 <            assertEquals(1, r.invocationCount);
2839 <        } catch (CompletionException ok) {
2840 <            checkCompletedWithWrappedCancellationException(h);
2841 <            assertEquals(0, r.invocationCount);
2842 <        }
2843 <
2844 <        checkCancelled(f);
2845 <        checkCompletedNormally(g, v1);
2949 >        checkCompletedNormally(f, v1);
2950 >        checkCompletedNormally(g, v2);
2951 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2952      }}
2953  
2954      /**
# Line 2854 | Line 2960 | public class CompletableFutureTest exten
2960          for (Integer v1 : new Integer[] { 1, null })
2961      {
2962          final CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        final CompletableFutureInc r = new CompletableFutureInc();
2964 <        if (!createIncomplete) f.complete(v1);
2965 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2966 <        if (createIncomplete) f.complete(v1);
2963 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2964 >        if (!createIncomplete) assertTrue(f.complete(v1));
2965 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2966 >        if (createIncomplete) assertTrue(f.complete(v1));
2967  
2968          checkCompletedNormally(g, inc(v1));
2969          checkCompletedNormally(f, v1);
2970 <        assertEquals(1, r.invocationCount);
2970 >        r.assertValue(v1);
2971      }}
2972  
2973      /**
# Line 2873 | Line 2979 | public class CompletableFutureTest exten
2979          for (boolean createIncomplete : new boolean[] { true, false })
2980      {
2981          final CFException ex = new CFException();
2982 <        final CompletableFutureInc r = new CompletableFutureInc();
2982 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2983          final CompletableFuture<Integer> f = new CompletableFuture<>();
2984          if (!createIncomplete) f.completeExceptionally(ex);
2985 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2985 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2986          if (createIncomplete) f.completeExceptionally(ex);
2987  
2988 <        checkCompletedWithWrappedCFException(g, ex);
2989 <        checkCompletedWithWrappedCFException(f, ex);
2990 <        assertEquals(0, r.invocationCount);
2988 >        checkCompletedWithWrappedException(g, ex);
2989 >        checkCompletedExceptionally(f, ex);
2990 >        r.assertNotInvoked();
2991      }}
2992  
2993      /**
# Line 2894 | Line 3000 | public class CompletableFutureTest exten
3000      {
3001          final CompletableFuture<Integer> f = new CompletableFuture<>();
3002          final FailingCompletableFutureFunction r
3003 <            = new FailingCompletableFutureFunction();
3004 <        if (!createIncomplete) f.complete(v1);
3005 <        final CompletableFuture<Integer> g = f.thenCompose(r);
3006 <        if (createIncomplete) f.complete(v1);
3003 >            = new FailingCompletableFutureFunction(m);
3004 >        if (!createIncomplete) assertTrue(f.complete(v1));
3005 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3006 >        if (createIncomplete) assertTrue(f.complete(v1));
3007  
3008          checkCompletedWithWrappedCFException(g);
3009          checkCompletedNormally(f, v1);
# Line 2912 | Line 3018 | public class CompletableFutureTest exten
3018          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3019      {
3020          final CompletableFuture<Integer> f = new CompletableFuture<>();
3021 <        final CompletableFutureInc r = new CompletableFutureInc();
3021 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3022          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3023 <        final CompletableFuture<Integer> g = f.thenCompose(r);
3024 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3023 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3024 >        if (createIncomplete) {
3025 >            checkIncomplete(g);
3026 >            assertTrue(f.cancel(mayInterruptIfRunning));
3027 >        }
3028  
3029          checkCompletedWithWrappedCancellationException(g);
3030          checkCancelled(f);
3031      }}
3032  
2924    // asyncs
2925
3033      /**
3034 <     * thenApplyAsync result completes normally after normal completion of source
3034 >     * thenCompose result completes exceptionally if the result of the action does
3035       */
3036 <    public void testThenApplyAsync() {
3037 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3038 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3039 <        f.complete(one);
3040 <        checkCompletedNormally(g, two);
3041 <    }
3042 <
3043 <    /**
3044 <     * thenApplyAsync result completes exceptionally after exceptional
3045 <     * completion of source
3046 <     */
3047 <    public void testThenApplyAsync2() {
3048 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3049 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3050 <        f.completeExceptionally(new CFException());
3051 <        checkCompletedWithWrappedCFException(g);
3052 <    }
3053 <
3054 <    /**
3055 <     * thenApplyAsync result completes exceptionally if action does
3056 <     */
3057 <    public void testThenApplyAsync3() {
3058 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3059 <        FailingFunction r = new FailingFunction();
3060 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3061 <        f.complete(null);
3062 <        checkCompletedWithWrappedCFException(g);
3063 <    }
3064 <
3065 <    /**
3066 <     * thenApplyAsync result completes exceptionally if source cancelled
3067 <     */
3068 <    public void testThenApplyAsync4() {
3069 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3070 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3071 <        assertTrue(f.cancel(true));
3072 <        checkCompletedWithWrappedCancellationException(g);
3073 <    }
3074 <
3075 <    /**
3076 <     * thenAcceptAsync result completes normally after normal
3077 <     * completion of source
3078 <     */
2972 <    public void testThenAcceptAsync() {
2973 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2974 <        IncAction r = new IncAction();
2975 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2976 <        f.complete(one);
2977 <        checkCompletedNormally(g, null);
2978 <        assertEquals(r.value, (Integer) 2);
2979 <    }
2980 <
2981 <    /**
2982 <     * thenAcceptAsync result completes exceptionally after exceptional
2983 <     * completion of source
2984 <     */
2985 <    public void testThenAcceptAsync2() {
2986 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2987 <        IncAction r = new IncAction();
2988 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989 <        f.completeExceptionally(new CFException());
2990 <        checkCompletedWithWrappedCFException(g);
2991 <    }
2992 <
2993 <    /**
2994 <     * thenAcceptAsync result completes exceptionally if action does
2995 <     */
2996 <    public void testThenAcceptAsync3() {
2997 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2998 <        FailingConsumer r = new FailingConsumer();
2999 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000 <        f.complete(null);
3001 <        checkCompletedWithWrappedCFException(g);
3002 <    }
3003 <
3004 <    /**
3005 <     * thenAcceptAsync result completes exceptionally if source cancelled
3006 <     */
3007 <    public void testThenAcceptAsync4() {
3008 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3009 <        IncAction r = new IncAction();
3010 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3011 <        assertTrue(f.cancel(true));
3012 <        checkCompletedWithWrappedCancellationException(g);
3013 <    }
3014 <
3015 <    // async with explicit executors
3016 <
3017 <    /**
3018 <     * thenApplyAsync result completes normally after normal completion of source
3019 <     */
3020 <    public void testThenApplyAsyncE() {
3021 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3022 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3023 <        f.complete(one);
3024 <        checkCompletedNormally(g, two);
3025 <    }
3026 <
3027 <    /**
3028 <     * thenApplyAsync result completes exceptionally after exceptional
3029 <     * completion of source
3030 <     */
3031 <    public void testThenApplyAsync2E() {
3032 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3033 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3034 <        f.completeExceptionally(new CFException());
3035 <        checkCompletedWithWrappedCFException(g);
3036 <    }
3037 <
3038 <    /**
3039 <     * thenApplyAsync result completes exceptionally if action does
3040 <     */
3041 <    public void testThenApplyAsync3E() {
3042 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3043 <        FailingFunction r = new FailingFunction();
3044 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3045 <        f.complete(null);
3046 <        checkCompletedWithWrappedCFException(g);
3047 <    }
3048 <
3049 <    /**
3050 <     * thenApplyAsync result completes exceptionally if source cancelled
3051 <     */
3052 <    public void testThenApplyAsync4E() {
3053 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3054 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3055 <        assertTrue(f.cancel(true));
3056 <        checkCompletedWithWrappedCancellationException(g);
3057 <    }
3058 <
3059 <    /**
3060 <     * thenAcceptAsync result completes normally after normal
3061 <     * completion of source
3062 <     */
3063 <    public void testThenAcceptAsyncE() {
3064 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3065 <        IncAction r = new IncAction();
3066 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3067 <        f.complete(one);
3068 <        checkCompletedNormally(g, null);
3069 <        assertEquals(r.value, (Integer) 2);
3070 <    }
3071 <
3072 <    /**
3073 <     * thenAcceptAsync result completes exceptionally after exceptional
3074 <     * completion of source
3075 <     */
3076 <    public void testThenAcceptAsync2E() {
3077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3078 <        IncAction r = new IncAction();
3079 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3080 <        f.completeExceptionally(new CFException());
3081 <        checkCompletedWithWrappedCFException(g);
3082 <    }
3083 <
3084 <    /**
3085 <     * thenAcceptAsync result completes exceptionally if action does
3086 <     */
3087 <    public void testThenAcceptAsync3E() {
3088 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3089 <        FailingConsumer r = new FailingConsumer();
3090 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3091 <        f.complete(null);
3092 <        checkCompletedWithWrappedCFException(g);
3093 <    }
3036 >    public void testThenCompose_actionReturnsFailingFuture() {
3037 >        for (ExecutionMode m : ExecutionMode.values())
3038 >        for (int order = 0; order < 6; order++)
3039 >        for (Integer v1 : new Integer[] { 1, null })
3040 >    {
3041 >        final CFException ex = new CFException();
3042 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3043 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3044 >        final CompletableFuture<Integer> h;
3045 >        // Test all permutations of orders
3046 >        switch (order) {
3047 >        case 0:
3048 >            assertTrue(f.complete(v1));
3049 >            assertTrue(g.completeExceptionally(ex));
3050 >            h = m.thenCompose(f, (x -> g));
3051 >            break;
3052 >        case 1:
3053 >            assertTrue(f.complete(v1));
3054 >            h = m.thenCompose(f, (x -> g));
3055 >            assertTrue(g.completeExceptionally(ex));
3056 >            break;
3057 >        case 2:
3058 >            assertTrue(g.completeExceptionally(ex));
3059 >            assertTrue(f.complete(v1));
3060 >            h = m.thenCompose(f, (x -> g));
3061 >            break;
3062 >        case 3:
3063 >            assertTrue(g.completeExceptionally(ex));
3064 >            h = m.thenCompose(f, (x -> g));
3065 >            assertTrue(f.complete(v1));
3066 >            break;
3067 >        case 4:
3068 >            h = m.thenCompose(f, (x -> g));
3069 >            assertTrue(f.complete(v1));
3070 >            assertTrue(g.completeExceptionally(ex));
3071 >            break;
3072 >        case 5:
3073 >            h = m.thenCompose(f, (x -> g));
3074 >            assertTrue(f.complete(v1));
3075 >            assertTrue(g.completeExceptionally(ex));
3076 >            break;
3077 >        default: throw new AssertionError();
3078 >        }
3079  
3080 <    /**
3081 <     * thenAcceptAsync result completes exceptionally if source cancelled
3082 <     */
3083 <    public void testThenAcceptAsync4E() {
3099 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3100 <        IncAction r = new IncAction();
3101 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3102 <        assertTrue(f.cancel(true));
3103 <        checkCompletedWithWrappedCancellationException(g);
3104 <    }
3080 >        checkCompletedExceptionally(g, ex);
3081 >        checkCompletedWithWrappedException(h, ex);
3082 >        checkCompletedNormally(f, v1);
3083 >    }}
3084  
3085      // other static methods
3086  
# Line 3119 | Line 3098 | public class CompletableFutureTest exten
3098       * when all components complete normally
3099       */
3100      public void testAllOf_normal() throws Exception {
3101 <        for (int k = 1; k < 20; ++k) {
3102 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3103 <            for (int i = 0; i < k; ++i)
3101 >        for (int k = 1; k < 10; k++) {
3102 >            CompletableFuture<Integer>[] fs
3103 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3104 >            for (int i = 0; i < k; i++)
3105 >                fs[i] = new CompletableFuture<>();
3106 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3107 >            for (int i = 0; i < k; i++) {
3108 >                checkIncomplete(f);
3109 >                checkIncomplete(CompletableFuture.allOf(fs));
3110 >                fs[i].complete(one);
3111 >            }
3112 >            checkCompletedNormally(f, null);
3113 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3114 >        }
3115 >    }
3116 >
3117 >    public void testAllOf_backwards() throws Exception {
3118 >        for (int k = 1; k < 10; k++) {
3119 >            CompletableFuture<Integer>[] fs
3120 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3121 >            for (int i = 0; i < k; i++)
3122                  fs[i] = new CompletableFuture<>();
3123              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3124 <            for (int i = 0; i < k; ++i) {
3124 >            for (int i = k - 1; i >= 0; i--) {
3125                  checkIncomplete(f);
3126                  checkIncomplete(CompletableFuture.allOf(fs));
3127                  fs[i].complete(one);
# Line 3134 | Line 3131 | public class CompletableFutureTest exten
3131          }
3132      }
3133  
3134 +    public void testAllOf_exceptional() throws Exception {
3135 +        for (int k = 1; k < 10; k++) {
3136 +            CompletableFuture<Integer>[] fs
3137 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3138 +            CFException ex = new CFException();
3139 +            for (int i = 0; i < k; i++)
3140 +                fs[i] = new CompletableFuture<>();
3141 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3142 +            for (int i = 0; i < k; i++) {
3143 +                checkIncomplete(f);
3144 +                checkIncomplete(CompletableFuture.allOf(fs));
3145 +                if (i != k/2) {
3146 +                    fs[i].complete(i);
3147 +                    checkCompletedNormally(fs[i], i);
3148 +                } else {
3149 +                    fs[i].completeExceptionally(ex);
3150 +                    checkCompletedExceptionally(fs[i], ex);
3151 +                }
3152 +            }
3153 +            checkCompletedWithWrappedException(f, ex);
3154 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3155 +        }
3156 +    }
3157 +
3158      /**
3159       * anyOf(no component futures) returns an incomplete future
3160       */
3161      public void testAnyOf_empty() throws Exception {
3162 +        for (Integer v1 : new Integer[] { 1, null })
3163 +    {
3164          CompletableFuture<Object> f = CompletableFuture.anyOf();
3165          checkIncomplete(f);
3166 <    }
3166 >
3167 >        f.complete(v1);
3168 >        checkCompletedNormally(f, v1);
3169 >    }}
3170  
3171      /**
3172       * anyOf returns a future completed normally with a value when
3173       * a component future does
3174       */
3175      public void testAnyOf_normal() throws Exception {
3176 <        for (int k = 0; k < 10; ++k) {
3176 >        for (int k = 0; k < 10; k++) {
3177              CompletableFuture[] fs = new CompletableFuture[k];
3178 <            for (int i = 0; i < k; ++i)
3178 >            for (int i = 0; i < k; i++)
3179                  fs[i] = new CompletableFuture<>();
3180              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3181              checkIncomplete(f);
3182 <            for (int i = 0; i < k; ++i) {
3183 <                fs[i].complete(one);
3184 <                checkCompletedNormally(f, one);
3185 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3182 >            for (int i = 0; i < k; i++) {
3183 >                fs[i].complete(i);
3184 >                checkCompletedNormally(f, 0);
3185 >                int x = (int) CompletableFuture.anyOf(fs).join();
3186 >                assertTrue(0 <= x && x <= i);
3187 >            }
3188 >        }
3189 >    }
3190 >    public void testAnyOf_normal_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++)
3194 >                fs[i] = new CompletableFuture<>();
3195 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3196 >            checkIncomplete(f);
3197 >            for (int i = k - 1; i >= 0; i--) {
3198 >                fs[i].complete(i);
3199 >                checkCompletedNormally(f, k - 1);
3200 >                int x = (int) CompletableFuture.anyOf(fs).join();
3201 >                assertTrue(i <= x && x <= k - 1);
3202              }
3203          }
3204      }
# Line 3165 | Line 3207 | public class CompletableFutureTest exten
3207       * anyOf result completes exceptionally when any component does.
3208       */
3209      public void testAnyOf_exceptional() throws Exception {
3210 <        for (int k = 0; k < 10; ++k) {
3210 >        for (int k = 0; k < 10; k++) {
3211 >            CompletableFuture[] fs = new CompletableFuture[k];
3212 >            CFException[] exs = new CFException[k];
3213 >            for (int i = 0; i < k; i++) {
3214 >                fs[i] = new CompletableFuture<>();
3215 >                exs[i] = new CFException();
3216 >            }
3217 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3218 >            checkIncomplete(f);
3219 >            for (int i = 0; i < k; i++) {
3220 >                fs[i].completeExceptionally(exs[i]);
3221 >                checkCompletedWithWrappedException(f, exs[0]);
3222 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3223 >            }
3224 >        }
3225 >    }
3226 >
3227 >    public void testAnyOf_exceptional_backwards() throws Exception {
3228 >        for (int k = 0; k < 10; k++) {
3229              CompletableFuture[] fs = new CompletableFuture[k];
3230 <            for (int i = 0; i < k; ++i)
3230 >            CFException[] exs = new CFException[k];
3231 >            for (int i = 0; i < k; i++) {
3232                  fs[i] = new CompletableFuture<>();
3233 +                exs[i] = new CFException();
3234 +            }
3235              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3236              checkIncomplete(f);
3237 <            for (int i = 0; i < k; ++i) {
3238 <                fs[i].completeExceptionally(new CFException());
3239 <                checkCompletedWithWrappedCFException(f);
3237 >            for (int i = k - 1; i >= 0; i--) {
3238 >                fs[i].completeExceptionally(exs[i]);
3239 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3240                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3241              }
3242          }
# Line 3186 | Line 3249 | public class CompletableFutureTest exten
3249          CompletableFuture<Integer> f = new CompletableFuture<>();
3250          CompletableFuture<Integer> g = new CompletableFuture<>();
3251          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3189        CompletableFuture<?> h;
3252          ThreadExecutor exec = new ThreadExecutor();
3253  
3254          Runnable[] throwingActions = {
3255              () -> CompletableFuture.supplyAsync(null),
3256              () -> CompletableFuture.supplyAsync(null, exec),
3257 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3257 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3258  
3259              () -> CompletableFuture.runAsync(null),
3260              () -> CompletableFuture.runAsync(null, exec),
# Line 3265 | Line 3327 | public class CompletableFutureTest exten
3327  
3328              () -> f.thenCompose(null),
3329              () -> f.thenComposeAsync(null),
3330 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3330 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3331              () -> f.thenComposeAsync(null, exec),
3332  
3333              () -> f.exceptionally(null),
3334  
3335              () -> f.handle(null),
3274
3336              () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3337              () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3338              () -> CompletableFuture.allOf(f, null),
# Line 3297 | Line 3358 | public class CompletableFutureTest exten
3358          assertSame(f, f.toCompletableFuture());
3359      }
3360  
3361 +    // jdk9
3362 +
3363      /**
3364 <     * whenComplete action executes on normal completion, propagating
3302 <     * source result.
3364 >     * newIncompleteFuture returns an incomplete CompletableFuture
3365       */
3366 <    public void testWhenComplete_normalCompletion1() {
3367 <        for (ExecutionMode m : ExecutionMode.values())
3368 <        for (boolean createIncomplete : new boolean[] { true, false })
3369 <        for (Integer v1 : new Integer[] { 1, null })
3370 <    {
3371 <        final AtomicInteger a = new AtomicInteger(0);
3310 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3311 <        if (!createIncomplete) f.complete(v1);
3312 <        final CompletableFuture<Integer> g = m.whenComplete
3313 <            (f,
3314 <             (Integer x, Throwable t) -> {
3315 <                threadAssertSame(x, v1);
3316 <                threadAssertNull(t);
3317 <                a.getAndIncrement();
3318 <            });
3319 <        if (createIncomplete) f.complete(v1);
3366 >    public void testNewIncompleteFuture() {
3367 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3368 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3369 >        checkIncomplete(f);
3370 >        checkIncomplete(g);
3371 >    }
3372  
3373 <        checkCompletedNormally(g, v1);
3374 <        checkCompletedNormally(f, v1);
3375 <        assertEquals(1, a.get());
3376 <    }}
3373 >    /**
3374 >     * completedStage returns a completed CompletionStage
3375 >     */
3376 >    public void testCompletedStage() {
3377 >        AtomicInteger x = new AtomicInteger();
3378 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3379 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3380 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3381 >        assertEquals(x.get(), 1);
3382 >        assertNull(r.get());
3383 >    }
3384  
3385      /**
3386 <     * whenComplete action executes on exceptional completion, propagating
3387 <     * source result.
3386 >     * defaultExecutor by default returns the commonPool if
3387 >     * it supports at least one thread.
3388       */
3389 <    public void testWhenComplete_exceptionalCompletion() {
3390 <        for (ExecutionMode m : ExecutionMode.values())
3391 <        for (boolean createIncomplete : new boolean[] { true, false })
3392 <        for (Integer v1 : new Integer[] { 1, null })
3393 <    {
3394 <        final AtomicInteger a = new AtomicInteger(0);
3395 <        final CFException ex = new CFException();
3337 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3338 <        if (!createIncomplete) f.completeExceptionally(ex);
3339 <        final CompletableFuture<Integer> g = m.whenComplete
3340 <            (f,
3341 <             (Integer x, Throwable t) -> {
3342 <                threadAssertNull(x);
3343 <                threadAssertSame(t, ex);
3344 <                a.getAndIncrement();
3345 <            });
3346 <        if (createIncomplete) f.completeExceptionally(ex);
3347 <        checkCompletedWithWrappedCFException(f, ex);
3348 <        checkCompletedWithWrappedCFException(g, ex);
3349 <        assertEquals(1, a.get());
3350 <    }}
3389 >    public void testDefaultExecutor() {
3390 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3391 >        Executor e = f.defaultExecutor();
3392 >        Executor c =  ForkJoinPool.commonPool();
3393 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3394 >            assertSame(e, c);
3395 >    }
3396  
3397      /**
3398 <     * whenComplete action executes on cancelled source, propagating
3399 <     * CancellationException.
3398 >     * failedFuture returns a CompletableFuture completed
3399 >     * exceptionally with the given Exception
3400       */
3401 <    public void testWhenComplete_sourceCancelled() {
3402 <        for (ExecutionMode m : ExecutionMode.values())
3403 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3404 <        for (boolean createIncomplete : new boolean[] { true, false })
3405 <    {
3361 <        final AtomicInteger a = new AtomicInteger(0);
3362 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3363 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3364 <        final CompletableFuture<Integer> g = m.whenComplete
3365 <            (f,
3366 <             (Integer x, Throwable t) -> {
3367 <                threadAssertNull(x);
3368 <                threadAssertTrue(t instanceof CancellationException);
3369 <                a.getAndIncrement();
3370 <            });
3371 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3401 >    public void testFailedFuture() {
3402 >        CFException ex = new CFException();
3403 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3404 >        checkCompletedExceptionallyWithRootCause(f, ex);
3405 >    }
3406  
3407 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3408 <        checkCompletedWithWrappedCancellationException(g);
3409 <        checkCancelled(f);
3410 <        assertEquals(1, a.get());
3411 <    }}
3407 >    /**
3408 >     * failedFuture(null) throws NPE
3409 >     */
3410 >    public void testFailedFuture2() {
3411 >        try {
3412 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3413 >            shouldThrow();
3414 >        } catch (NullPointerException success) {}
3415 >    }
3416  
3417      /**
3418 <     * If a whenComplete action throws an exception when triggered by
3419 <     * a normal completion, it completes exceptionally
3418 >     * copy returns a CompletableFuture that is completed normally,
3419 >     * with the same value, when source is.
3420       */
3421 <    public void testWhenComplete_actionFailed() {
3422 <        for (boolean createIncomplete : new boolean[] { true, false })
3423 <        for (ExecutionMode m : ExecutionMode.values())
3424 <        for (Integer v1 : new Integer[] { 1, null })
3425 <    {
3426 <        final AtomicInteger a = new AtomicInteger(0);
3427 <        final CFException ex = new CFException();
3428 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3429 <        if (!createIncomplete) f.complete(v1);
3392 <        final CompletableFuture<Integer> g = m.whenComplete
3393 <            (f,
3394 <             (Integer x, Throwable t) -> {
3395 <                threadAssertSame(x, v1);
3396 <                threadAssertNull(t);
3397 <                a.getAndIncrement();
3398 <                throw ex;
3399 <            });
3400 <        if (createIncomplete) f.complete(v1);
3401 <        checkCompletedNormally(f, v1);
3402 <        checkCompletedWithWrappedCFException(g, ex);
3403 <        assertEquals(1, a.get());
3404 <    }}
3421 >    public void testCopy() {
3422 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3423 >        CompletableFuture<Integer> g = f.copy();
3424 >        checkIncomplete(f);
3425 >        checkIncomplete(g);
3426 >        f.complete(1);
3427 >        checkCompletedNormally(f, 1);
3428 >        checkCompletedNormally(g, 1);
3429 >    }
3430  
3431      /**
3432 <     * If a whenComplete action throws an exception when triggered by
3433 <     * a source completion that also throws an exception, the source
3409 <     * exception takes precedence.
3432 >     * copy returns a CompletableFuture that is completed exceptionally
3433 >     * when source is.
3434       */
3435 <    public void testWhenComplete_actionFailedSourceFailed() {
3436 <        for (boolean createIncomplete : new boolean[] { true, false })
3435 >    public void testCopy2() {
3436 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3437 >        CompletableFuture<Integer> g = f.copy();
3438 >        checkIncomplete(f);
3439 >        checkIncomplete(g);
3440 >        CFException ex = new CFException();
3441 >        f.completeExceptionally(ex);
3442 >        checkCompletedExceptionally(f, ex);
3443 >        checkCompletedWithWrappedCFException(g);
3444 >    }
3445 >
3446 >    /**
3447 >     * minimalCompletionStage returns a CompletableFuture that is
3448 >     * completed normally, with the same value, when source is.
3449 >     */
3450 >    public void testMinimalCompletionStage() {
3451 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3452 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3453 >        AtomicInteger x = new AtomicInteger();
3454 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3455 >        checkIncomplete(f);
3456 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3457 >        f.complete(1);
3458 >        checkCompletedNormally(f, 1);
3459 >        assertEquals(x.get(), 1);
3460 >        assertNull(r.get());
3461 >    }
3462 >
3463 >    /**
3464 >     * minimalCompletionStage returns a CompletableFuture that is
3465 >     * completed exceptionally when source is.
3466 >     */
3467 >    public void testMinimalCompletionStage2() {
3468 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3469 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3470 >        AtomicInteger x = new AtomicInteger();
3471 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3472 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3473 >        checkIncomplete(f);
3474 >        CFException ex = new CFException();
3475 >        f.completeExceptionally(ex);
3476 >        checkCompletedExceptionally(f, ex);
3477 >        assertEquals(x.get(), 0);
3478 >        assertEquals(r.get().getCause(), ex);
3479 >    }
3480 >
3481 >    /**
3482 >     * failedStage returns a Completionstage completed
3483 >     * exceptionally with the given Exception
3484 >     */
3485 >    public void testFailedStage() {
3486 >        CFException ex = new CFException();
3487 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3488 >        AtomicInteger x = new AtomicInteger();
3489 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3490 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3491 >        assertEquals(x.get(), 0);
3492 >        assertEquals(r.get().getCause(), ex);
3493 >    }
3494 >
3495 >    /**
3496 >     * completeAsync completes with value of given supplier
3497 >     */
3498 >    public void testCompleteAsync() {
3499 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3500 >        f.completeAsync(() -> 1);
3501 >        f.join();
3502 >        checkCompletedNormally(f, 1);
3503 >    }
3504 >
3505 >    /**
3506 >     * completeAsync completes exceptionally if given supplier throws
3507 >     */
3508 >    public void testCompleteAsync2() {
3509 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3510 >        CFException ex = new CFException();
3511 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3512 >        try {
3513 >            f.join();
3514 >            shouldThrow();
3515 >        } catch (Exception success) {}
3516 >        checkCompletedWithWrappedCFException(f);
3517 >    }
3518 >
3519 >    /**
3520 >     * completeAsync with given executor completes with value of given supplier
3521 >     */
3522 >    public void testCompleteAsync3() {
3523 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3524 >        f.completeAsync(() -> 1, new ThreadExecutor());
3525 >        f.join();
3526 >        checkCompletedNormally(f, 1);
3527 >    }
3528 >
3529 >    /**
3530 >     * completeAsync with given executor completes exceptionally if
3531 >     * given supplier throws
3532 >     */
3533 >    public void testCompleteAsync4() {
3534 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3535 >        CFException ex = new CFException();
3536 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, new ThreadExecutor());
3537 >        try {
3538 >            f.join();
3539 >            shouldThrow();
3540 >        } catch (Exception success) {}
3541 >        checkCompletedWithWrappedCFException(f);
3542 >    }
3543 >
3544 >    /**
3545 >     *  orTimeout completes with TimeoutException if not complete
3546 >     */
3547 >    public void testOrTimeout() {
3548 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3549 >        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3550 >        checkCompletedExceptionallyWithTimeout(f);
3551 >    }
3552 >
3553 >    /**
3554 >     *  orTimeout completes normally if completed before timeout
3555 >     */
3556 >    public void testOrTimeout2() {
3557 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3558 >        f.complete(1);
3559 >        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3560 >        checkCompletedNormally(f, 1);
3561 >    }
3562 >
3563 >    /**
3564 >     *  completeOnTimeout completes with given value if not complete
3565 >     */
3566 >    public void testCompleteOnTimeout() {
3567 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3568 >        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3569 >        f.join();
3570 >        checkCompletedNormally(f, -1);
3571 >    }
3572 >
3573 >    /**
3574 >     *  completeOnTimeout has no effect if completed within timeout
3575 >     */
3576 >    public void testCompleteOnTimeout2() {
3577 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3578 >        f.complete(1);
3579 >        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3580 >        checkCompletedNormally(f, 1);
3581 >    }
3582 >
3583 >    /**
3584 >     * delayedExecutor returns an executor that delays submission
3585 >     */
3586 >    public void testDelayedExecutor() {
3587 >        long timeoutMillis = SMALL_DELAY_MS;
3588 >        Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3589 >                                                       MILLISECONDS);
3590 >        long startTime = System.nanoTime();
3591 >        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3592 >        assertNull(f.getNow(null));
3593 >        try {
3594 >            f.get(LONG_DELAY_MS, MILLISECONDS);
3595 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
3596 >        assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3597 >        checkCompletedNormally(f, 1);
3598 >    }
3599 >
3600 >    /**
3601 >     * delayedExecutor for a given executor returns an executor that
3602 >     * delays submission
3603 >     */
3604 >    public void testDelayedExecutor2() {
3605 >        long timeoutMillis = SMALL_DELAY_MS;
3606 >        Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3607 >                                                       MILLISECONDS,
3608 >                                                       new ThreadExecutor());
3609 >        long startTime = System.nanoTime();
3610 >        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3611 >        assertNull(f.getNow(null));
3612 >        try {
3613 >            f.get(LONG_DELAY_MS, MILLISECONDS);
3614 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
3615 >        assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3616 >        checkCompletedNormally(f, 1);
3617 >    }
3618 >
3619 >    //--- tests of implementation details; not part of official tck ---
3620 >
3621 >    Object resultOf(CompletableFuture<?> f) {
3622 >        try {
3623 >            java.lang.reflect.Field resultField
3624 >                = CompletableFuture.class.getDeclaredField("result");
3625 >            resultField.setAccessible(true);
3626 >            return resultField.get(f);
3627 >        } catch (Throwable t) { throw new AssertionError(t); }
3628 >    }
3629 >
3630 >    public void testExceptionPropagationReusesResultObject() {
3631 >        if (!testImplementationDetails) return;
3632          for (ExecutionMode m : ExecutionMode.values())
3414        for (Integer v1 : new Integer[] { 1, null })
3633      {
3634 <        final AtomicInteger a = new AtomicInteger(0);
3635 <        final CFException ex1 = new CFException();
3636 <        final CFException ex2 = new CFException();
3419 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3634 >        final CFException ex = new CFException();
3635 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3636 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3637  
3638 <        if (!createIncomplete) f.completeExceptionally(ex1);
3639 <        final CompletableFuture<Integer> g = m.whenComplete
3423 <            (f,
3424 <             (Integer x, Throwable t) -> {
3425 <                threadAssertSame(t, ex1);
3426 <                threadAssertNull(x);
3427 <                a.getAndIncrement();
3428 <                throw ex2;
3429 <            });
3430 <        if (createIncomplete) f.completeExceptionally(ex1);
3638 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3639 >            = new ArrayList<>();
3640  
3641 <        checkCompletedWithWrappedCFException(f, ex1);
3642 <        checkCompletedWithWrappedCFException(g, ex1);
3643 <        assertEquals(1, a.get());
3641 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3642 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3643 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3644 >
3645 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3646 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3647 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3648 >
3649 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3650 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3651 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3652 >
3653 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3654 >
3655 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3656 >
3657 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3658 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3659 >
3660 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3661 >                 fun : funs) {
3662 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3663 >            f.completeExceptionally(ex);
3664 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3665 >            checkCompletedWithWrappedException(src, ex);
3666 >            CompletableFuture<?> dep = fun.apply(src);
3667 >            checkCompletedWithWrappedException(dep, ex);
3668 >            assertSame(resultOf(src), resultOf(dep));
3669 >        }
3670 >
3671 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3672 >                 fun : funs) {
3673 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3674 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3675 >            CompletableFuture<?> dep = fun.apply(src);
3676 >            f.completeExceptionally(ex);
3677 >            checkCompletedWithWrappedException(src, ex);
3678 >            checkCompletedWithWrappedException(dep, ex);
3679 >            assertSame(resultOf(src), resultOf(dep));
3680 >        }
3681 >
3682 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3683 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3684 >                 fun : funs) {
3685 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3686 >            f.cancel(mayInterruptIfRunning);
3687 >            checkCancelled(f);
3688 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3689 >            checkCompletedWithWrappedCancellationException(src);
3690 >            CompletableFuture<?> dep = fun.apply(src);
3691 >            checkCompletedWithWrappedCancellationException(dep);
3692 >            assertSame(resultOf(src), resultOf(dep));
3693 >        }
3694 >
3695 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3696 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3697 >                 fun : funs) {
3698 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3699 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3700 >            CompletableFuture<?> dep = fun.apply(src);
3701 >            f.cancel(mayInterruptIfRunning);
3702 >            checkCancelled(f);
3703 >            checkCompletedWithWrappedCancellationException(src);
3704 >            checkCompletedWithWrappedCancellationException(dep);
3705 >            assertSame(resultOf(src), resultOf(dep));
3706 >        }
3707      }}
3708  
3709   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines