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.53 by jsr166, Mon Jun 2 20:20:47 2014 UTC vs.
Revision 1.153 by jsr166, Sun Jun 26 19:17:08 2016 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 > import static java.util.concurrent.CompletableFuture.completedFuture;
11 > import static java.util.concurrent.CompletableFuture.failedFuture;
12 >
13 > import java.lang.reflect.Method;
14 > import java.lang.reflect.Modifier;
15 >
16 > import java.util.stream.Collectors;
17 > import java.util.stream.Stream;
18 >
19 > import java.util.ArrayList;
20 > import java.util.Arrays;
21 > import java.util.List;
22 > import java.util.Objects;
23 > import java.util.Set;
24   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
25   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
26   import java.util.concurrent.CompletableFuture;
27   import java.util.concurrent.CompletionException;
28   import java.util.concurrent.CompletionStage;
29 + import java.util.concurrent.ExecutionException;
30 + import java.util.concurrent.Executor;
31   import java.util.concurrent.ForkJoinPool;
32   import java.util.concurrent.ForkJoinTask;
33 + import java.util.concurrent.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
35 + import java.util.concurrent.TimeUnit;
36   import java.util.concurrent.atomic.AtomicInteger;
37 < 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;
37 > import java.util.concurrent.atomic.AtomicReference;
38   import java.util.function.BiConsumer;
30 import java.util.function.Function;
39   import java.util.function.BiFunction;
40 + import java.util.function.Consumer;
41 + import java.util.function.Function;
42 + import java.util.function.Predicate;
43 + import java.util.function.Supplier;
44 +
45 + import junit.framework.AssertionFailedError;
46 + import junit.framework.Test;
47 + import junit.framework.TestSuite;
48  
49   public class CompletableFutureTest extends JSR166TestCase {
50  
51      public static void main(String[] args) {
52 <        junit.textui.TestRunner.run(suite());
52 >        main(suite(), args);
53      }
54      public static Test suite() {
55          return new TestSuite(CompletableFutureTest.class);
# Line 44 | Line 60 | public class CompletableFutureTest exten
60      void checkIncomplete(CompletableFuture<?> f) {
61          assertFalse(f.isDone());
62          assertFalse(f.isCancelled());
63 <        assertTrue(f.toString().contains("[Not completed]"));
63 >        assertTrue(f.toString().contains("Not completed"));
64          try {
65              assertNull(f.getNow(null));
66          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 57 | Line 73 | public class CompletableFutureTest exten
73      }
74  
75      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
76 <        try {
77 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
76 >        checkTimedGet(f, value);
77 >
78          try {
79              assertEquals(value, f.join());
80          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 75 | Line 90 | public class CompletableFutureTest exten
90          assertTrue(f.toString().contains("[Completed normally]"));
91      }
92  
93 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
94 <        try {
95 <            f.get(LONG_DELAY_MS, MILLISECONDS);
96 <            shouldThrow();
97 <        } catch (ExecutionException success) {
98 <            assertTrue(success.getCause() instanceof CFException);
99 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
100 <        try {
101 <            f.join();
102 <            shouldThrow();
103 <        } catch (CompletionException success) {
104 <            assertTrue(success.getCause() instanceof CFException);
105 <        }
106 <        try {
107 <            f.getNow(null);
108 <            shouldThrow();
109 <        } catch (CompletionException success) {
95 <            assertTrue(success.getCause() instanceof CFException);
93 >    /**
94 >     * Returns the "raw" internal exceptional completion of f,
95 >     * without any additional wrapping with CompletionException.
96 >     */
97 >    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
98 >        // handle (and whenComplete) can distinguish between "direct"
99 >        // and "wrapped" exceptional completion
100 >        return f.handle((U u, Throwable t) -> t).join();
101 >    }
102 >
103 >    void checkCompletedExceptionally(CompletableFuture<?> f,
104 >                                     boolean wrapped,
105 >                                     Consumer<Throwable> checker) {
106 >        Throwable cause = exceptionalCompletion(f);
107 >        if (wrapped) {
108 >            assertTrue(cause instanceof CompletionException);
109 >            cause = cause.getCause();
110          }
111 <        try {
98 <            f.get();
99 <            shouldThrow();
100 <        } catch (ExecutionException success) {
101 <            assertTrue(success.getCause() instanceof CFException);
102 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
103 <        assertTrue(f.isDone());
104 <        assertFalse(f.isCancelled());
105 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
106 <    }
111 >        checker.accept(cause);
112  
113 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
113 >        long startTime = System.nanoTime();
114          try {
115              f.get(LONG_DELAY_MS, MILLISECONDS);
116              shouldThrow();
117          } catch (ExecutionException success) {
118 <            assertSame(ex, success.getCause());
118 >            assertSame(cause, success.getCause());
119          } catch (Throwable fail) { threadUnexpectedException(fail); }
120 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
121 +
122          try {
123              f.join();
124              shouldThrow();
125          } catch (CompletionException success) {
126 <            assertSame(ex, success.getCause());
127 <        }
126 >            assertSame(cause, success.getCause());
127 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
128 >
129          try {
130              f.getNow(null);
131              shouldThrow();
132          } catch (CompletionException success) {
133 <            assertSame(ex, success.getCause());
134 <        }
133 >            assertSame(cause, success.getCause());
134 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
135 >
136          try {
137              f.get();
138              shouldThrow();
139          } catch (ExecutionException success) {
140 <            assertSame(ex, success.getCause());
140 >            assertSame(cause, success.getCause());
141          } catch (Throwable fail) { threadUnexpectedException(fail); }
142 <        assertTrue(f.isDone());
142 >
143          assertFalse(f.isCancelled());
144 +        assertTrue(f.isDone());
145 +        assertTrue(f.isCompletedExceptionally());
146          assertTrue(f.toString().contains("[Completed exceptionally]"));
147      }
148  
149 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
150 +        checkCompletedExceptionally(f, true,
151 +            (t) -> assertTrue(t instanceof CFException));
152 +    }
153 +
154 +    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
155 +        checkCompletedExceptionally(f, true,
156 +            (t) -> assertTrue(t instanceof CancellationException));
157 +    }
158 +
159 +    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
160 +        checkCompletedExceptionally(f, false,
161 +            (t) -> assertTrue(t instanceof TimeoutException));
162 +    }
163 +
164 +    void checkCompletedWithWrappedException(CompletableFuture<?> f,
165 +                                            Throwable ex) {
166 +        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
167 +    }
168 +
169 +    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
170 +        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
171 +    }
172 +
173      void checkCancelled(CompletableFuture<?> f) {
174 +        long startTime = System.nanoTime();
175          try {
176              f.get(LONG_DELAY_MS, MILLISECONDS);
177              shouldThrow();
178          } catch (CancellationException success) {
179          } catch (Throwable fail) { threadUnexpectedException(fail); }
180 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
181 +
182          try {
183              f.join();
184              shouldThrow();
# Line 155 | Line 192 | public class CompletableFutureTest exten
192              shouldThrow();
193          } catch (CancellationException success) {
194          } catch (Throwable fail) { threadUnexpectedException(fail); }
158        assertTrue(f.isDone());
159        assertTrue(f.isCompletedExceptionally());
160        assertTrue(f.isCancelled());
161        assertTrue(f.toString().contains("[Completed exceptionally]"));
162    }
195  
196 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
197 <        try {
166 <            f.get(LONG_DELAY_MS, MILLISECONDS);
167 <            shouldThrow();
168 <        } catch (ExecutionException success) {
169 <            assertTrue(success.getCause() instanceof CancellationException);
170 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
171 <        try {
172 <            f.join();
173 <            shouldThrow();
174 <        } catch (CompletionException success) {
175 <            assertTrue(success.getCause() instanceof CancellationException);
176 <        }
177 <        try {
178 <            f.getNow(null);
179 <            shouldThrow();
180 <        } catch (CompletionException success) {
181 <            assertTrue(success.getCause() instanceof CancellationException);
182 <        }
183 <        try {
184 <            f.get();
185 <            shouldThrow();
186 <        } catch (ExecutionException success) {
187 <            assertTrue(success.getCause() instanceof CancellationException);
188 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
196 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
197 >
198          assertTrue(f.isDone());
190        assertFalse(f.isCancelled());
199          assertTrue(f.isCompletedExceptionally());
200 +        assertTrue(f.isCancelled());
201          assertTrue(f.toString().contains("[Completed exceptionally]"));
202      }
203  
# Line 206 | Line 215 | public class CompletableFutureTest exten
215       * isCancelled, join, get, and getNow
216       */
217      public void testComplete() {
218 +        for (Integer v1 : new Integer[] { 1, null })
219 +    {
220          CompletableFuture<Integer> f = new CompletableFuture<>();
221          checkIncomplete(f);
222 <        f.complete(one);
223 <        checkCompletedNormally(f, one);
224 <    }
222 >        assertTrue(f.complete(v1));
223 >        assertFalse(f.complete(v1));
224 >        checkCompletedNormally(f, v1);
225 >    }}
226  
227      /**
228       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 230 | public class CompletableFutureTest exten
230       */
231      public void testCompleteExceptionally() {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233 +        CFException ex = new CFException();
234          checkIncomplete(f);
235 <        f.completeExceptionally(new CFException());
236 <        checkCompletedWithWrappedCFException(f);
235 >        f.completeExceptionally(ex);
236 >        checkCompletedExceptionally(f, ex);
237      }
238  
239      /**
# Line 228 | Line 241 | public class CompletableFutureTest exten
241       * methods isDone, isCancelled, join, get, and getNow
242       */
243      public void testCancel() {
244 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
245 +    {
246          CompletableFuture<Integer> f = new CompletableFuture<>();
247          checkIncomplete(f);
248 <        assertTrue(f.cancel(true));
248 >        assertTrue(f.cancel(mayInterruptIfRunning));
249 >        assertTrue(f.cancel(mayInterruptIfRunning));
250 >        assertTrue(f.cancel(!mayInterruptIfRunning));
251          checkCancelled(f);
252 <    }
252 >    }}
253  
254      /**
255       * obtrudeValue forces completion with given value
# Line 240 | Line 257 | public class CompletableFutureTest exten
257      public void testObtrudeValue() {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260 <        f.complete(one);
260 >        assertTrue(f.complete(one));
261          checkCompletedNormally(f, one);
262          f.obtrudeValue(three);
263          checkCompletedNormally(f, three);
# Line 261 | Line 278 | public class CompletableFutureTest exten
278       * obtrudeException forces completion with given exception
279       */
280      public void testObtrudeException() {
281 <        CompletableFuture<Integer> f = new CompletableFuture<>();
282 <        checkIncomplete(f);
283 <        f.complete(one);
284 <        checkCompletedNormally(f, one);
285 <        f.obtrudeException(new CFException());
286 <        checkCompletedWithWrappedCFException(f);
281 >        for (Integer v1 : new Integer[] { 1, null })
282 >    {
283 >        CFException ex;
284 >        CompletableFuture<Integer> f;
285 >
286 >        f = new CompletableFuture<>();
287 >        assertTrue(f.complete(v1));
288 >        for (int i = 0; i < 2; i++) {
289 >            f.obtrudeException(ex = new CFException());
290 >            checkCompletedExceptionally(f, ex);
291 >        }
292 >
293          f = new CompletableFuture<>();
294 <        f.obtrudeException(new CFException());
295 <        checkCompletedWithWrappedCFException(f);
294 >        for (int i = 0; i < 2; i++) {
295 >            f.obtrudeException(ex = new CFException());
296 >            checkCompletedExceptionally(f, ex);
297 >        }
298 >
299          f = new CompletableFuture<>();
300 +        f.completeExceptionally(ex = new CFException());
301 +        f.obtrudeValue(v1);
302 +        checkCompletedNormally(f, v1);
303 +        f.obtrudeException(ex = new CFException());
304 +        checkCompletedExceptionally(f, ex);
305          f.completeExceptionally(new CFException());
306 <        f.obtrudeValue(four);
307 <        checkCompletedNormally(f, four);
308 <        f.obtrudeException(new CFException());
309 <        checkCompletedWithWrappedCFException(f);
279 <    }
306 >        checkCompletedExceptionally(f, ex);
307 >        assertFalse(f.complete(v1));
308 >        checkCompletedExceptionally(f, ex);
309 >    }}
310  
311      /**
312       * getNumberOfDependents returns number of dependent tasks
313       */
314      public void testGetNumberOfDependents() {
315 +        for (ExecutionMode m : ExecutionMode.values())
316 +        for (Integer v1 : new Integer[] { 1, null })
317 +    {
318          CompletableFuture<Integer> f = new CompletableFuture<>();
319          assertEquals(0, f.getNumberOfDependents());
320 <        CompletableFuture g = f.thenRun(new Noop());
320 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
321          assertEquals(1, f.getNumberOfDependents());
322          assertEquals(0, g.getNumberOfDependents());
323 <        CompletableFuture h = f.thenRun(new Noop());
323 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
324          assertEquals(2, f.getNumberOfDependents());
325 <        f.complete(1);
325 >        assertEquals(0, h.getNumberOfDependents());
326 >        assertTrue(f.complete(v1));
327          checkCompletedNormally(g, null);
328 +        checkCompletedNormally(h, null);
329          assertEquals(0, f.getNumberOfDependents());
330          assertEquals(0, g.getNumberOfDependents());
331 <    }
331 >        assertEquals(0, h.getNumberOfDependents());
332 >    }}
333  
334      /**
335       * toString indicates current completion state
# Line 304 | Line 340 | public class CompletableFutureTest exten
340          f = new CompletableFuture<String>();
341          assertTrue(f.toString().contains("[Not completed]"));
342  
343 <        f.complete("foo");
343 >        assertTrue(f.complete("foo"));
344          assertTrue(f.toString().contains("[Completed normally]"));
345  
346          f = new CompletableFuture<String>();
347 <        f.completeExceptionally(new IndexOutOfBoundsException());
347 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
348          assertTrue(f.toString().contains("[Completed exceptionally]"));
349 +
350 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
351 +            f = new CompletableFuture<String>();
352 +            assertTrue(f.cancel(mayInterruptIfRunning));
353 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
354 +        }
355      }
356  
357      /**
# Line 320 | Line 362 | public class CompletableFutureTest exten
362          checkCompletedNormally(f, "test");
363      }
364  
365 <    // Choose non-commutative actions for better coverage
365 >    abstract class CheckedAction {
366 >        int invocationCount = 0;
367 >        final ExecutionMode m;
368 >        CheckedAction(ExecutionMode m) { this.m = m; }
369 >        void invoked() {
370 >            m.checkExecutionMode();
371 >            assertEquals(0, invocationCount++);
372 >        }
373 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
374 >        void assertInvoked() { assertEquals(1, invocationCount); }
375 >    }
376  
377 <    // A non-commutative function that handles and produces null values as well.
378 <    static Integer subtract(Integer x, Integer y) {
379 <        return (x == null && y == null) ? null :
380 <            ((x == null) ? 42 : x.intValue())
381 <            - ((y == null) ? 99 : y.intValue());
377 >    abstract class CheckedIntegerAction extends CheckedAction {
378 >        Integer value;
379 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
380 >        void assertValue(Integer expected) {
381 >            assertInvoked();
382 >            assertEquals(expected, value);
383 >        }
384 >    }
385 >
386 >    class IntegerSupplier extends CheckedAction
387 >        implements Supplier<Integer>
388 >    {
389 >        final Integer value;
390 >        IntegerSupplier(ExecutionMode m, Integer value) {
391 >            super(m);
392 >            this.value = value;
393 >        }
394 >        public Integer get() {
395 >            invoked();
396 >            return value;
397 >        }
398      }
399  
400      // A function that handles and produces null values as well.
# Line 334 | Line 402 | public class CompletableFutureTest exten
402          return (x == null) ? null : x + 1;
403      }
404  
405 <    static final Supplier<Integer> supplyOne =
406 <        () -> Integer.valueOf(1);
407 <    static final Function<Integer, Integer> inc =
408 <        (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;
405 >    class NoopConsumer extends CheckedIntegerAction
406 >        implements Consumer<Integer>
407 >    {
408 >        NoopConsumer(ExecutionMode m) { super(m); }
409          public void accept(Integer x) {
410 <            invocationCount++;
411 <            value = inc(x);
410 >            invoked();
411 >            value = x;
412          }
413      }
414 <    static final class IncFunction implements Function<Integer,Integer> {
415 <        int invocationCount = 0;
416 <        Integer value;
414 >
415 >    class IncFunction extends CheckedIntegerAction
416 >        implements Function<Integer,Integer>
417 >    {
418 >        IncFunction(ExecutionMode m) { super(m); }
419          public Integer apply(Integer x) {
420 <            invocationCount++;
420 >            invoked();
421              return value = inc(x);
422          }
423      }
424 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
425 <        int invocationCount = 0;
426 <        Integer value;
427 <        // Check this action was invoked exactly once when result is computed.
424 >
425 >    // Choose non-commutative actions for better coverage
426 >    // A non-commutative function that handles and produces null values as well.
427 >    static Integer subtract(Integer x, Integer y) {
428 >        return (x == null && y == null) ? null :
429 >            ((x == null) ? 42 : x.intValue())
430 >            - ((y == null) ? 99 : y.intValue());
431 >    }
432 >
433 >    class SubtractAction extends CheckedIntegerAction
434 >        implements BiConsumer<Integer, Integer>
435 >    {
436 >        SubtractAction(ExecutionMode m) { super(m); }
437          public void accept(Integer x, Integer y) {
438 <            invocationCount++;
438 >            invoked();
439              value = subtract(x, y);
440          }
441      }
442 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
443 <        int invocationCount = 0;
444 <        Integer value;
445 <        // Check this action was invoked exactly once when result is computed.
442 >
443 >    class SubtractFunction extends CheckedIntegerAction
444 >        implements BiFunction<Integer, Integer, Integer>
445 >    {
446 >        SubtractFunction(ExecutionMode m) { super(m); }
447          public Integer apply(Integer x, Integer y) {
448 <            invocationCount++;
448 >            invoked();
449              return value = subtract(x, y);
450          }
451      }
452 <    static final class Noop implements Runnable {
453 <        int invocationCount = 0;
452 >
453 >    class Noop extends CheckedAction implements Runnable {
454 >        Noop(ExecutionMode m) { super(m); }
455          public void run() {
456 <            invocationCount++;
456 >            invoked();
457          }
458      }
459  
460 <    static final class FailingSupplier implements Supplier<Integer> {
461 <        int invocationCount = 0;
460 >    class FailingSupplier extends CheckedAction
461 >        implements Supplier<Integer>
462 >    {
463 >        final CFException ex;
464 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
465          public Integer get() {
466 <            invocationCount++;
467 <            throw new CFException();
466 >            invoked();
467 >            throw ex;
468          }
469      }
470 <    static final class FailingConsumer implements Consumer<Integer> {
471 <        int invocationCount = 0;
470 >
471 >    class FailingConsumer extends CheckedIntegerAction
472 >        implements Consumer<Integer>
473 >    {
474 >        final CFException ex;
475 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
476          public void accept(Integer x) {
477 <            invocationCount++;
478 <            throw new CFException();
477 >            invoked();
478 >            value = x;
479 >            throw ex;
480          }
481      }
482 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
483 <        int invocationCount = 0;
482 >
483 >    class FailingBiConsumer extends CheckedIntegerAction
484 >        implements BiConsumer<Integer, Integer>
485 >    {
486 >        final CFException ex;
487 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
488          public void accept(Integer x, Integer y) {
489 <            invocationCount++;
490 <            throw new CFException();
489 >            invoked();
490 >            value = subtract(x, y);
491 >            throw ex;
492          }
493      }
494 <    static final class FailingFunction implements Function<Integer, Integer> {
495 <        int invocationCount = 0;
494 >
495 >    class FailingFunction extends CheckedIntegerAction
496 >        implements Function<Integer, Integer>
497 >    {
498 >        final CFException ex;
499 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
500          public Integer apply(Integer x) {
501 <            invocationCount++;
502 <            throw new CFException();
501 >            invoked();
502 >            value = x;
503 >            throw ex;
504          }
505      }
506 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
507 <        int invocationCount = 0;
506 >
507 >    class FailingBiFunction extends CheckedIntegerAction
508 >        implements BiFunction<Integer, Integer, Integer>
509 >    {
510 >        final CFException ex;
511 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
512          public Integer apply(Integer x, Integer y) {
513 <            invocationCount++;
514 <            throw new CFException();
513 >            invoked();
514 >            value = subtract(x, y);
515 >            throw ex;
516          }
517      }
518 <    static final class FailingRunnable implements Runnable {
519 <        int invocationCount = 0;
518 >
519 >    class FailingRunnable extends CheckedAction implements Runnable {
520 >        final CFException ex;
521 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
522          public void run() {
523 <            invocationCount++;
524 <            throw new CFException();
523 >            invoked();
524 >            throw ex;
525          }
526      }
527  
528 <    static final class CompletableFutureInc
529 <        implements Function<Integer, CompletableFuture<Integer>> {
530 <        int invocationCount = 0;
528 >    class CompletableFutureInc extends CheckedIntegerAction
529 >        implements Function<Integer, CompletableFuture<Integer>>
530 >    {
531 >        CompletableFutureInc(ExecutionMode m) { super(m); }
532          public CompletableFuture<Integer> apply(Integer x) {
533 <            invocationCount++;
533 >            invoked();
534 >            value = x;
535              CompletableFuture<Integer> f = new CompletableFuture<>();
536 <            f.complete(inc(x));
536 >            assertTrue(f.complete(inc(x)));
537              return f;
538          }
539      }
540  
541 <    static final class FailingCompletableFutureFunction
542 <        implements Function<Integer, CompletableFuture<Integer>> {
543 <        int invocationCount = 0;
541 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
542 >        implements Function<Integer, CompletableFuture<Integer>>
543 >    {
544 >        final CFException ex;
545 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
546          public CompletableFuture<Integer> apply(Integer x) {
547 <            invocationCount++;
548 <            throw new CFException();
547 >            invoked();
548 >            value = x;
549 >            throw ex;
550          }
551      }
552  
553      // Used for explicit executor tests
554      static final class ThreadExecutor implements Executor {
555 <        AtomicInteger count = new AtomicInteger(0);
555 >        final AtomicInteger count = new AtomicInteger(0);
556 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
557 >        static boolean startedCurrentThread() {
558 >            return Thread.currentThread().getThreadGroup() == tg;
559 >        }
560  
561          public void execute(Runnable r) {
562              count.getAndIncrement();
563 <            new Thread(r).start();
563 >            new Thread(tg, r).start();
564          }
565      }
566  
567 +    static final boolean defaultExecutorIsCommonPool
568 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
569 +
570      /**
571       * Permits the testing of parallel code for the 3 different
572 <     * execution modes without repeating all the testing code.
572 >     * execution modes without copy/pasting all the test methods.
573       */
574      enum ExecutionMode {
575 <        DEFAULT {
575 >        SYNC {
576              public void checkExecutionMode() {
577 +                assertFalse(ThreadExecutor.startedCurrentThread());
578                  assertNull(ForkJoinTask.getPool());
579              }
580 +            public CompletableFuture<Void> runAsync(Runnable a) {
581 +                throw new UnsupportedOperationException();
582 +            }
583 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
584 +                throw new UnsupportedOperationException();
585 +            }
586              public <T> CompletableFuture<Void> thenRun
587                  (CompletableFuture<T> f, Runnable a) {
588                  return f.thenRun(a);
# Line 528 | Line 648 | public class CompletableFutureTest exten
648  
649          ASYNC {
650              public void checkExecutionMode() {
651 <                assertSame(ForkJoinPool.commonPool(),
652 <                           ForkJoinTask.getPool());
651 >                assertEquals(defaultExecutorIsCommonPool,
652 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
653 >            }
654 >            public CompletableFuture<Void> runAsync(Runnable a) {
655 >                return CompletableFuture.runAsync(a);
656 >            }
657 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
658 >                return CompletableFuture.supplyAsync(a);
659              }
660              public <T> CompletableFuture<Void> thenRun
661                  (CompletableFuture<T> f, Runnable a) {
# Line 596 | Line 722 | public class CompletableFutureTest exten
722  
723          EXECUTOR {
724              public void checkExecutionMode() {
725 <                //TODO
725 >                assertTrue(ThreadExecutor.startedCurrentThread());
726 >            }
727 >            public CompletableFuture<Void> runAsync(Runnable a) {
728 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
729 >            }
730 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
731 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
732              }
733              public <T> CompletableFuture<Void> thenRun
734                  (CompletableFuture<T> f, Runnable a) {
# Line 662 | Line 794 | public class CompletableFutureTest exten
794          };
795  
796          public abstract void checkExecutionMode();
797 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
798 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
799          public abstract <T> CompletableFuture<Void> thenRun
800              (CompletableFuture<T> f, Runnable a);
801          public abstract <T> CompletableFuture<Void> thenAccept
# Line 711 | Line 845 | public class CompletableFutureTest exten
845      {
846          final AtomicInteger a = new AtomicInteger(0);
847          final CompletableFuture<Integer> f = new CompletableFuture<>();
848 <        if (!createIncomplete) f.complete(v1);
848 >        if (!createIncomplete) assertTrue(f.complete(v1));
849          final CompletableFuture<Integer> g = f.exceptionally
850              ((Throwable t) -> {
717                // Should not be called
851                  a.getAndIncrement();
852 <                throw new AssertionError();
852 >                threadFail("should not be called");
853 >                return null;            // unreached
854              });
855 <        if (createIncomplete) f.complete(v1);
855 >        if (createIncomplete) assertTrue(f.complete(v1));
856  
857          checkCompletedNormally(g, v1);
858          checkCompletedNormally(f, v1);
859          assertEquals(0, a.get());
860      }}
861  
728
862      /**
863       * exceptionally action completes with function value on source
864       * exception
# Line 740 | Line 873 | public class CompletableFutureTest exten
873          if (!createIncomplete) f.completeExceptionally(ex);
874          final CompletableFuture<Integer> g = f.exceptionally
875              ((Throwable t) -> {
876 +                ExecutionMode.SYNC.checkExecutionMode();
877                  threadAssertSame(t, ex);
878                  a.getAndIncrement();
879                  return v1;
# Line 750 | Line 884 | public class CompletableFutureTest exten
884          assertEquals(1, a.get());
885      }}
886  
887 +    /**
888 +     * If an "exceptionally action" throws an exception, it completes
889 +     * exceptionally with that exception
890 +     */
891      public void testExceptionally_exceptionalCompletionActionFailed() {
892          for (boolean createIncomplete : new boolean[] { true, false })
755        for (Integer v1 : new Integer[] { 1, null })
893      {
894          final AtomicInteger a = new AtomicInteger(0);
895          final CFException ex1 = new CFException();
# Line 761 | Line 898 | public class CompletableFutureTest exten
898          if (!createIncomplete) f.completeExceptionally(ex1);
899          final CompletableFuture<Integer> g = f.exceptionally
900              ((Throwable t) -> {
901 +                ExecutionMode.SYNC.checkExecutionMode();
902                  threadAssertSame(t, ex1);
903                  a.getAndIncrement();
904                  throw ex2;
905              });
906          if (createIncomplete) f.completeExceptionally(ex1);
907  
908 <        checkCompletedWithWrappedCFException(g, ex2);
908 >        checkCompletedWithWrappedException(g, ex2);
909 >        checkCompletedExceptionally(f, ex1);
910 >        assertEquals(1, a.get());
911 >    }}
912 >
913 >    /**
914 >     * whenComplete action executes on normal completion, propagating
915 >     * source result.
916 >     */
917 >    public void testWhenComplete_normalCompletion() {
918 >        for (ExecutionMode m : ExecutionMode.values())
919 >        for (boolean createIncomplete : new boolean[] { true, false })
920 >        for (Integer v1 : new Integer[] { 1, null })
921 >    {
922 >        final AtomicInteger a = new AtomicInteger(0);
923 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
924 >        if (!createIncomplete) assertTrue(f.complete(v1));
925 >        final CompletableFuture<Integer> g = m.whenComplete
926 >            (f,
927 >             (Integer result, Throwable t) -> {
928 >                m.checkExecutionMode();
929 >                threadAssertSame(result, v1);
930 >                threadAssertNull(t);
931 >                a.getAndIncrement();
932 >            });
933 >        if (createIncomplete) assertTrue(f.complete(v1));
934 >
935 >        checkCompletedNormally(g, v1);
936 >        checkCompletedNormally(f, v1);
937 >        assertEquals(1, a.get());
938 >    }}
939 >
940 >    /**
941 >     * whenComplete action executes on exceptional completion, propagating
942 >     * source result.
943 >     */
944 >    public void testWhenComplete_exceptionalCompletion() {
945 >        for (ExecutionMode m : ExecutionMode.values())
946 >        for (boolean createIncomplete : new boolean[] { true, false })
947 >    {
948 >        final AtomicInteger a = new AtomicInteger(0);
949 >        final CFException ex = new CFException();
950 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
951 >        if (!createIncomplete) f.completeExceptionally(ex);
952 >        final CompletableFuture<Integer> g = m.whenComplete
953 >            (f,
954 >             (Integer result, Throwable t) -> {
955 >                m.checkExecutionMode();
956 >                threadAssertNull(result);
957 >                threadAssertSame(t, ex);
958 >                a.getAndIncrement();
959 >            });
960 >        if (createIncomplete) f.completeExceptionally(ex);
961 >
962 >        checkCompletedWithWrappedException(g, ex);
963 >        checkCompletedExceptionally(f, ex);
964 >        assertEquals(1, a.get());
965 >    }}
966 >
967 >    /**
968 >     * whenComplete action executes on cancelled source, propagating
969 >     * CancellationException.
970 >     */
971 >    public void testWhenComplete_sourceCancelled() {
972 >        for (ExecutionMode m : ExecutionMode.values())
973 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
974 >        for (boolean createIncomplete : new boolean[] { true, false })
975 >    {
976 >        final AtomicInteger a = new AtomicInteger(0);
977 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
978 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
979 >        final CompletableFuture<Integer> g = m.whenComplete
980 >            (f,
981 >             (Integer result, Throwable t) -> {
982 >                m.checkExecutionMode();
983 >                threadAssertNull(result);
984 >                threadAssertTrue(t instanceof CancellationException);
985 >                a.getAndIncrement();
986 >            });
987 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
988 >
989 >        checkCompletedWithWrappedCancellationException(g);
990 >        checkCancelled(f);
991 >        assertEquals(1, a.get());
992 >    }}
993 >
994 >    /**
995 >     * If a whenComplete action throws an exception when triggered by
996 >     * a normal completion, it completes exceptionally
997 >     */
998 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >        for (ExecutionMode m : ExecutionMode.values())
1001 >        for (Integer v1 : new Integer[] { 1, null })
1002 >    {
1003 >        final AtomicInteger a = new AtomicInteger(0);
1004 >        final CFException ex = new CFException();
1005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 >        if (!createIncomplete) assertTrue(f.complete(v1));
1007 >        final CompletableFuture<Integer> g = m.whenComplete
1008 >            (f,
1009 >             (Integer result, Throwable t) -> {
1010 >                m.checkExecutionMode();
1011 >                threadAssertSame(result, v1);
1012 >                threadAssertNull(t);
1013 >                a.getAndIncrement();
1014 >                throw ex;
1015 >            });
1016 >        if (createIncomplete) assertTrue(f.complete(v1));
1017 >
1018 >        checkCompletedWithWrappedException(g, ex);
1019 >        checkCompletedNormally(f, v1);
1020 >        assertEquals(1, a.get());
1021 >    }}
1022 >
1023 >    /**
1024 >     * If a whenComplete action throws an exception when triggered by
1025 >     * a source completion that also throws an exception, the source
1026 >     * exception takes precedence (unlike handle)
1027 >     */
1028 >    public void testWhenComplete_sourceFailedActionFailed() {
1029 >        for (boolean createIncomplete : new boolean[] { true, false })
1030 >        for (ExecutionMode m : ExecutionMode.values())
1031 >    {
1032 >        final AtomicInteger a = new AtomicInteger(0);
1033 >        final CFException ex1 = new CFException();
1034 >        final CFException ex2 = new CFException();
1035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 >
1037 >        if (!createIncomplete) f.completeExceptionally(ex1);
1038 >        final CompletableFuture<Integer> g = m.whenComplete
1039 >            (f,
1040 >             (Integer result, Throwable t) -> {
1041 >                m.checkExecutionMode();
1042 >                threadAssertSame(t, ex1);
1043 >                threadAssertNull(result);
1044 >                a.getAndIncrement();
1045 >                throw ex2;
1046 >            });
1047 >        if (createIncomplete) f.completeExceptionally(ex1);
1048 >
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051 >        if (testImplementationDetails) {
1052 >            assertEquals(1, ex1.getSuppressed().length);
1053 >            assertSame(ex2, ex1.getSuppressed()[0]);
1054 >        }
1055          assertEquals(1, a.get());
1056      }}
1057  
# Line 782 | Line 1066 | public class CompletableFutureTest exten
1066      {
1067          final CompletableFuture<Integer> f = new CompletableFuture<>();
1068          final AtomicInteger a = new AtomicInteger(0);
1069 <        if (!createIncomplete) f.complete(v1);
1069 >        if (!createIncomplete) assertTrue(f.complete(v1));
1070          final CompletableFuture<Integer> g = m.handle
1071              (f,
1072 <             (Integer x, Throwable t) -> {
1073 <                threadAssertSame(x, v1);
1072 >             (Integer result, Throwable t) -> {
1073 >                m.checkExecutionMode();
1074 >                threadAssertSame(result, v1);
1075                  threadAssertNull(t);
1076                  a.getAndIncrement();
1077                  return inc(v1);
1078              });
1079 <        if (createIncomplete) f.complete(v1);
1079 >        if (createIncomplete) assertTrue(f.complete(v1));
1080  
1081          checkCompletedNormally(g, inc(v1));
1082          checkCompletedNormally(f, v1);
# Line 813 | Line 1098 | public class CompletableFutureTest exten
1098          if (!createIncomplete) f.completeExceptionally(ex);
1099          final CompletableFuture<Integer> g = m.handle
1100              (f,
1101 <             (Integer x, Throwable t) -> {
1102 <                threadAssertNull(x);
1101 >             (Integer result, Throwable t) -> {
1102 >                m.checkExecutionMode();
1103 >                threadAssertNull(result);
1104                  threadAssertSame(t, ex);
1105                  a.getAndIncrement();
1106                  return v1;
# Line 822 | Line 1108 | public class CompletableFutureTest exten
1108          if (createIncomplete) f.completeExceptionally(ex);
1109  
1110          checkCompletedNormally(g, v1);
1111 <        checkCompletedWithWrappedCFException(f, ex);
1111 >        checkCompletedExceptionally(f, ex);
1112          assertEquals(1, a.get());
1113      }}
1114  
# Line 841 | Line 1127 | public class CompletableFutureTest exten
1127          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1128          final CompletableFuture<Integer> g = m.handle
1129              (f,
1130 <             (Integer x, Throwable t) -> {
1131 <                threadAssertNull(x);
1130 >             (Integer result, Throwable t) -> {
1131 >                m.checkExecutionMode();
1132 >                threadAssertNull(result);
1133                  threadAssertTrue(t instanceof CancellationException);
1134                  a.getAndIncrement();
1135                  return v1;
# Line 855 | Line 1142 | public class CompletableFutureTest exten
1142      }}
1143  
1144      /**
1145 <     * handle result completes exceptionally if action does
1145 >     * If a "handle action" throws an exception when triggered by
1146 >     * a normal completion, it completes exceptionally
1147       */
1148 <    public void testHandle_sourceFailedActionFailed() {
1148 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1149          for (ExecutionMode m : ExecutionMode.values())
1150          for (boolean createIncomplete : new boolean[] { true, false })
1151 +        for (Integer v1 : new Integer[] { 1, null })
1152      {
1153          final CompletableFuture<Integer> f = new CompletableFuture<>();
1154          final AtomicInteger a = new AtomicInteger(0);
1155 <        final CFException ex1 = new CFException();
1156 <        final CFException ex2 = new CFException();
868 <        if (!createIncomplete) f.completeExceptionally(ex1);
1155 >        final CFException ex = new CFException();
1156 >        if (!createIncomplete) assertTrue(f.complete(v1));
1157          final CompletableFuture<Integer> g = m.handle
1158              (f,
1159 <             (Integer x, Throwable t) -> {
1160 <                threadAssertNull(x);
1161 <                threadAssertSame(ex1, t);
1159 >             (Integer result, Throwable t) -> {
1160 >                m.checkExecutionMode();
1161 >                threadAssertSame(result, v1);
1162 >                threadAssertNull(t);
1163                  a.getAndIncrement();
1164 <                throw ex2;
1164 >                throw ex;
1165              });
1166 <        if (createIncomplete) f.completeExceptionally(ex1);
1166 >        if (createIncomplete) assertTrue(f.complete(v1));
1167  
1168 <        checkCompletedWithWrappedCFException(g, ex2);
1169 <        checkCompletedWithWrappedCFException(f, ex1);
1168 >        checkCompletedWithWrappedException(g, ex);
1169 >        checkCompletedNormally(f, v1);
1170          assertEquals(1, a.get());
1171      }}
1172  
1173 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1174 <        for (ExecutionMode m : ExecutionMode.values())
1173 >    /**
1174 >     * If a "handle action" throws an exception when triggered by
1175 >     * a source completion that also throws an exception, the action
1176 >     * exception takes precedence (unlike whenComplete)
1177 >     */
1178 >    public void testHandle_sourceFailedActionFailed() {
1179          for (boolean createIncomplete : new boolean[] { true, false })
1180 <        for (Integer v1 : new Integer[] { 1, null })
1180 >        for (ExecutionMode m : ExecutionMode.values())
1181      {
889        final CompletableFuture<Integer> f = new CompletableFuture<>();
1182          final AtomicInteger a = new AtomicInteger(0);
1183 <        final CFException ex = new CFException();
1184 <        if (!createIncomplete) f.complete(v1);
1183 >        final CFException ex1 = new CFException();
1184 >        final CFException ex2 = new CFException();
1185 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1186 >
1187 >        if (!createIncomplete) f.completeExceptionally(ex1);
1188          final CompletableFuture<Integer> g = m.handle
1189              (f,
1190 <             (Integer x, Throwable t) -> {
1191 <                threadAssertSame(x, v1);
1192 <                threadAssertNull(t);
1190 >             (Integer result, Throwable t) -> {
1191 >                m.checkExecutionMode();
1192 >                threadAssertNull(result);
1193 >                threadAssertSame(ex1, t);
1194                  a.getAndIncrement();
1195 <                throw ex;
1195 >                throw ex2;
1196              });
1197 <        if (createIncomplete) f.complete(v1);
1197 >        if (createIncomplete) f.completeExceptionally(ex1);
1198  
1199 <        checkCompletedWithWrappedCFException(g, ex);
1200 <        checkCompletedNormally(f, v1);
1199 >        checkCompletedWithWrappedException(g, ex2);
1200 >        checkCompletedExceptionally(f, ex1);
1201          assertEquals(1, a.get());
1202      }}
1203  
1204      /**
1205       * runAsync completes after running Runnable
1206       */
1207 <    public void testRunAsync() {
1208 <        Noop r = new Noop();
1209 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1210 <        assertNull(f.join());
1211 <        assertEquals(1, r.invocationCount);
1212 <        checkCompletedNormally(f, null);
1213 <    }
1214 <
1215 <    /**
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);
1207 >    public void testRunAsync_normalCompletion() {
1208 >        ExecutionMode[] executionModes = {
1209 >            ExecutionMode.ASYNC,
1210 >            ExecutionMode.EXECUTOR,
1211 >        };
1212 >        for (ExecutionMode m : executionModes)
1213 >    {
1214 >        final Noop r = new Noop(m);
1215 >        final CompletableFuture<Void> f = m.runAsync(r);
1216          assertNull(f.join());
927        assertEquals(1, r.invocationCount);
1217          checkCompletedNormally(f, null);
1218 <        assertEquals(1, exec.count.get());
1219 <    }
1218 >        r.assertInvoked();
1219 >    }}
1220  
1221      /**
1222       * failing runAsync completes exceptionally after running Runnable
1223       */
1224 <    public void testRunAsync3() {
1225 <        FailingRunnable r = new FailingRunnable();
1226 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1227 <        checkCompletedWithWrappedCFException(f);
1228 <        assertEquals(1, r.invocationCount);
1229 <    }
1224 >    public void testRunAsync_exceptionalCompletion() {
1225 >        ExecutionMode[] executionModes = {
1226 >            ExecutionMode.ASYNC,
1227 >            ExecutionMode.EXECUTOR,
1228 >        };
1229 >        for (ExecutionMode m : executionModes)
1230 >    {
1231 >        final FailingRunnable r = new FailingRunnable(m);
1232 >        final CompletableFuture<Void> f = m.runAsync(r);
1233 >        checkCompletedWithWrappedException(f, r.ex);
1234 >        r.assertInvoked();
1235 >    }}
1236  
1237      /**
1238       * supplyAsync completes with result of supplier
1239       */
1240 <    public void testSupplyAsync() {
1241 <        CompletableFuture<Integer> f;
1242 <        f = CompletableFuture.supplyAsync(supplyOne);
1243 <        assertEquals(f.join(), one);
1244 <        checkCompletedNormally(f, one);
1245 <    }
1246 <
1247 <    /**
1248 <     * supplyAsync with executor completes with result of supplier
1249 <     */
1250 <    public void testSupplyAsync2() {
1251 <        CompletableFuture<Integer> f;
1252 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1253 <        assertEquals(f.join(), one);
959 <        checkCompletedNormally(f, one);
960 <    }
1240 >    public void testSupplyAsync_normalCompletion() {
1241 >        ExecutionMode[] executionModes = {
1242 >            ExecutionMode.ASYNC,
1243 >            ExecutionMode.EXECUTOR,
1244 >        };
1245 >        for (ExecutionMode m : executionModes)
1246 >        for (Integer v1 : new Integer[] { 1, null })
1247 >    {
1248 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1249 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1250 >        assertSame(v1, f.join());
1251 >        checkCompletedNormally(f, v1);
1252 >        r.assertInvoked();
1253 >    }}
1254  
1255      /**
1256       * Failing supplyAsync completes exceptionally
1257       */
1258 <    public void testSupplyAsync3() {
1259 <        FailingSupplier r = new FailingSupplier();
1260 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1261 <        checkCompletedWithWrappedCFException(f);
1262 <        assertEquals(1, r.invocationCount);
1263 <    }
1258 >    public void testSupplyAsync_exceptionalCompletion() {
1259 >        ExecutionMode[] executionModes = {
1260 >            ExecutionMode.ASYNC,
1261 >            ExecutionMode.EXECUTOR,
1262 >        };
1263 >        for (ExecutionMode m : executionModes)
1264 >    {
1265 >        FailingSupplier r = new FailingSupplier(m);
1266 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1267 >        checkCompletedWithWrappedException(f, r.ex);
1268 >        r.assertInvoked();
1269 >    }}
1270  
1271      // seq completion methods
1272  
# Line 976 | Line 1275 | public class CompletableFutureTest exten
1275       */
1276      public void testThenRun_normalCompletion() {
1277          for (ExecutionMode m : ExecutionMode.values())
979        for (boolean createIncomplete : new boolean[] { true, false })
1278          for (Integer v1 : new Integer[] { 1, null })
1279      {
1280          final CompletableFuture<Integer> f = new CompletableFuture<>();
1281 <        final Noop r = new Noop();
1282 <        if (!createIncomplete) f.complete(v1);
985 <        final CompletableFuture<Void> g = m.thenRun(f, r);
986 <        if (createIncomplete) {
987 <            checkIncomplete(g);
988 <            f.complete(v1);
989 <        }
1281 >        final Noop[] rs = new Noop[6];
1282 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1283  
1284 <        checkCompletedNormally(g, null);
1284 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1285 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1286 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1287 >        checkIncomplete(h0);
1288 >        checkIncomplete(h1);
1289 >        checkIncomplete(h2);
1290 >        assertTrue(f.complete(v1));
1291 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1292 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1293 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1294 >
1295 >        checkCompletedNormally(h0, null);
1296 >        checkCompletedNormally(h1, null);
1297 >        checkCompletedNormally(h2, null);
1298 >        checkCompletedNormally(h3, null);
1299 >        checkCompletedNormally(h4, null);
1300 >        checkCompletedNormally(h5, null);
1301          checkCompletedNormally(f, v1);
1302 <        assertEquals(1, r.invocationCount);
1302 >        for (Noop r : rs) r.assertInvoked();
1303      }}
1304  
1305      /**
# Line 999 | Line 1308 | public class CompletableFutureTest exten
1308       */
1309      public void testThenRun_exceptionalCompletion() {
1310          for (ExecutionMode m : ExecutionMode.values())
1002        for (boolean createIncomplete : new boolean[] { true, false })
1311      {
1312          final CFException ex = new CFException();
1313          final CompletableFuture<Integer> f = new CompletableFuture<>();
1314 <        final Noop r = new Noop();
1315 <        if (!createIncomplete) f.completeExceptionally(ex);
1008 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1009 <        if (createIncomplete) {
1010 <            checkIncomplete(g);
1011 <            f.completeExceptionally(ex);
1012 <        }
1314 >        final Noop[] rs = new Noop[6];
1315 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1316  
1317 <        checkCompletedWithWrappedCFException(g, ex);
1318 <        checkCompletedWithWrappedCFException(f, ex);
1319 <        assertEquals(0, r.invocationCount);
1317 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1318 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1319 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1320 >        checkIncomplete(h0);
1321 >        checkIncomplete(h1);
1322 >        checkIncomplete(h2);
1323 >        assertTrue(f.completeExceptionally(ex));
1324 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1325 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1326 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1327 >
1328 >        checkCompletedWithWrappedException(h0, ex);
1329 >        checkCompletedWithWrappedException(h1, ex);
1330 >        checkCompletedWithWrappedException(h2, ex);
1331 >        checkCompletedWithWrappedException(h3, ex);
1332 >        checkCompletedWithWrappedException(h4, ex);
1333 >        checkCompletedWithWrappedException(h5, ex);
1334 >        checkCompletedExceptionally(f, ex);
1335 >        for (Noop r : rs) r.assertNotInvoked();
1336      }}
1337  
1338      /**
# Line 1021 | Line 1340 | public class CompletableFutureTest exten
1340       */
1341      public void testThenRun_sourceCancelled() {
1342          for (ExecutionMode m : ExecutionMode.values())
1024        for (boolean createIncomplete : new boolean[] { true, false })
1343          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1344      {
1345          final CompletableFuture<Integer> f = new CompletableFuture<>();
1346 <        final Noop r = new Noop();
1347 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1030 <        final CompletableFuture<Void> g = f.thenRun(r);
1031 <        if (createIncomplete) {
1032 <            checkIncomplete(g);
1033 <            assertTrue(f.cancel(mayInterruptIfRunning));
1034 <        }
1346 >        final Noop[] rs = new Noop[6];
1347 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1348  
1349 <        checkCompletedWithWrappedCancellationException(g);
1349 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1350 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1351 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1352 >        checkIncomplete(h0);
1353 >        checkIncomplete(h1);
1354 >        checkIncomplete(h2);
1355 >        assertTrue(f.cancel(mayInterruptIfRunning));
1356 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1357 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1358 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1359 >
1360 >        checkCompletedWithWrappedCancellationException(h0);
1361 >        checkCompletedWithWrappedCancellationException(h1);
1362 >        checkCompletedWithWrappedCancellationException(h2);
1363 >        checkCompletedWithWrappedCancellationException(h3);
1364 >        checkCompletedWithWrappedCancellationException(h4);
1365 >        checkCompletedWithWrappedCancellationException(h5);
1366          checkCancelled(f);
1367 <        assertEquals(0, r.invocationCount);
1367 >        for (Noop r : rs) r.assertNotInvoked();
1368      }}
1369  
1370      /**
# Line 1043 | Line 1372 | public class CompletableFutureTest exten
1372       */
1373      public void testThenRun_actionFailed() {
1374          for (ExecutionMode m : ExecutionMode.values())
1046        for (boolean createIncomplete : new boolean[] { true, false })
1375          for (Integer v1 : new Integer[] { 1, null })
1376      {
1377          final CompletableFuture<Integer> f = new CompletableFuture<>();
1378 <        final FailingRunnable r = new FailingRunnable();
1379 <        if (!createIncomplete) f.complete(v1);
1052 <        final CompletableFuture<Void> g = f.thenRun(r);
1053 <        if (createIncomplete) {
1054 <            checkIncomplete(g);
1055 <            f.complete(v1);
1056 <        }
1378 >        final FailingRunnable[] rs = new FailingRunnable[6];
1379 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1380  
1381 <        checkCompletedWithWrappedCFException(g);
1381 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1382 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1383 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1384 >        assertTrue(f.complete(v1));
1385 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1386 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1387 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1388 >
1389 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1390 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1391 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1392 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1393 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1394 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1395          checkCompletedNormally(f, v1);
1396      }}
1397  
# Line 1064 | Line 1400 | public class CompletableFutureTest exten
1400       */
1401      public void testThenApply_normalCompletion() {
1402          for (ExecutionMode m : ExecutionMode.values())
1067        for (boolean createIncomplete : new boolean[] { true, false })
1403          for (Integer v1 : new Integer[] { 1, null })
1404      {
1405          final CompletableFuture<Integer> f = new CompletableFuture<>();
1406 <        final IncFunction r = new IncFunction();
1407 <        if (!createIncomplete) f.complete(v1);
1073 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1074 <        if (createIncomplete) {
1075 <            checkIncomplete(g);
1076 <            f.complete(v1);
1077 <        }
1406 >        final IncFunction[] rs = new IncFunction[4];
1407 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1408  
1409 <        checkCompletedNormally(g, inc(v1));
1409 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1410 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1411 >        checkIncomplete(h0);
1412 >        checkIncomplete(h1);
1413 >        assertTrue(f.complete(v1));
1414 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1415 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1416 >
1417 >        checkCompletedNormally(h0, inc(v1));
1418 >        checkCompletedNormally(h1, inc(v1));
1419 >        checkCompletedNormally(h2, inc(v1));
1420 >        checkCompletedNormally(h3, inc(v1));
1421          checkCompletedNormally(f, v1);
1422 <        assertEquals(1, r.invocationCount);
1422 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1423      }}
1424  
1425      /**
# Line 1087 | Line 1428 | public class CompletableFutureTest exten
1428       */
1429      public void testThenApply_exceptionalCompletion() {
1430          for (ExecutionMode m : ExecutionMode.values())
1090        for (boolean createIncomplete : new boolean[] { true, false })
1431      {
1432          final CFException ex = new CFException();
1433          final CompletableFuture<Integer> f = new CompletableFuture<>();
1434 <        final IncFunction r = new IncFunction();
1435 <        if (!createIncomplete) f.completeExceptionally(ex);
1096 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1097 <        if (createIncomplete) {
1098 <            checkIncomplete(g);
1099 <            f.completeExceptionally(ex);
1100 <        }
1434 >        final IncFunction[] rs = new IncFunction[4];
1435 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1436  
1437 <        checkCompletedWithWrappedCFException(g, ex);
1438 <        checkCompletedWithWrappedCFException(f, ex);
1439 <        assertEquals(0, r.invocationCount);
1437 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1438 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1439 >        assertTrue(f.completeExceptionally(ex));
1440 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1441 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1442 >
1443 >        checkCompletedWithWrappedException(h0, ex);
1444 >        checkCompletedWithWrappedException(h1, ex);
1445 >        checkCompletedWithWrappedException(h2, ex);
1446 >        checkCompletedWithWrappedException(h3, ex);
1447 >        checkCompletedExceptionally(f, ex);
1448 >        for (IncFunction r : rs) r.assertNotInvoked();
1449      }}
1450  
1451      /**
# Line 1109 | Line 1453 | public class CompletableFutureTest exten
1453       */
1454      public void testThenApply_sourceCancelled() {
1455          for (ExecutionMode m : ExecutionMode.values())
1112        for (boolean createIncomplete : new boolean[] { true, false })
1456          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1457      {
1458          final CompletableFuture<Integer> f = new CompletableFuture<>();
1459 <        final IncFunction r = new IncFunction();
1460 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1118 <        final CompletableFuture<Integer> g = f.thenApply(r);
1119 <        if (createIncomplete) {
1120 <            checkIncomplete(g);
1121 <            assertTrue(f.cancel(mayInterruptIfRunning));
1122 <        }
1459 >        final IncFunction[] rs = new IncFunction[4];
1460 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1461  
1462 <        checkCompletedWithWrappedCancellationException(g);
1462 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1463 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1464 >        assertTrue(f.cancel(mayInterruptIfRunning));
1465 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1466 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1467 >
1468 >        checkCompletedWithWrappedCancellationException(h0);
1469 >        checkCompletedWithWrappedCancellationException(h1);
1470 >        checkCompletedWithWrappedCancellationException(h2);
1471 >        checkCompletedWithWrappedCancellationException(h3);
1472          checkCancelled(f);
1473 <        assertEquals(0, r.invocationCount);
1473 >        for (IncFunction r : rs) r.assertNotInvoked();
1474      }}
1475  
1476      /**
# Line 1131 | Line 1478 | public class CompletableFutureTest exten
1478       */
1479      public void testThenApply_actionFailed() {
1480          for (ExecutionMode m : ExecutionMode.values())
1134        for (boolean createIncomplete : new boolean[] { true, false })
1481          for (Integer v1 : new Integer[] { 1, null })
1482      {
1483          final CompletableFuture<Integer> f = new CompletableFuture<>();
1484 <        final FailingFunction r = new FailingFunction();
1485 <        if (!createIncomplete) f.complete(v1);
1140 <        final CompletableFuture<Integer> g = f.thenApply(r);
1141 <        if (createIncomplete) {
1142 <            checkIncomplete(g);
1143 <            f.complete(v1);
1144 <        }
1484 >        final FailingFunction[] rs = new FailingFunction[4];
1485 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1486  
1487 <        checkCompletedWithWrappedCFException(g);
1487 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1488 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1489 >        assertTrue(f.complete(v1));
1490 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1491 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1492 >
1493 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1494 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1495 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1496 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1497          checkCompletedNormally(f, v1);
1498      }}
1499  
# Line 1152 | Line 1502 | public class CompletableFutureTest exten
1502       */
1503      public void testThenAccept_normalCompletion() {
1504          for (ExecutionMode m : ExecutionMode.values())
1155        for (boolean createIncomplete : new boolean[] { true, false })
1505          for (Integer v1 : new Integer[] { 1, null })
1506      {
1507          final CompletableFuture<Integer> f = new CompletableFuture<>();
1508 <        final IncAction r = new IncAction();
1509 <        if (!createIncomplete) f.complete(v1);
1161 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1162 <        if (createIncomplete) {
1163 <            checkIncomplete(g);
1164 <            f.complete(v1);
1165 <        }
1508 >        final NoopConsumer[] rs = new NoopConsumer[4];
1509 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1510  
1511 <        checkCompletedNormally(g, null);
1511 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1512 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1513 >        checkIncomplete(h0);
1514 >        checkIncomplete(h1);
1515 >        assertTrue(f.complete(v1));
1516 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1517 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1518 >
1519 >        checkCompletedNormally(h0, null);
1520 >        checkCompletedNormally(h1, null);
1521 >        checkCompletedNormally(h2, null);
1522 >        checkCompletedNormally(h3, null);
1523          checkCompletedNormally(f, v1);
1524 <        assertEquals(1, r.invocationCount);
1170 <        assertEquals(inc(v1), r.value);
1524 >        for (NoopConsumer r : rs) r.assertValue(v1);
1525      }}
1526  
1527      /**
# Line 1176 | Line 1530 | public class CompletableFutureTest exten
1530       */
1531      public void testThenAccept_exceptionalCompletion() {
1532          for (ExecutionMode m : ExecutionMode.values())
1179        for (boolean createIncomplete : new boolean[] { true, false })
1533      {
1534          final CFException ex = new CFException();
1535          final CompletableFuture<Integer> f = new CompletableFuture<>();
1536 <        final IncAction r = new IncAction();
1537 <        if (!createIncomplete) f.completeExceptionally(ex);
1185 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1186 <        if (createIncomplete) {
1187 <            checkIncomplete(g);
1188 <            f.completeExceptionally(ex);
1189 <        }
1536 >        final NoopConsumer[] rs = new NoopConsumer[4];
1537 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1538  
1539 <        checkCompletedWithWrappedCFException(g, ex);
1540 <        checkCompletedWithWrappedCFException(f, ex);
1541 <        assertEquals(0, r.invocationCount);
1539 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1540 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1541 >        assertTrue(f.completeExceptionally(ex));
1542 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1543 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1544 >
1545 >        checkCompletedWithWrappedException(h0, ex);
1546 >        checkCompletedWithWrappedException(h1, ex);
1547 >        checkCompletedWithWrappedException(h2, ex);
1548 >        checkCompletedWithWrappedException(h3, ex);
1549 >        checkCompletedExceptionally(f, ex);
1550 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1551      }}
1552  
1553      /**
1554 <     * thenAccept result completes exceptionally if action does
1554 >     * thenAccept result completes exceptionally if source cancelled
1555       */
1556 <    public void testThenAccept_actionFailed() {
1556 >    public void testThenAccept_sourceCancelled() {
1557          for (ExecutionMode m : ExecutionMode.values())
1558 <        for (boolean createIncomplete : new boolean[] { true, false })
1202 <        for (Integer v1 : new Integer[] { 1, null })
1558 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1559      {
1560          final CompletableFuture<Integer> f = new CompletableFuture<>();
1561 <        final FailingConsumer r = new FailingConsumer();
1562 <        if (!createIncomplete) f.complete(v1);
1207 <        final CompletableFuture<Void> g = f.thenAccept(r);
1208 <        if (createIncomplete) {
1209 <            checkIncomplete(g);
1210 <            f.complete(v1);
1211 <        }
1561 >        final NoopConsumer[] rs = new NoopConsumer[4];
1562 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1563  
1564 <        checkCompletedWithWrappedCFException(g);
1565 <        checkCompletedNormally(f, v1);
1564 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1565 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1566 >        assertTrue(f.cancel(mayInterruptIfRunning));
1567 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1568 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1569 >
1570 >        checkCompletedWithWrappedCancellationException(h0);
1571 >        checkCompletedWithWrappedCancellationException(h1);
1572 >        checkCompletedWithWrappedCancellationException(h2);
1573 >        checkCompletedWithWrappedCancellationException(h3);
1574 >        checkCancelled(f);
1575 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1576      }}
1577  
1578      /**
1579 <     * thenAccept result completes exceptionally if source cancelled
1579 >     * thenAccept result completes exceptionally if action does
1580       */
1581 <    public void testThenAccept_sourceCancelled() {
1581 >    public void testThenAccept_actionFailed() {
1582          for (ExecutionMode m : ExecutionMode.values())
1583 <        for (boolean createIncomplete : new boolean[] { true, false })
1223 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1583 >        for (Integer v1 : new Integer[] { 1, null })
1584      {
1585          final CompletableFuture<Integer> f = new CompletableFuture<>();
1586 <        final IncAction r = new IncAction();
1587 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1228 <        final CompletableFuture<Void> g = f.thenAccept(r);
1229 <        if (createIncomplete) {
1230 <            checkIncomplete(g);
1231 <            assertTrue(f.cancel(mayInterruptIfRunning));
1232 <        }
1586 >        final FailingConsumer[] rs = new FailingConsumer[4];
1587 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1588  
1589 <        checkCompletedWithWrappedCancellationException(g);
1590 <        checkCancelled(f);
1591 <        assertEquals(0, r.invocationCount);
1589 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1590 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1591 >        assertTrue(f.complete(v1));
1592 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1593 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1594 >
1595 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1596 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1597 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1598 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1599 >        checkCompletedNormally(f, v1);
1600      }}
1601  
1602      /**
# Line 1242 | Line 1605 | public class CompletableFutureTest exten
1605       */
1606      public void testThenCombine_normalCompletion() {
1607          for (ExecutionMode m : ExecutionMode.values())
1245        for (boolean createIncomplete : new boolean[] { true, false })
1608          for (boolean fFirst : new boolean[] { true, false })
1609          for (Integer v1 : new Integer[] { 1, null })
1610          for (Integer v2 : new Integer[] { 2, null })
1611      {
1612          final CompletableFuture<Integer> f = new CompletableFuture<>();
1613          final CompletableFuture<Integer> g = new CompletableFuture<>();
1614 <        final SubtractFunction r = new SubtractFunction();
1614 >        final SubtractFunction[] rs = new SubtractFunction[6];
1615 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1616  
1617 <        if (fFirst) f.complete(v1); else g.complete(v2);
1618 <        if (!createIncomplete)
1619 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1620 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1621 <        if (createIncomplete) {
1622 <            checkIncomplete(h);
1623 <            assertEquals(0, r.invocationCount);
1624 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1625 <        }
1617 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1618 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1619 >        final Integer w1 =  fFirst ? v1 : v2;
1620 >        final Integer w2 = !fFirst ? v1 : v2;
1621 >
1622 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1623 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1624 >        assertTrue(fst.complete(w1));
1625 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1626 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1627 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1628 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1629 >        checkCompletedNormally(h1, subtract(w1, w1));
1630 >        checkCompletedNormally(h3, subtract(w1, w1));
1631 >        rs[1].assertValue(subtract(w1, w1));
1632 >        rs[3].assertValue(subtract(w1, w1));
1633 >        assertTrue(snd.complete(w2));
1634 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1635 >
1636 >        checkCompletedNormally(h0, subtract(v1, v2));
1637 >        checkCompletedNormally(h2, subtract(v1, v2));
1638 >        checkCompletedNormally(h4, subtract(v1, v2));
1639 >        rs[0].assertValue(subtract(v1, v2));
1640 >        rs[2].assertValue(subtract(v1, v2));
1641 >        rs[4].assertValue(subtract(v1, v2));
1642  
1264        checkCompletedNormally(h, subtract(v1, v2));
1643          checkCompletedNormally(f, v1);
1644          checkCompletedNormally(g, v2);
1267        assertEquals(1, r.invocationCount);
1645      }}
1646  
1647      /**
1648       * thenCombine result completes exceptionally after exceptional
1649       * completion of either source
1650       */
1651 <    public void testThenCombine_exceptionalCompletion() {
1651 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1652          for (ExecutionMode m : ExecutionMode.values())
1276        for (boolean createIncomplete : new boolean[] { true, false })
1653          for (boolean fFirst : new boolean[] { true, false })
1654 +        for (boolean failFirst : new boolean[] { true, false })
1655          for (Integer v1 : new Integer[] { 1, null })
1656      {
1657          final CompletableFuture<Integer> f = new CompletableFuture<>();
1658          final CompletableFuture<Integer> g = new CompletableFuture<>();
1659          final CFException ex = new CFException();
1660 <        final SubtractFunction r = new SubtractFunction();
1661 <
1662 <        (fFirst ? f : g).complete(v1);
1663 <        if (!createIncomplete)
1664 <            (!fFirst ? f : g).completeExceptionally(ex);
1665 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1666 <        if (createIncomplete) {
1667 <            checkIncomplete(h);
1668 <            (!fFirst ? f : g).completeExceptionally(ex);
1669 <        }
1670 <
1671 <        checkCompletedWithWrappedCFException(h, ex);
1672 <        assertEquals(0, r.invocationCount);
1673 <        checkCompletedNormally(fFirst ? f : g, v1);
1674 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1660 >        final SubtractFunction r1 = new SubtractFunction(m);
1661 >        final SubtractFunction r2 = new SubtractFunction(m);
1662 >        final SubtractFunction r3 = new SubtractFunction(m);
1663 >
1664 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1665 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1666 >        final Callable<Boolean> complete1 = failFirst ?
1667 >            () -> fst.completeExceptionally(ex) :
1668 >            () -> fst.complete(v1);
1669 >        final Callable<Boolean> complete2 = failFirst ?
1670 >            () -> snd.complete(v1) :
1671 >            () -> snd.completeExceptionally(ex);
1672 >
1673 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1674 >        assertTrue(complete1.call());
1675 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1676 >        checkIncomplete(h1);
1677 >        checkIncomplete(h2);
1678 >        assertTrue(complete2.call());
1679 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1680 >
1681 >        checkCompletedWithWrappedException(h1, ex);
1682 >        checkCompletedWithWrappedException(h2, ex);
1683 >        checkCompletedWithWrappedException(h3, ex);
1684 >        r1.assertNotInvoked();
1685 >        r2.assertNotInvoked();
1686 >        r3.assertNotInvoked();
1687 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1688 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1689      }}
1690  
1691      /**
1692 <     * thenCombine result completes exceptionally if action does
1692 >     * thenCombine result completes exceptionally if either source cancelled
1693       */
1694 <    public void testThenCombine_actionFailed() {
1694 >    public void testThenCombine_sourceCancelled() throws Throwable {
1695          for (ExecutionMode m : ExecutionMode.values())
1696 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1697          for (boolean fFirst : new boolean[] { true, false })
1698 +        for (boolean failFirst : new boolean[] { true, false })
1699          for (Integer v1 : new Integer[] { 1, null })
1307        for (Integer v2 : new Integer[] { 2, null })
1700      {
1701          final CompletableFuture<Integer> f = new CompletableFuture<>();
1702          final CompletableFuture<Integer> g = new CompletableFuture<>();
1703 <        final FailingBiFunction r = new FailingBiFunction();
1704 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1705 <
1706 <        if (fFirst) {
1707 <            f.complete(v1);
1708 <            g.complete(v2);
1709 <        } else {
1710 <            g.complete(v2);
1711 <            f.complete(v1);
1712 <        }
1713 <
1714 <        checkCompletedWithWrappedCFException(h);
1715 <        checkCompletedNormally(f, v1);
1716 <        checkCompletedNormally(g, v2);
1703 >        final SubtractFunction r1 = new SubtractFunction(m);
1704 >        final SubtractFunction r2 = new SubtractFunction(m);
1705 >        final SubtractFunction r3 = new SubtractFunction(m);
1706 >
1707 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1708 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1709 >        final Callable<Boolean> complete1 = failFirst ?
1710 >            () -> fst.cancel(mayInterruptIfRunning) :
1711 >            () -> fst.complete(v1);
1712 >        final Callable<Boolean> complete2 = failFirst ?
1713 >            () -> snd.complete(v1) :
1714 >            () -> snd.cancel(mayInterruptIfRunning);
1715 >
1716 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1717 >        assertTrue(complete1.call());
1718 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1719 >        checkIncomplete(h1);
1720 >        checkIncomplete(h2);
1721 >        assertTrue(complete2.call());
1722 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1723 >
1724 >        checkCompletedWithWrappedCancellationException(h1);
1725 >        checkCompletedWithWrappedCancellationException(h2);
1726 >        checkCompletedWithWrappedCancellationException(h3);
1727 >        r1.assertNotInvoked();
1728 >        r2.assertNotInvoked();
1729 >        r3.assertNotInvoked();
1730 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1731 >        checkCancelled(failFirst ? fst : snd);
1732      }}
1733  
1734      /**
1735 <     * thenCombine result completes exceptionally if either source cancelled
1735 >     * thenCombine result completes exceptionally if action does
1736       */
1737 <    public void testThenCombine_sourceCancelled() {
1737 >    public void testThenCombine_actionFailed() {
1738          for (ExecutionMode m : ExecutionMode.values())
1332        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333        for (boolean createIncomplete : new boolean[] { true, false })
1739          for (boolean fFirst : new boolean[] { true, false })
1740          for (Integer v1 : new Integer[] { 1, null })
1741 +        for (Integer v2 : new Integer[] { 2, null })
1742      {
1743          final CompletableFuture<Integer> f = new CompletableFuture<>();
1744          final CompletableFuture<Integer> g = new CompletableFuture<>();
1745 <        final SubtractFunction r = new SubtractFunction();
1746 <
1747 <        (fFirst ? f : g).complete(v1);
1748 <        if (!createIncomplete)
1749 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1750 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1751 <        if (createIncomplete) {
1752 <            checkIncomplete(h);
1753 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1754 <        }
1755 <
1756 <        checkCompletedWithWrappedCancellationException(h);
1757 <        checkCancelled(!fFirst ? f : g);
1758 <        assertEquals(0, r.invocationCount);
1759 <        checkCompletedNormally(fFirst ? f : g, v1);
1745 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1746 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1747 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1748 >
1749 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1750 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1751 >        final Integer w1 =  fFirst ? v1 : v2;
1752 >        final Integer w2 = !fFirst ? v1 : v2;
1753 >
1754 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1755 >        assertTrue(fst.complete(w1));
1756 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1757 >        assertTrue(snd.complete(w2));
1758 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1759 >
1760 >        checkCompletedWithWrappedException(h1, r1.ex);
1761 >        checkCompletedWithWrappedException(h2, r2.ex);
1762 >        checkCompletedWithWrappedException(h3, r3.ex);
1763 >        r1.assertInvoked();
1764 >        r2.assertInvoked();
1765 >        r3.assertInvoked();
1766 >        checkCompletedNormally(f, v1);
1767 >        checkCompletedNormally(g, v2);
1768      }}
1769  
1770      /**
# Line 1359 | Line 1773 | public class CompletableFutureTest exten
1773       */
1774      public void testThenAcceptBoth_normalCompletion() {
1775          for (ExecutionMode m : ExecutionMode.values())
1362        for (boolean createIncomplete : new boolean[] { true, false })
1776          for (boolean fFirst : new boolean[] { true, false })
1777          for (Integer v1 : new Integer[] { 1, null })
1778          for (Integer v2 : new Integer[] { 2, null })
1779      {
1780          final CompletableFuture<Integer> f = new CompletableFuture<>();
1781          final CompletableFuture<Integer> g = new CompletableFuture<>();
1782 <        final SubtractAction r = new SubtractAction();
1783 <
1784 <        if (fFirst) f.complete(v1); else g.complete(v2);
1785 <        if (!createIncomplete)
1786 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1787 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1788 <        if (createIncomplete) {
1789 <            checkIncomplete(h);
1790 <            assertEquals(0, r.invocationCount);
1791 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1792 <        }
1793 <
1794 <        checkCompletedNormally(h, null);
1795 <        assertEquals(subtract(v1, v2), r.value);
1782 >        final SubtractAction r1 = new SubtractAction(m);
1783 >        final SubtractAction r2 = new SubtractAction(m);
1784 >        final SubtractAction r3 = new SubtractAction(m);
1785 >
1786 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1787 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1788 >        final Integer w1 =  fFirst ? v1 : v2;
1789 >        final Integer w2 = !fFirst ? v1 : v2;
1790 >
1791 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1792 >        assertTrue(fst.complete(w1));
1793 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1794 >        checkIncomplete(h1);
1795 >        checkIncomplete(h2);
1796 >        r1.assertNotInvoked();
1797 >        r2.assertNotInvoked();
1798 >        assertTrue(snd.complete(w2));
1799 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1800 >
1801 >        checkCompletedNormally(h1, null);
1802 >        checkCompletedNormally(h2, null);
1803 >        checkCompletedNormally(h3, null);
1804 >        r1.assertValue(subtract(v1, v2));
1805 >        r2.assertValue(subtract(v1, v2));
1806 >        r3.assertValue(subtract(v1, v2));
1807          checkCompletedNormally(f, v1);
1808          checkCompletedNormally(g, v2);
1809      }}
# Line 1388 | Line 1812 | public class CompletableFutureTest exten
1812       * thenAcceptBoth result completes exceptionally after exceptional
1813       * completion of either source
1814       */
1815 <    public void testThenAcceptBoth_exceptionalCompletion() {
1815 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1816          for (ExecutionMode m : ExecutionMode.values())
1393        for (boolean createIncomplete : new boolean[] { true, false })
1817          for (boolean fFirst : new boolean[] { true, false })
1818 +        for (boolean failFirst : new boolean[] { true, false })
1819          for (Integer v1 : new Integer[] { 1, null })
1820      {
1821          final CompletableFuture<Integer> f = new CompletableFuture<>();
1822          final CompletableFuture<Integer> g = new CompletableFuture<>();
1823          final CFException ex = new CFException();
1824 <        final SubtractAction r = new SubtractAction();
1825 <
1826 <        (fFirst ? f : g).complete(v1);
1827 <        if (!createIncomplete)
1828 <            (!fFirst ? f : g).completeExceptionally(ex);
1829 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1830 <        if (createIncomplete) {
1831 <            checkIncomplete(h);
1832 <            (!fFirst ? f : g).completeExceptionally(ex);
1833 <        }
1834 <
1835 <        checkCompletedWithWrappedCFException(h, ex);
1836 <        assertEquals(0, r.invocationCount);
1837 <        checkCompletedNormally(fFirst ? f : g, v1);
1838 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1839 <    }}
1840 <
1841 <    /**
1842 <     * thenAcceptBoth result completes exceptionally if action does
1843 <     */
1844 <    public void testThenAcceptBoth_actionFailed() {
1845 <        for (ExecutionMode m : ExecutionMode.values())
1846 <        for (boolean fFirst : new boolean[] { true, false })
1847 <        for (Integer v1 : new Integer[] { 1, null })
1848 <        for (Integer v2 : new Integer[] { 2, null })
1849 <    {
1850 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1851 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1852 <        final FailingBiConsumer r = new FailingBiConsumer();
1429 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1430 <
1431 <        if (fFirst) {
1432 <            f.complete(v1);
1433 <            g.complete(v2);
1434 <        } else {
1435 <            g.complete(v2);
1436 <            f.complete(v1);
1437 <        }
1438 <
1439 <        checkCompletedWithWrappedCFException(h);
1440 <        checkCompletedNormally(f, v1);
1441 <        checkCompletedNormally(g, v2);
1824 >        final SubtractAction r1 = new SubtractAction(m);
1825 >        final SubtractAction r2 = new SubtractAction(m);
1826 >        final SubtractAction r3 = new SubtractAction(m);
1827 >
1828 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1829 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1830 >        final Callable<Boolean> complete1 = failFirst ?
1831 >            () -> fst.completeExceptionally(ex) :
1832 >            () -> fst.complete(v1);
1833 >        final Callable<Boolean> complete2 = failFirst ?
1834 >            () -> snd.complete(v1) :
1835 >            () -> snd.completeExceptionally(ex);
1836 >
1837 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1838 >        assertTrue(complete1.call());
1839 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1840 >        checkIncomplete(h1);
1841 >        checkIncomplete(h2);
1842 >        assertTrue(complete2.call());
1843 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1844 >
1845 >        checkCompletedWithWrappedException(h1, ex);
1846 >        checkCompletedWithWrappedException(h2, ex);
1847 >        checkCompletedWithWrappedException(h3, ex);
1848 >        r1.assertNotInvoked();
1849 >        r2.assertNotInvoked();
1850 >        r3.assertNotInvoked();
1851 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1852 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1853      }}
1854  
1855      /**
1856       * thenAcceptBoth result completes exceptionally if either source cancelled
1857       */
1858 <    public void testThenAcceptBoth_sourceCancelled() {
1858 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1859          for (ExecutionMode m : ExecutionMode.values())
1860          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1450        for (boolean createIncomplete : 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 <        (fFirst ? f : g).complete(v1);
1870 <        if (!createIncomplete)
1871 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1872 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1873 <        if (createIncomplete) {
1874 <            checkIncomplete(h);
1875 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1876 <        }
1877 <
1878 <        checkCompletedWithWrappedCancellationException(h);
1879 <        checkCancelled(!fFirst ? f : g);
1880 <        assertEquals(0, r.invocationCount);
1881 <        checkCompletedNormally(fFirst ? f : g, v1);
1867 >        final SubtractAction r1 = new SubtractAction(m);
1868 >        final SubtractAction r2 = new SubtractAction(m);
1869 >        final SubtractAction r3 = new SubtractAction(m);
1870 >
1871 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1872 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1873 >        final Callable<Boolean> complete1 = failFirst ?
1874 >            () -> fst.cancel(mayInterruptIfRunning) :
1875 >            () -> fst.complete(v1);
1876 >        final Callable<Boolean> complete2 = failFirst ?
1877 >            () -> snd.complete(v1) :
1878 >            () -> snd.cancel(mayInterruptIfRunning);
1879 >
1880 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1881 >        assertTrue(complete1.call());
1882 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1883 >        checkIncomplete(h1);
1884 >        checkIncomplete(h2);
1885 >        assertTrue(complete2.call());
1886 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1887 >
1888 >        checkCompletedWithWrappedCancellationException(h1);
1889 >        checkCompletedWithWrappedCancellationException(h2);
1890 >        checkCompletedWithWrappedCancellationException(h3);
1891 >        r1.assertNotInvoked();
1892 >        r2.assertNotInvoked();
1893 >        r3.assertNotInvoked();
1894 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1895 >        checkCancelled(failFirst ? fst : snd);
1896      }}
1897  
1898      /**
1899 <     * runAfterBoth result completes normally after normal
1475 <     * completion of sources
1899 >     * thenAcceptBoth result completes exceptionally if action does
1900       */
1901 <    public void testRunAfterBoth_normalCompletion1() {
1478 <        for (ExecutionMode m : ExecutionMode.values())
1479 <        for (Integer v1 : new Integer[] { 1, null })
1480 <        for (Integer v2 : new Integer[] { 2, null })
1481 <    {
1482 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1483 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1484 <        final Noop r = new Noop();
1485 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1486 <
1487 <        f.complete(v1);
1488 <        checkIncomplete(h);
1489 <        assertEquals(0, r.invocationCount);
1490 <        g.complete(v2);
1491 <
1492 <        checkCompletedNormally(h, null);
1493 <        assertEquals(1, r.invocationCount);
1494 <        checkCompletedNormally(f, v1);
1495 <        checkCompletedNormally(g, v2);
1496 <    }}
1497 <
1498 <    public void testRunAfterBoth_normalCompletion2() {
1499 <        for (ExecutionMode m : ExecutionMode.values())
1500 <        for (Integer v1 : new Integer[] { 1, null })
1501 <        for (Integer v2 : new Integer[] { 2, null })
1502 <    {
1503 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1504 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1505 <        final Noop r = new Noop();
1506 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1507 <
1508 <        g.complete(v2);
1509 <        checkIncomplete(h);
1510 <        assertEquals(0, r.invocationCount);
1511 <        f.complete(v1);
1512 <
1513 <        checkCompletedNormally(h, null);
1514 <        assertEquals(1, r.invocationCount);
1515 <        checkCompletedNormally(f, v1);
1516 <        checkCompletedNormally(g, v2);
1517 <    }}
1518 <
1519 <    public void testRunAfterBoth_normalCompletion3() {
1901 >    public void testThenAcceptBoth_actionFailed() {
1902          for (ExecutionMode m : ExecutionMode.values())
1903 +        for (boolean fFirst : new boolean[] { true, false })
1904          for (Integer v1 : new Integer[] { 1, null })
1905          for (Integer v2 : new Integer[] { 2, null })
1906      {
1907          final CompletableFuture<Integer> f = new CompletableFuture<>();
1908          final CompletableFuture<Integer> g = new CompletableFuture<>();
1909 <        final Noop r = new Noop();
1910 <
1911 <        g.complete(v2);
1912 <        f.complete(v1);
1913 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1914 <
1915 <        checkCompletedNormally(h, null);
1916 <        assertEquals(1, r.invocationCount);
1909 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1910 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1911 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1912 >
1913 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1914 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1915 >        final Integer w1 =  fFirst ? v1 : v2;
1916 >        final Integer w2 = !fFirst ? v1 : v2;
1917 >
1918 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1919 >        assertTrue(fst.complete(w1));
1920 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1921 >        assertTrue(snd.complete(w2));
1922 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1923 >
1924 >        checkCompletedWithWrappedException(h1, r1.ex);
1925 >        checkCompletedWithWrappedException(h2, r2.ex);
1926 >        checkCompletedWithWrappedException(h3, r3.ex);
1927 >        r1.assertInvoked();
1928 >        r2.assertInvoked();
1929 >        r3.assertInvoked();
1930          checkCompletedNormally(f, v1);
1931          checkCompletedNormally(g, v2);
1932      }}
1933  
1934 <    public void testRunAfterBoth_normalCompletion4() {
1934 >    /**
1935 >     * runAfterBoth result completes normally after normal
1936 >     * completion of sources
1937 >     */
1938 >    public void testRunAfterBoth_normalCompletion() {
1939          for (ExecutionMode m : ExecutionMode.values())
1940 +        for (boolean fFirst : new boolean[] { true, false })
1941          for (Integer v1 : new Integer[] { 1, null })
1942          for (Integer v2 : new Integer[] { 2, null })
1943      {
1944          final CompletableFuture<Integer> f = new CompletableFuture<>();
1945          final CompletableFuture<Integer> g = new CompletableFuture<>();
1946 <        final Noop r = new Noop();
1947 <
1948 <        f.complete(v1);
1949 <        g.complete(v2);
1950 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1951 <
1952 <        checkCompletedNormally(h, null);
1953 <        assertEquals(1, r.invocationCount);
1946 >        final Noop r1 = new Noop(m);
1947 >        final Noop r2 = new Noop(m);
1948 >        final Noop r3 = new Noop(m);
1949 >
1950 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1951 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1952 >        final Integer w1 =  fFirst ? v1 : v2;
1953 >        final Integer w2 = !fFirst ? v1 : v2;
1954 >
1955 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1956 >        assertTrue(fst.complete(w1));
1957 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1958 >        checkIncomplete(h1);
1959 >        checkIncomplete(h2);
1960 >        r1.assertNotInvoked();
1961 >        r2.assertNotInvoked();
1962 >        assertTrue(snd.complete(w2));
1963 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1964 >
1965 >        checkCompletedNormally(h1, null);
1966 >        checkCompletedNormally(h2, null);
1967 >        checkCompletedNormally(h3, null);
1968 >        r1.assertInvoked();
1969 >        r2.assertInvoked();
1970 >        r3.assertInvoked();
1971          checkCompletedNormally(f, v1);
1972          checkCompletedNormally(g, v2);
1973      }}
# Line 1558 | Line 1976 | public class CompletableFutureTest exten
1976       * runAfterBoth result completes exceptionally after exceptional
1977       * completion of either source
1978       */
1979 <    public void testRunAfterBoth_exceptionalCompletion1() {
1562 <        for (ExecutionMode m : ExecutionMode.values())
1563 <        for (Integer v1 : new Integer[] { 1, null })
1564 <    {
1565 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1566 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1567 <        final Noop r = new Noop();
1568 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1569 <        final CFException ex = new CFException();
1570 <
1571 <        f.completeExceptionally(ex);
1572 <        checkIncomplete(h);
1573 <        g.complete(v1);
1574 <
1575 <        checkCompletedWithWrappedCFException(h, ex);
1576 <        checkCompletedWithWrappedCFException(f, ex);
1577 <        assertEquals(0, r.invocationCount);
1578 <        checkCompletedNormally(g, v1);
1579 <    }}
1580 <
1581 <    public void testRunAfterBoth_exceptionalCompletion2() {
1582 <        for (ExecutionMode m : ExecutionMode.values())
1583 <        for (Integer v1 : new Integer[] { 1, null })
1584 <    {
1585 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1586 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1587 <        final Noop r = new Noop();
1588 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1589 <        final CFException ex = new CFException();
1590 <
1591 <        g.completeExceptionally(ex);
1592 <        checkIncomplete(h);
1593 <        f.complete(v1);
1594 <
1595 <        checkCompletedWithWrappedCFException(h, ex);
1596 <        checkCompletedWithWrappedCFException(g, ex);
1597 <        assertEquals(0, r.invocationCount);
1598 <        checkCompletedNormally(f, v1);
1599 <    }}
1600 <
1601 <    public void testRunAfterBoth_exceptionalCompletion3() {
1979 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1980          for (ExecutionMode m : ExecutionMode.values())
1981 +        for (boolean fFirst : new boolean[] { true, false })
1982 +        for (boolean failFirst : new boolean[] { true, false })
1983          for (Integer v1 : new Integer[] { 1, null })
1984      {
1985          final CompletableFuture<Integer> f = new CompletableFuture<>();
1986          final CompletableFuture<Integer> g = new CompletableFuture<>();
1607        final Noop r = new Noop();
1987          final CFException ex = new CFException();
1988 <
1989 <        g.completeExceptionally(ex);
1990 <        f.complete(v1);
1991 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1992 <
1993 <        checkCompletedWithWrappedCFException(h, ex);
1994 <        checkCompletedWithWrappedCFException(g, ex);
1995 <        assertEquals(0, r.invocationCount);
1996 <        checkCompletedNormally(f, v1);
1988 >        final Noop r1 = new Noop(m);
1989 >        final Noop r2 = new Noop(m);
1990 >        final Noop r3 = new Noop(m);
1991 >
1992 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1993 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1994 >        final Callable<Boolean> complete1 = failFirst ?
1995 >            () -> fst.completeExceptionally(ex) :
1996 >            () -> fst.complete(v1);
1997 >        final Callable<Boolean> complete2 = failFirst ?
1998 >            () -> snd.complete(v1) :
1999 >            () -> snd.completeExceptionally(ex);
2000 >
2001 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2002 >        assertTrue(complete1.call());
2003 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2004 >        checkIncomplete(h1);
2005 >        checkIncomplete(h2);
2006 >        assertTrue(complete2.call());
2007 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2008 >
2009 >        checkCompletedWithWrappedException(h1, ex);
2010 >        checkCompletedWithWrappedException(h2, ex);
2011 >        checkCompletedWithWrappedException(h3, ex);
2012 >        r1.assertNotInvoked();
2013 >        r2.assertNotInvoked();
2014 >        r3.assertNotInvoked();
2015 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2016 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2017      }}
2018  
2019 <    public void testRunAfterBoth_exceptionalCompletion4() {
2019 >    /**
2020 >     * runAfterBoth result completes exceptionally if either source cancelled
2021 >     */
2022 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2023          for (ExecutionMode m : ExecutionMode.values())
2024 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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<>();
2031 <        final Noop r = new Noop();
2032 <        final CFException ex = new CFException();
2033 <
2034 <        f.completeExceptionally(ex);
2035 <        g.complete(v1);
2036 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2037 <
2038 <        checkCompletedWithWrappedCFException(h, ex);
2039 <        checkCompletedWithWrappedCFException(f, ex);
2040 <        assertEquals(0, r.invocationCount);
2041 <        checkCompletedNormally(g, v1);
2031 >        final Noop r1 = new Noop(m);
2032 >        final Noop r2 = new Noop(m);
2033 >        final Noop r3 = new Noop(m);
2034 >
2035 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2036 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2037 >        final Callable<Boolean> complete1 = failFirst ?
2038 >            () -> fst.cancel(mayInterruptIfRunning) :
2039 >            () -> fst.complete(v1);
2040 >        final Callable<Boolean> complete2 = failFirst ?
2041 >            () -> snd.complete(v1) :
2042 >            () -> snd.cancel(mayInterruptIfRunning);
2043 >
2044 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2045 >        assertTrue(complete1.call());
2046 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2047 >        checkIncomplete(h1);
2048 >        checkIncomplete(h2);
2049 >        assertTrue(complete2.call());
2050 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2051 >
2052 >        checkCompletedWithWrappedCancellationException(h1);
2053 >        checkCompletedWithWrappedCancellationException(h2);
2054 >        checkCompletedWithWrappedCancellationException(h3);
2055 >        r1.assertNotInvoked();
2056 >        r2.assertNotInvoked();
2057 >        r3.assertNotInvoked();
2058 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2059 >        checkCancelled(failFirst ? fst : snd);
2060      }}
2061  
2062      /**
2063       * runAfterBoth result completes exceptionally if action does
2064       */
2065 <    public void testRunAfterBoth_actionFailed1() {
1643 <        for (ExecutionMode m : ExecutionMode.values())
1644 <        for (Integer v1 : new Integer[] { 1, null })
1645 <        for (Integer v2 : new Integer[] { 2, null })
1646 <    {
1647 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1648 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1649 <        final FailingRunnable r = new FailingRunnable();
1650 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1651 <
1652 <        f.complete(v1);
1653 <        checkIncomplete(h);
1654 <        g.complete(v2);
1655 <
1656 <        checkCompletedWithWrappedCFException(h);
1657 <        checkCompletedNormally(f, v1);
1658 <        checkCompletedNormally(g, v2);
1659 <    }}
1660 <
1661 <    public void testRunAfterBoth_actionFailed2() {
2065 >    public void testRunAfterBoth_actionFailed() {
2066          for (ExecutionMode m : ExecutionMode.values())
2067 +        for (boolean fFirst : new boolean[] { true, false })
2068          for (Integer v1 : new Integer[] { 1, null })
2069          for (Integer v2 : new Integer[] { 2, null })
2070      {
2071          final CompletableFuture<Integer> f = new CompletableFuture<>();
2072          final CompletableFuture<Integer> g = new CompletableFuture<>();
2073 <        final FailingRunnable r = new FailingRunnable();
2074 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2075 <
2076 <        g.complete(v2);
2077 <        checkIncomplete(h);
2078 <        f.complete(v1);
2079 <
2080 <        checkCompletedWithWrappedCFException(h);
2073 >        final FailingRunnable r1 = new FailingRunnable(m);
2074 >        final FailingRunnable r2 = new FailingRunnable(m);
2075 >        final FailingRunnable r3 = new FailingRunnable(m);
2076 >
2077 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2078 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2079 >        final Integer w1 =  fFirst ? v1 : v2;
2080 >        final Integer w2 = !fFirst ? v1 : v2;
2081 >
2082 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2083 >        assertTrue(fst.complete(w1));
2084 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2085 >        assertTrue(snd.complete(w2));
2086 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2087 >
2088 >        checkCompletedWithWrappedException(h1, r1.ex);
2089 >        checkCompletedWithWrappedException(h2, r2.ex);
2090 >        checkCompletedWithWrappedException(h3, r3.ex);
2091 >        r1.assertInvoked();
2092 >        r2.assertInvoked();
2093 >        r3.assertInvoked();
2094          checkCompletedNormally(f, v1);
2095          checkCompletedNormally(g, v2);
2096      }}
2097  
2098      /**
1681     * runAfterBoth result completes exceptionally if either source cancelled
1682     */
1683    public void testRunAfterBoth_sourceCancelled1() {
1684        for (ExecutionMode m : ExecutionMode.values())
1685        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1686        for (Integer v1 : new Integer[] { 1, null })
1687    {
1688        final CompletableFuture<Integer> f = new CompletableFuture<>();
1689        final CompletableFuture<Integer> g = new CompletableFuture<>();
1690        final Noop r = new Noop();
1691        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1692
1693        assertTrue(f.cancel(mayInterruptIfRunning));
1694        checkIncomplete(h);
1695        g.complete(v1);
1696
1697        checkCompletedWithWrappedCancellationException(h);
1698        checkCancelled(f);
1699        assertEquals(0, r.invocationCount);
1700        checkCompletedNormally(g, v1);
1701    }}
1702
1703    public void testRunAfterBoth_sourceCancelled2() {
1704        for (ExecutionMode m : ExecutionMode.values())
1705        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1706        for (Integer v1 : new Integer[] { 1, null })
1707    {
1708        final CompletableFuture<Integer> f = new CompletableFuture<>();
1709        final CompletableFuture<Integer> g = new CompletableFuture<>();
1710        final Noop r = new Noop();
1711        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1712
1713        assertTrue(g.cancel(mayInterruptIfRunning));
1714        checkIncomplete(h);
1715        f.complete(v1);
1716
1717        checkCompletedWithWrappedCancellationException(h);
1718        checkCancelled(g);
1719        assertEquals(0, r.invocationCount);
1720        checkCompletedNormally(f, v1);
1721    }}
1722
1723    public void testRunAfterBoth_sourceCancelled3() {
1724        for (ExecutionMode m : ExecutionMode.values())
1725        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1726        for (Integer v1 : new Integer[] { 1, null })
1727    {
1728        final CompletableFuture<Integer> f = new CompletableFuture<>();
1729        final CompletableFuture<Integer> g = new CompletableFuture<>();
1730        final Noop r = new Noop();
1731
1732        assertTrue(g.cancel(mayInterruptIfRunning));
1733        f.complete(v1);
1734        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1735
1736        checkCompletedWithWrappedCancellationException(h);
1737        checkCancelled(g);
1738        assertEquals(0, r.invocationCount);
1739        checkCompletedNormally(f, v1);
1740    }}
1741
1742    public void testRunAfterBoth_sourceCancelled4() {
1743        for (ExecutionMode m : ExecutionMode.values())
1744        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1745        for (Integer v1 : new Integer[] { 1, null })
1746    {
1747        final CompletableFuture<Integer> f = new CompletableFuture<>();
1748        final CompletableFuture<Integer> g = new CompletableFuture<>();
1749        final Noop r = new Noop();
1750
1751        assertTrue(f.cancel(mayInterruptIfRunning));
1752        g.complete(v1);
1753        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1754
1755        checkCompletedWithWrappedCancellationException(h);
1756        checkCancelled(f);
1757        assertEquals(0, r.invocationCount);
1758        checkCompletedNormally(g, v1);
1759    }}
1760
1761    /**
2099       * applyToEither result completes normally after normal completion
2100       * of either source
2101       */
2102 <    public void testApplyToEither_normalCompletion1() {
2102 >    public void testApplyToEither_normalCompletion() {
2103          for (ExecutionMode m : ExecutionMode.values())
2104          for (Integer v1 : new Integer[] { 1, null })
2105          for (Integer v2 : new Integer[] { 2, null })
2106      {
2107          final CompletableFuture<Integer> f = new CompletableFuture<>();
2108          final CompletableFuture<Integer> g = new CompletableFuture<>();
2109 <        final IncFunction r = new IncFunction();
2110 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2109 >        final IncFunction[] rs = new IncFunction[6];
2110 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2111  
2112 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2113 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2114 +        checkIncomplete(h0);
2115 +        checkIncomplete(h1);
2116 +        rs[0].assertNotInvoked();
2117 +        rs[1].assertNotInvoked();
2118          f.complete(v1);
2119 <        checkCompletedNormally(h, inc(v1));
2120 <        g.complete(v2);
2121 <
2122 <        checkCompletedNormally(f, v1);
2123 <        checkCompletedNormally(g, v2);
2124 <        checkCompletedNormally(h, inc(v1));
1782 <    }}
1783 <
1784 <    public void testApplyToEither_normalCompletion2() {
1785 <        for (ExecutionMode m : ExecutionMode.values())
1786 <        for (Integer v1 : new Integer[] { 1, null })
1787 <        for (Integer v2 : new Integer[] { 2, null })
1788 <    {
1789 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1790 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1791 <        final IncFunction r = new IncFunction();
1792 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1793 <
2119 >        checkCompletedNormally(h0, inc(v1));
2120 >        checkCompletedNormally(h1, inc(v1));
2121 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2122 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2123 >        checkCompletedNormally(h2, inc(v1));
2124 >        checkCompletedNormally(h3, inc(v1));
2125          g.complete(v2);
1795        checkCompletedNormally(h, inc(v2));
1796        f.complete(v1);
2126  
2127 <        checkCompletedNormally(f, v1);
2128 <        checkCompletedNormally(g, v2);
2129 <        checkCompletedNormally(h, inc(v2));
2130 <        }}
2131 <
2132 <    public void testApplyToEither_normalCompletion3() {
2133 <        for (ExecutionMode m : ExecutionMode.values())
2134 <        for (Integer v1 : new Integer[] { 1, null })
2135 <        for (Integer v2 : new Integer[] { 2, null })
1807 <    {
1808 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1809 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1810 <        final IncFunction r = new IncFunction();
1811 <
1812 <        f.complete(v1);
1813 <        g.complete(v2);
1814 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2127 >        // unspecified behavior - both source completions available
2128 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2129 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2130 >        rs[4].assertValue(h4.join());
2131 >        rs[5].assertValue(h5.join());
2132 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2133 >                   Objects.equals(inc(v2), h4.join()));
2134 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2135 >                   Objects.equals(inc(v2), h5.join()));
2136  
2137          checkCompletedNormally(f, v1);
2138          checkCompletedNormally(g, v2);
2139 <
2140 <        // unspecified behavior
2141 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2142 <                   Objects.equals(h.join(), inc(v2)));
2143 <        assertEquals(1, r.invocationCount);
2139 >        checkCompletedNormally(h0, inc(v1));
2140 >        checkCompletedNormally(h1, inc(v1));
2141 >        checkCompletedNormally(h2, inc(v1));
2142 >        checkCompletedNormally(h3, inc(v1));
2143 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2144      }}
2145  
2146      /**
2147       * applyToEither result completes exceptionally after exceptional
2148       * completion of either source
2149       */
2150 <    public void testApplyToEither_exceptionalCompletion1() {
2150 >    public void testApplyToEither_exceptionalCompletion() {
2151          for (ExecutionMode m : ExecutionMode.values())
2152          for (Integer v1 : new Integer[] { 1, null })
2153      {
2154          final CompletableFuture<Integer> f = new CompletableFuture<>();
2155          final CompletableFuture<Integer> g = new CompletableFuture<>();
1835        final IncFunction r = new IncFunction();
1836        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2156          final CFException ex = new CFException();
2157 +        final IncFunction[] rs = new IncFunction[6];
2158 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2159  
2160 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2161 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2162 +        checkIncomplete(h0);
2163 +        checkIncomplete(h1);
2164 +        rs[0].assertNotInvoked();
2165 +        rs[1].assertNotInvoked();
2166          f.completeExceptionally(ex);
2167 <        checkCompletedWithWrappedCFException(h, ex);
2167 >        checkCompletedWithWrappedException(h0, ex);
2168 >        checkCompletedWithWrappedException(h1, ex);
2169 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2170 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2171 >        checkCompletedWithWrappedException(h2, ex);
2172 >        checkCompletedWithWrappedException(h3, ex);
2173          g.complete(v1);
2174  
2175 <        assertEquals(0, r.invocationCount);
2175 >        // unspecified behavior - both source completions available
2176 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2177 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2178 >        try {
2179 >            assertEquals(inc(v1), h4.join());
2180 >            rs[4].assertValue(inc(v1));
2181 >        } catch (CompletionException ok) {
2182 >            checkCompletedWithWrappedException(h4, ex);
2183 >            rs[4].assertNotInvoked();
2184 >        }
2185 >        try {
2186 >            assertEquals(inc(v1), h5.join());
2187 >            rs[5].assertValue(inc(v1));
2188 >        } catch (CompletionException ok) {
2189 >            checkCompletedWithWrappedException(h5, ex);
2190 >            rs[5].assertNotInvoked();
2191 >        }
2192 >
2193 >        checkCompletedExceptionally(f, ex);
2194          checkCompletedNormally(g, v1);
2195 <        checkCompletedWithWrappedCFException(f, ex);
2196 <        checkCompletedWithWrappedCFException(h, ex);
2195 >        checkCompletedWithWrappedException(h0, ex);
2196 >        checkCompletedWithWrappedException(h1, ex);
2197 >        checkCompletedWithWrappedException(h2, ex);
2198 >        checkCompletedWithWrappedException(h3, ex);
2199 >        checkCompletedWithWrappedException(h4, ex);
2200 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2201      }}
2202  
2203      public void testApplyToEither_exceptionalCompletion2() {
2204          for (ExecutionMode m : ExecutionMode.values())
2205 +        for (boolean fFirst : new boolean[] { true, false })
2206          for (Integer v1 : new Integer[] { 1, null })
2207      {
2208          final CompletableFuture<Integer> f = new CompletableFuture<>();
2209          final CompletableFuture<Integer> g = new CompletableFuture<>();
1855        final IncFunction r = new IncFunction();
1856        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1857        final CFException ex = new CFException();
1858
1859        g.completeExceptionally(ex);
1860        checkCompletedWithWrappedCFException(h, ex);
1861        f.complete(v1);
1862
1863        assertEquals(0, r.invocationCount);
1864        checkCompletedNormally(f, v1);
1865        checkCompletedWithWrappedCFException(g, ex);
1866        checkCompletedWithWrappedCFException(h, ex);
1867    }}
1868
1869    public void testApplyToEither_exceptionalCompletion3() {
1870        for (ExecutionMode m : ExecutionMode.values())
1871        for (Integer v1 : new Integer[] { 1, null })
1872    {
1873        final CompletableFuture<Integer> f = new CompletableFuture<>();
1874        final CompletableFuture<Integer> g = new CompletableFuture<>();
1875        final IncFunction r = new IncFunction();
2210          final CFException ex = new CFException();
2211 +        final IncFunction[] rs = new IncFunction[6];
2212 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2213  
2214 <        g.completeExceptionally(ex);
2215 <        f.complete(v1);
2216 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2214 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2215 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2216 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2217 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2218 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2219 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2220  
2221 <        // unspecified behavior
1883 <        Integer v;
2221 >        // unspecified behavior - both source completions available
2222          try {
2223 <            assertEquals(inc(v1), h.join());
2224 <            assertEquals(1, r.invocationCount);
2223 >            assertEquals(inc(v1), h0.join());
2224 >            rs[0].assertValue(inc(v1));
2225          } catch (CompletionException ok) {
2226 <            checkCompletedWithWrappedCFException(h, ex);
2227 <            assertEquals(0, r.invocationCount);
2226 >            checkCompletedWithWrappedException(h0, ex);
2227 >            rs[0].assertNotInvoked();
2228          }
1891
1892        checkCompletedWithWrappedCFException(g, ex);
1893        checkCompletedNormally(f, v1);
1894    }}
1895
1896    public void testApplyToEither_exceptionalCompletion4() {
1897        for (ExecutionMode m : ExecutionMode.values())
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 IncFunction r = new IncFunction();
1903        final CFException ex = new CFException();
1904
1905        f.completeExceptionally(ex);
1906        g.complete(v1);
1907        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1908
1909        // unspecified behavior
1910        Integer v;
2229          try {
2230 <            assertEquals(inc(v1), h.join());
2231 <            assertEquals(1, r.invocationCount);
2230 >            assertEquals(inc(v1), h1.join());
2231 >            rs[1].assertValue(inc(v1));
2232          } catch (CompletionException ok) {
2233 <            checkCompletedWithWrappedCFException(h, ex);
2234 <            assertEquals(0, r.invocationCount);
2233 >            checkCompletedWithWrappedException(h1, ex);
2234 >            rs[1].assertNotInvoked();
2235 >        }
2236 >        try {
2237 >            assertEquals(inc(v1), h2.join());
2238 >            rs[2].assertValue(inc(v1));
2239 >        } catch (CompletionException ok) {
2240 >            checkCompletedWithWrappedException(h2, ex);
2241 >            rs[2].assertNotInvoked();
2242 >        }
2243 >        try {
2244 >            assertEquals(inc(v1), h3.join());
2245 >            rs[3].assertValue(inc(v1));
2246 >        } catch (CompletionException ok) {
2247 >            checkCompletedWithWrappedException(h3, ex);
2248 >            rs[3].assertNotInvoked();
2249          }
2250  
1919        checkCompletedWithWrappedCFException(f, ex);
1920        checkCompletedNormally(g, v1);
1921    }}
1922
1923    /**
1924     * applyToEither result completes exceptionally if action does
1925     */
1926    public void testApplyToEither_actionFailed1() {
1927        for (ExecutionMode m : ExecutionMode.values())
1928        for (Integer v1 : new Integer[] { 1, null })
1929        for (Integer v2 : new Integer[] { 2, null })
1930    {
1931        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932        final CompletableFuture<Integer> g = new CompletableFuture<>();
1933        final FailingFunction r = new FailingFunction();
1934        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1935
1936        f.complete(v1);
1937        checkCompletedWithWrappedCFException(h);
1938        g.complete(v2);
1939        checkCompletedNormally(f, v1);
1940        checkCompletedNormally(g, v2);
1941    }}
1942
1943    public void testApplyToEither_actionFailed2() {
1944        for (ExecutionMode m : ExecutionMode.values())
1945        for (Integer v1 : new Integer[] { 1, null })
1946        for (Integer v2 : new Integer[] { 2, null })
1947    {
1948        final CompletableFuture<Integer> f = new CompletableFuture<>();
1949        final CompletableFuture<Integer> g = new CompletableFuture<>();
1950        final FailingFunction r = new FailingFunction();
1951        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1952
1953        g.complete(v2);
1954        checkCompletedWithWrappedCFException(h);
1955        f.complete(v1);
2251          checkCompletedNormally(f, v1);
2252 <        checkCompletedNormally(g, v2);
2252 >        checkCompletedExceptionally(g, ex);
2253      }}
2254  
2255      /**
2256       * applyToEither result completes exceptionally if either source cancelled
2257       */
2258 <    public void testApplyToEither_sourceCancelled1() {
2258 >    public void testApplyToEither_sourceCancelled() {
2259          for (ExecutionMode m : ExecutionMode.values())
2260          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2261          for (Integer v1 : new Integer[] { 1, null })
2262      {
2263          final CompletableFuture<Integer> f = new CompletableFuture<>();
2264          final CompletableFuture<Integer> g = new CompletableFuture<>();
2265 <        final IncFunction r = new IncFunction();
2266 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2265 >        final IncFunction[] rs = new IncFunction[6];
2266 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2267  
2268 <        assertTrue(f.cancel(mayInterruptIfRunning));
2269 <        checkCompletedWithWrappedCancellationException(h);
2268 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2269 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2270 >        checkIncomplete(h0);
2271 >        checkIncomplete(h1);
2272 >        rs[0].assertNotInvoked();
2273 >        rs[1].assertNotInvoked();
2274 >        f.cancel(mayInterruptIfRunning);
2275 >        checkCompletedWithWrappedCancellationException(h0);
2276 >        checkCompletedWithWrappedCancellationException(h1);
2277 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2278 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2279 >        checkCompletedWithWrappedCancellationException(h2);
2280 >        checkCompletedWithWrappedCancellationException(h3);
2281          g.complete(v1);
2282  
2283 +        // unspecified behavior - both source completions available
2284 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2285 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2286 +        try {
2287 +            assertEquals(inc(v1), h4.join());
2288 +            rs[4].assertValue(inc(v1));
2289 +        } catch (CompletionException ok) {
2290 +            checkCompletedWithWrappedCancellationException(h4);
2291 +            rs[4].assertNotInvoked();
2292 +        }
2293 +        try {
2294 +            assertEquals(inc(v1), h5.join());
2295 +            rs[5].assertValue(inc(v1));
2296 +        } catch (CompletionException ok) {
2297 +            checkCompletedWithWrappedCancellationException(h5);
2298 +            rs[5].assertNotInvoked();
2299 +        }
2300 +
2301          checkCancelled(f);
1978        assertEquals(0, r.invocationCount);
2302          checkCompletedNormally(g, v1);
2303 <        checkCompletedWithWrappedCancellationException(h);
2303 >        checkCompletedWithWrappedCancellationException(h0);
2304 >        checkCompletedWithWrappedCancellationException(h1);
2305 >        checkCompletedWithWrappedCancellationException(h2);
2306 >        checkCompletedWithWrappedCancellationException(h3);
2307 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2308      }}
2309  
2310      public void testApplyToEither_sourceCancelled2() {
2311          for (ExecutionMode m : ExecutionMode.values())
2312          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2313 +        for (boolean fFirst : new boolean[] { true, false })
2314          for (Integer v1 : new Integer[] { 1, null })
2315      {
2316          final CompletableFuture<Integer> f = new CompletableFuture<>();
2317          final CompletableFuture<Integer> g = new CompletableFuture<>();
2318 <        final IncFunction r = new IncFunction();
2319 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1992 <
1993 <        assertTrue(g.cancel(mayInterruptIfRunning));
1994 <        checkCompletedWithWrappedCancellationException(h);
1995 <        f.complete(v1);
1996 <
1997 <        checkCancelled(g);
1998 <        assertEquals(0, r.invocationCount);
1999 <        checkCompletedNormally(f, v1);
2000 <        checkCompletedWithWrappedCancellationException(h);
2001 <    }}
2002 <
2003 <    public void testApplyToEither_sourceCancelled3() {
2004 <        for (ExecutionMode m : ExecutionMode.values())
2005 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2006 <        for (Integer v1 : new Integer[] { 1, null })
2007 <    {
2008 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2009 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2010 <        final IncFunction r = new IncFunction();
2318 >        final IncFunction[] rs = new IncFunction[6];
2319 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2320  
2321 <        assertTrue(g.cancel(mayInterruptIfRunning));
2322 <        f.complete(v1);
2323 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2321 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2322 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2323 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2324 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2325 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2326 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2327  
2328 <        // unspecified behavior
2017 <        Integer v;
2328 >        // unspecified behavior - both source completions available
2329          try {
2330 <            assertEquals(inc(v1), h.join());
2331 <            assertEquals(1, r.invocationCount);
2330 >            assertEquals(inc(v1), h0.join());
2331 >            rs[0].assertValue(inc(v1));
2332          } catch (CompletionException ok) {
2333 <            checkCompletedWithWrappedCancellationException(h);
2334 <            assertEquals(0, r.invocationCount);
2333 >            checkCompletedWithWrappedCancellationException(h0);
2334 >            rs[0].assertNotInvoked();
2335          }
2025
2026        checkCancelled(g);
2027        checkCompletedNormally(f, v1);
2028    }}
2029
2030    public void testApplyToEither_sourceCancelled4() {
2031        for (ExecutionMode m : ExecutionMode.values())
2032        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2033        for (Integer v1 : new Integer[] { 1, null })
2034    {
2035        final CompletableFuture<Integer> f = new CompletableFuture<>();
2036        final CompletableFuture<Integer> g = new CompletableFuture<>();
2037        final IncFunction r = new IncFunction();
2038
2039        assertTrue(f.cancel(mayInterruptIfRunning));
2040        g.complete(v1);
2041        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2042
2043        // unspecified behavior
2044        Integer v;
2336          try {
2337 <            assertEquals(inc(v1), h.join());
2338 <            assertEquals(1, r.invocationCount);
2337 >            assertEquals(inc(v1), h1.join());
2338 >            rs[1].assertValue(inc(v1));
2339          } catch (CompletionException ok) {
2340 <            checkCompletedWithWrappedCancellationException(h);
2341 <            assertEquals(0, r.invocationCount);
2340 >            checkCompletedWithWrappedCancellationException(h1);
2341 >            rs[1].assertNotInvoked();
2342 >        }
2343 >        try {
2344 >            assertEquals(inc(v1), h2.join());
2345 >            rs[2].assertValue(inc(v1));
2346 >        } catch (CompletionException ok) {
2347 >            checkCompletedWithWrappedCancellationException(h2);
2348 >            rs[2].assertNotInvoked();
2349 >        }
2350 >        try {
2351 >            assertEquals(inc(v1), h3.join());
2352 >            rs[3].assertValue(inc(v1));
2353 >        } catch (CompletionException ok) {
2354 >            checkCompletedWithWrappedCancellationException(h3);
2355 >            rs[3].assertNotInvoked();
2356          }
2357  
2358 <        checkCancelled(f);
2359 <        checkCompletedNormally(g, v1);
2358 >        checkCompletedNormally(f, v1);
2359 >        checkCancelled(g);
2360      }}
2361  
2362      /**
2363 <     * acceptEither result completes normally after normal completion
2059 <     * of either source
2363 >     * applyToEither result completes exceptionally if action does
2364       */
2365 <    public void testAcceptEither_normalCompletion1() {
2365 >    public void testApplyToEither_actionFailed() {
2366          for (ExecutionMode m : ExecutionMode.values())
2367          for (Integer v1 : new Integer[] { 1, null })
2368          for (Integer v2 : new Integer[] { 2, null })
2369      {
2370          final CompletableFuture<Integer> f = new CompletableFuture<>();
2371          final CompletableFuture<Integer> g = new CompletableFuture<>();
2372 <        final IncAction r = new IncAction();
2373 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2372 >        final FailingFunction[] rs = new FailingFunction[6];
2373 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2374  
2375 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2376 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2377          f.complete(v1);
2378 <        checkCompletedNormally(h, null);
2379 <        assertEquals(inc(v1), r.value);
2380 <        g.complete(v2);
2381 <
2382 <        checkCompletedNormally(f, v1);
2383 <        checkCompletedNormally(g, v2);
2384 <        checkCompletedNormally(h, null);
2079 <    }}
2080 <
2081 <    public void testAcceptEither_normalCompletion2() {
2082 <        for (ExecutionMode m : ExecutionMode.values())
2083 <        for (Integer v1 : new Integer[] { 1, null })
2084 <        for (Integer v2 : new Integer[] { 2, null })
2085 <    {
2086 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2087 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2088 <        final IncAction r = new IncAction();
2089 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2378 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2379 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2380 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2381 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2382 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2383 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2384 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2385  
2386          g.complete(v2);
2387 <        checkCompletedNormally(h, null);
2388 <        assertEquals(inc(v2), r.value);
2389 <        f.complete(v1);
2387 >
2388 >        // unspecified behavior - both source completions available
2389 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2390 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2391 >
2392 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2393 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2394 >                   Objects.equals(v2, rs[4].value));
2395 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2396 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2397 >                   Objects.equals(v2, rs[5].value));
2398  
2399          checkCompletedNormally(f, v1);
2400          checkCompletedNormally(g, v2);
2098        checkCompletedNormally(h, null);
2401      }}
2402  
2403 <    public void testAcceptEither_normalCompletion3() {
2403 >    /**
2404 >     * acceptEither result completes normally after normal completion
2405 >     * of either source
2406 >     */
2407 >    public void testAcceptEither_normalCompletion() {
2408          for (ExecutionMode m : ExecutionMode.values())
2409          for (Integer v1 : new Integer[] { 1, null })
2410          for (Integer v2 : new Integer[] { 2, null })
2411      {
2412          final CompletableFuture<Integer> f = new CompletableFuture<>();
2413          final CompletableFuture<Integer> g = new CompletableFuture<>();
2414 <        final IncAction r = new IncAction();
2414 >        final NoopConsumer[] rs = new NoopConsumer[6];
2415 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2416  
2417 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2418 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2419 +        checkIncomplete(h0);
2420 +        checkIncomplete(h1);
2421 +        rs[0].assertNotInvoked();
2422 +        rs[1].assertNotInvoked();
2423          f.complete(v1);
2424 +        checkCompletedNormally(h0, null);
2425 +        checkCompletedNormally(h1, null);
2426 +        rs[0].assertValue(v1);
2427 +        rs[1].assertValue(v1);
2428 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2429 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2430 +        checkCompletedNormally(h2, null);
2431 +        checkCompletedNormally(h3, null);
2432 +        rs[2].assertValue(v1);
2433 +        rs[3].assertValue(v1);
2434          g.complete(v2);
2112        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2435  
2436 <        checkCompletedNormally(h, null);
2436 >        // unspecified behavior - both source completions available
2437 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2438 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2439 >        checkCompletedNormally(h4, null);
2440 >        checkCompletedNormally(h5, null);
2441 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2442 >                   Objects.equals(v2, rs[4].value));
2443 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2444 >                   Objects.equals(v2, rs[5].value));
2445 >
2446          checkCompletedNormally(f, v1);
2447          checkCompletedNormally(g, v2);
2448 <
2449 <        // unspecified behavior
2450 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2451 <                   Objects.equals(r.value, inc(v2)));
2448 >        checkCompletedNormally(h0, null);
2449 >        checkCompletedNormally(h1, null);
2450 >        checkCompletedNormally(h2, null);
2451 >        checkCompletedNormally(h3, null);
2452 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2453      }}
2454  
2455      /**
2456       * acceptEither result completes exceptionally after exceptional
2457       * completion of either source
2458       */
2459 <    public void testAcceptEither_exceptionalCompletion1() {
2459 >    public void testAcceptEither_exceptionalCompletion() {
2460          for (ExecutionMode m : ExecutionMode.values())
2461          for (Integer v1 : new Integer[] { 1, null })
2462      {
2463          final CompletableFuture<Integer> f = new CompletableFuture<>();
2464          final CompletableFuture<Integer> g = new CompletableFuture<>();
2133        final IncAction r = new IncAction();
2134        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2465          final CFException ex = new CFException();
2466 +        final NoopConsumer[] rs = new NoopConsumer[6];
2467 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2468  
2469 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2470 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2471 +        checkIncomplete(h0);
2472 +        checkIncomplete(h1);
2473 +        rs[0].assertNotInvoked();
2474 +        rs[1].assertNotInvoked();
2475          f.completeExceptionally(ex);
2476 <        checkCompletedWithWrappedCFException(h, ex);
2476 >        checkCompletedWithWrappedException(h0, ex);
2477 >        checkCompletedWithWrappedException(h1, ex);
2478 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2479 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2480 >        checkCompletedWithWrappedException(h2, ex);
2481 >        checkCompletedWithWrappedException(h3, ex);
2482 >
2483          g.complete(v1);
2484  
2485 <        assertEquals(0, r.invocationCount);
2485 >        // unspecified behavior - both source completions available
2486 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2487 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2488 >        try {
2489 >            assertNull(h4.join());
2490 >            rs[4].assertValue(v1);
2491 >        } catch (CompletionException ok) {
2492 >            checkCompletedWithWrappedException(h4, ex);
2493 >            rs[4].assertNotInvoked();
2494 >        }
2495 >        try {
2496 >            assertNull(h5.join());
2497 >            rs[5].assertValue(v1);
2498 >        } catch (CompletionException ok) {
2499 >            checkCompletedWithWrappedException(h5, ex);
2500 >            rs[5].assertNotInvoked();
2501 >        }
2502 >
2503 >        checkCompletedExceptionally(f, ex);
2504          checkCompletedNormally(g, v1);
2505 <        checkCompletedWithWrappedCFException(f, ex);
2506 <        checkCompletedWithWrappedCFException(h, ex);
2505 >        checkCompletedWithWrappedException(h0, ex);
2506 >        checkCompletedWithWrappedException(h1, ex);
2507 >        checkCompletedWithWrappedException(h2, ex);
2508 >        checkCompletedWithWrappedException(h3, ex);
2509 >        checkCompletedWithWrappedException(h4, ex);
2510 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2511      }}
2512  
2513      public void testAcceptEither_exceptionalCompletion2() {
2514          for (ExecutionMode m : ExecutionMode.values())
2515 +        for (boolean fFirst : new boolean[] { true, false })
2516          for (Integer v1 : new Integer[] { 1, null })
2517      {
2518          final CompletableFuture<Integer> f = new CompletableFuture<>();
2519          final CompletableFuture<Integer> g = new CompletableFuture<>();
2153        final IncAction r = new IncAction();
2154        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2155        final CFException ex = new CFException();
2156
2157        g.completeExceptionally(ex);
2158        checkCompletedWithWrappedCFException(h, ex);
2159        f.complete(v1);
2160
2161        assertEquals(0, r.invocationCount);
2162        checkCompletedNormally(f, v1);
2163        checkCompletedWithWrappedCFException(g, ex);
2164        checkCompletedWithWrappedCFException(h, ex);
2165    }}
2166
2167    public void testAcceptEither_exceptionalCompletion3() {
2168        for (ExecutionMode m : ExecutionMode.values())
2169        for (Integer v1 : new Integer[] { 1, null })
2170    {
2171        final CompletableFuture<Integer> f = new CompletableFuture<>();
2172        final CompletableFuture<Integer> g = new CompletableFuture<>();
2173        final IncAction r = new IncAction();
2520          final CFException ex = new CFException();
2521 +        final NoopConsumer[] rs = new NoopConsumer[6];
2522 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2523  
2524 <        g.completeExceptionally(ex);
2525 <        f.complete(v1);
2526 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2524 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2525 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2526 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2527 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2528 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2529 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2530  
2531 <        // unspecified behavior
2181 <        Integer v;
2531 >        // unspecified behavior - both source completions available
2532          try {
2533 <            assertNull(h.join());
2534 <            assertEquals(1, r.invocationCount);
2185 <            assertEquals(inc(v1), r.value);
2533 >            assertEquals(null, h0.join());
2534 >            rs[0].assertValue(v1);
2535          } catch (CompletionException ok) {
2536 <            checkCompletedWithWrappedCFException(h, ex);
2537 <            assertEquals(0, r.invocationCount);
2536 >            checkCompletedWithWrappedException(h0, ex);
2537 >            rs[0].assertNotInvoked();
2538          }
2190
2191        checkCompletedWithWrappedCFException(g, ex);
2192        checkCompletedNormally(f, v1);
2193    }}
2194
2195    public void testAcceptEither_exceptionalCompletion4() {
2196        for (ExecutionMode m : ExecutionMode.values())
2197        for (Integer v1 : new Integer[] { 1, null })
2198    {
2199        final CompletableFuture<Integer> f = new CompletableFuture<>();
2200        final CompletableFuture<Integer> g = new CompletableFuture<>();
2201        final IncAction r = new IncAction();
2202        final CFException ex = new CFException();
2203
2204        f.completeExceptionally(ex);
2205        g.complete(v1);
2206        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2207
2208        // unspecified behavior
2209        Integer v;
2539          try {
2540 <            assertNull(h.join());
2541 <            assertEquals(1, r.invocationCount);
2213 <            assertEquals(inc(v1), r.value);
2540 >            assertEquals(null, h1.join());
2541 >            rs[1].assertValue(v1);
2542          } catch (CompletionException ok) {
2543 <            checkCompletedWithWrappedCFException(h, ex);
2544 <            assertEquals(0, r.invocationCount);
2543 >            checkCompletedWithWrappedException(h1, ex);
2544 >            rs[1].assertNotInvoked();
2545 >        }
2546 >        try {
2547 >            assertEquals(null, h2.join());
2548 >            rs[2].assertValue(v1);
2549 >        } catch (CompletionException ok) {
2550 >            checkCompletedWithWrappedException(h2, ex);
2551 >            rs[2].assertNotInvoked();
2552 >        }
2553 >        try {
2554 >            assertEquals(null, h3.join());
2555 >            rs[3].assertValue(v1);
2556 >        } catch (CompletionException ok) {
2557 >            checkCompletedWithWrappedException(h3, ex);
2558 >            rs[3].assertNotInvoked();
2559          }
2560  
2219        checkCompletedWithWrappedCFException(f, ex);
2220        checkCompletedNormally(g, v1);
2221    }}
2222
2223    /**
2224     * acceptEither result completes exceptionally if action does
2225     */
2226    public void testAcceptEither_actionFailed1() {
2227        for (ExecutionMode m : ExecutionMode.values())
2228        for (Integer v1 : new Integer[] { 1, null })
2229        for (Integer v2 : new Integer[] { 2, null })
2230    {
2231        final CompletableFuture<Integer> f = new CompletableFuture<>();
2232        final CompletableFuture<Integer> g = new CompletableFuture<>();
2233        final FailingConsumer r = new FailingConsumer();
2234        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2235
2236        f.complete(v1);
2237        checkCompletedWithWrappedCFException(h);
2238        g.complete(v2);
2239        checkCompletedNormally(f, v1);
2240        checkCompletedNormally(g, v2);
2241    }}
2242
2243    public void testAcceptEither_actionFailed2() {
2244        for (ExecutionMode m : ExecutionMode.values())
2245        for (Integer v1 : new Integer[] { 1, null })
2246        for (Integer v2 : new Integer[] { 2, null })
2247    {
2248        final CompletableFuture<Integer> f = new CompletableFuture<>();
2249        final CompletableFuture<Integer> g = new CompletableFuture<>();
2250        final FailingConsumer r = new FailingConsumer();
2251        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2252
2253        g.complete(v2);
2254        checkCompletedWithWrappedCFException(h);
2255        f.complete(v1);
2561          checkCompletedNormally(f, v1);
2562 <        checkCompletedNormally(g, v2);
2562 >        checkCompletedExceptionally(g, ex);
2563      }}
2564  
2565      /**
2566       * acceptEither result completes exceptionally if either source cancelled
2567       */
2568 <    public void testAcceptEither_sourceCancelled1() {
2568 >    public void testAcceptEither_sourceCancelled() {
2569          for (ExecutionMode m : ExecutionMode.values())
2570          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2571          for (Integer v1 : new Integer[] { 1, null })
2572      {
2573          final CompletableFuture<Integer> f = new CompletableFuture<>();
2574          final CompletableFuture<Integer> g = new CompletableFuture<>();
2575 <        final IncAction r = new IncAction();
2576 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2272 <
2273 <        assertTrue(f.cancel(mayInterruptIfRunning));
2274 <        checkCompletedWithWrappedCancellationException(h);
2275 <        g.complete(v1);
2276 <
2277 <        checkCancelled(f);
2278 <        assertEquals(0, r.invocationCount);
2279 <        checkCompletedNormally(g, v1);
2280 <        checkCompletedWithWrappedCancellationException(h);
2281 <    }}
2282 <
2283 <    public void testAcceptEither_sourceCancelled2() {
2284 <        for (ExecutionMode m : ExecutionMode.values())
2285 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2286 <        for (Integer v1 : new Integer[] { 1, null })
2287 <    {
2288 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2289 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2290 <        final IncAction r = new IncAction();
2291 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2292 <
2293 <        assertTrue(g.cancel(mayInterruptIfRunning));
2294 <        checkCompletedWithWrappedCancellationException(h);
2295 <        f.complete(v1);
2296 <
2297 <        checkCancelled(g);
2298 <        assertEquals(0, r.invocationCount);
2299 <        checkCompletedNormally(f, v1);
2300 <        checkCompletedWithWrappedCancellationException(h);
2301 <    }}
2575 >        final NoopConsumer[] rs = new NoopConsumer[6];
2576 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2577  
2578 <    public void testAcceptEither_sourceCancelled3() {
2579 <        for (ExecutionMode m : ExecutionMode.values())
2580 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2581 <        for (Integer v1 : new Integer[] { 1, null })
2582 <    {
2583 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2584 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2585 <        final IncAction r = new IncAction();
2578 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2579 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2580 >        checkIncomplete(h0);
2581 >        checkIncomplete(h1);
2582 >        rs[0].assertNotInvoked();
2583 >        rs[1].assertNotInvoked();
2584 >        f.cancel(mayInterruptIfRunning);
2585 >        checkCompletedWithWrappedCancellationException(h0);
2586 >        checkCompletedWithWrappedCancellationException(h1);
2587 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2588 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2589 >        checkCompletedWithWrappedCancellationException(h2);
2590 >        checkCompletedWithWrappedCancellationException(h3);
2591  
2592 <        assertTrue(g.cancel(mayInterruptIfRunning));
2313 <        f.complete(v1);
2314 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2592 >        g.complete(v1);
2593  
2594 <        // unspecified behavior
2595 <        Integer v;
2594 >        // unspecified behavior - both source completions available
2595 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2596 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2597          try {
2598 <            assertNull(h.join());
2599 <            assertEquals(1, r.invocationCount);
2321 <            assertEquals(inc(v1), r.value);
2598 >            assertNull(h4.join());
2599 >            rs[4].assertValue(v1);
2600          } catch (CompletionException ok) {
2601 <            checkCompletedWithWrappedCancellationException(h);
2602 <            assertEquals(0, r.invocationCount);
2601 >            checkCompletedWithWrappedCancellationException(h4);
2602 >            rs[4].assertNotInvoked();
2603          }
2326
2327        checkCancelled(g);
2328        checkCompletedNormally(f, v1);
2329    }}
2330
2331    public void testAcceptEither_sourceCancelled4() {
2332        for (ExecutionMode m : ExecutionMode.values())
2333        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2334        for (Integer v1 : new Integer[] { 1, null })
2335    {
2336        final CompletableFuture<Integer> f = new CompletableFuture<>();
2337        final CompletableFuture<Integer> g = new CompletableFuture<>();
2338        final IncAction r = new IncAction();
2339
2340        assertTrue(f.cancel(mayInterruptIfRunning));
2341        g.complete(v1);
2342        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343
2344        // unspecified behavior
2345        Integer v;
2604          try {
2605 <            assertNull(h.join());
2606 <            assertEquals(1, r.invocationCount);
2349 <            assertEquals(inc(v1), r.value);
2605 >            assertNull(h5.join());
2606 >            rs[5].assertValue(v1);
2607          } catch (CompletionException ok) {
2608 <            checkCompletedWithWrappedCancellationException(h);
2609 <            assertEquals(0, r.invocationCount);
2608 >            checkCompletedWithWrappedCancellationException(h5);
2609 >            rs[5].assertNotInvoked();
2610          }
2611  
2612          checkCancelled(f);
2613          checkCompletedNormally(g, v1);
2614 +        checkCompletedWithWrappedCancellationException(h0);
2615 +        checkCompletedWithWrappedCancellationException(h1);
2616 +        checkCompletedWithWrappedCancellationException(h2);
2617 +        checkCompletedWithWrappedCancellationException(h3);
2618 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2619      }}
2620  
2621      /**
2622 <     * runAfterEither result completes normally after normal completion
2361 <     * of either source
2622 >     * acceptEither result completes exceptionally if action does
2623       */
2624 <    public void testRunAfterEither_normalCompletion1() {
2624 >    public void testAcceptEither_actionFailed() {
2625          for (ExecutionMode m : ExecutionMode.values())
2626          for (Integer v1 : new Integer[] { 1, null })
2627          for (Integer v2 : new Integer[] { 2, null })
2628      {
2629          final CompletableFuture<Integer> f = new CompletableFuture<>();
2630          final CompletableFuture<Integer> g = new CompletableFuture<>();
2631 <        final Noop r = new Noop();
2632 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2631 >        final FailingConsumer[] rs = new FailingConsumer[6];
2632 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2633  
2634 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2635 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2636          f.complete(v1);
2637 <        checkCompletedNormally(h, null);
2638 <        assertEquals(1, r.invocationCount);
2637 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2638 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2639 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2640 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2641 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2642 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2643 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2644 >
2645          g.complete(v2);
2646  
2647 +        // unspecified behavior - both source completions available
2648 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2649 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2650 +
2651 +        checkCompletedWithWrappedException(h4, rs[4].ex);
2652 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2653 +                   Objects.equals(v2, rs[4].value));
2654 +        checkCompletedWithWrappedException(h5, rs[5].ex);
2655 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2656 +                   Objects.equals(v2, rs[5].value));
2657 +
2658          checkCompletedNormally(f, v1);
2659          checkCompletedNormally(g, v2);
2380        checkCompletedNormally(h, null);
2381        assertEquals(1, r.invocationCount);
2660      }}
2661  
2662 <    public void testRunAfterEither_normalCompletion2() {
2662 >    /**
2663 >     * runAfterEither result completes normally after normal completion
2664 >     * of either source
2665 >     */
2666 >    public void testRunAfterEither_normalCompletion() {
2667          for (ExecutionMode m : ExecutionMode.values())
2668          for (Integer v1 : new Integer[] { 1, null })
2669          for (Integer v2 : new Integer[] { 2, null })
2670      {
2671          final CompletableFuture<Integer> f = new CompletableFuture<>();
2672          final CompletableFuture<Integer> g = new CompletableFuture<>();
2673 <        final Noop r = new Noop();
2674 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2673 >        final Noop[] rs = new Noop[6];
2674 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2675  
2676 <        g.complete(v2);
2677 <        checkCompletedNormally(h, null);
2678 <        assertEquals(1, r.invocationCount);
2676 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2677 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2678 >        checkIncomplete(h0);
2679 >        checkIncomplete(h1);
2680 >        rs[0].assertNotInvoked();
2681 >        rs[1].assertNotInvoked();
2682          f.complete(v1);
2683 +        checkCompletedNormally(h0, null);
2684 +        checkCompletedNormally(h1, null);
2685 +        rs[0].assertInvoked();
2686 +        rs[1].assertInvoked();
2687 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2688 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2689 +        checkCompletedNormally(h2, null);
2690 +        checkCompletedNormally(h3, null);
2691 +        rs[2].assertInvoked();
2692 +        rs[3].assertInvoked();
2693  
2399        checkCompletedNormally(f, v1);
2400        checkCompletedNormally(g, v2);
2401        checkCompletedNormally(h, null);
2402        assertEquals(1, r.invocationCount);
2403        }}
2404
2405    public void testRunAfterEither_normalCompletion3() {
2406        for (ExecutionMode m : ExecutionMode.values())
2407        for (Integer v1 : new Integer[] { 1, null })
2408        for (Integer v2 : new Integer[] { 2, null })
2409    {
2410        final CompletableFuture<Integer> f = new CompletableFuture<>();
2411        final CompletableFuture<Integer> g = new CompletableFuture<>();
2412        final Noop r = new Noop();
2413
2414        f.complete(v1);
2694          g.complete(v2);
2416        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2695  
2696 <        checkCompletedNormally(h, null);
2696 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2697 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2698 >
2699          checkCompletedNormally(f, v1);
2700          checkCompletedNormally(g, v2);
2701 <        assertEquals(1, r.invocationCount);
2701 >        checkCompletedNormally(h0, null);
2702 >        checkCompletedNormally(h1, null);
2703 >        checkCompletedNormally(h2, null);
2704 >        checkCompletedNormally(h3, null);
2705 >        checkCompletedNormally(h4, null);
2706 >        checkCompletedNormally(h5, null);
2707 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2708      }}
2709  
2710      /**
2711       * runAfterEither result completes exceptionally after exceptional
2712       * completion of either source
2713       */
2714 <    public void testRunAfterEither_exceptionalCompletion1() {
2714 >    public void testRunAfterEither_exceptionalCompletion() {
2715          for (ExecutionMode m : ExecutionMode.values())
2716          for (Integer v1 : new Integer[] { 1, null })
2717      {
2718          final CompletableFuture<Integer> f = new CompletableFuture<>();
2719          final CompletableFuture<Integer> g = new CompletableFuture<>();
2434        final Noop r = new Noop();
2435        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2720          final CFException ex = new CFException();
2721 +        final Noop[] rs = new Noop[6];
2722 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2723  
2724 <        f.completeExceptionally(ex);
2725 <        checkCompletedWithWrappedCFException(h, ex);
2726 <        g.complete(v1);
2724 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2725 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2726 >        checkIncomplete(h0);
2727 >        checkIncomplete(h1);
2728 >        rs[0].assertNotInvoked();
2729 >        rs[1].assertNotInvoked();
2730 >        assertTrue(f.completeExceptionally(ex));
2731 >        checkCompletedWithWrappedException(h0, ex);
2732 >        checkCompletedWithWrappedException(h1, ex);
2733 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2734 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2735 >        checkCompletedWithWrappedException(h2, ex);
2736 >        checkCompletedWithWrappedException(h3, ex);
2737 >
2738 >        assertTrue(g.complete(v1));
2739 >
2740 >        // unspecified behavior - both source completions available
2741 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2742 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2743 >        try {
2744 >            assertNull(h4.join());
2745 >            rs[4].assertInvoked();
2746 >        } catch (CompletionException ok) {
2747 >            checkCompletedWithWrappedException(h4, ex);
2748 >            rs[4].assertNotInvoked();
2749 >        }
2750 >        try {
2751 >            assertNull(h5.join());
2752 >            rs[5].assertInvoked();
2753 >        } catch (CompletionException ok) {
2754 >            checkCompletedWithWrappedException(h5, ex);
2755 >            rs[5].assertNotInvoked();
2756 >        }
2757  
2758 <        assertEquals(0, r.invocationCount);
2758 >        checkCompletedExceptionally(f, ex);
2759          checkCompletedNormally(g, v1);
2760 <        checkCompletedWithWrappedCFException(f, ex);
2761 <        checkCompletedWithWrappedCFException(h, ex);
2760 >        checkCompletedWithWrappedException(h0, ex);
2761 >        checkCompletedWithWrappedException(h1, ex);
2762 >        checkCompletedWithWrappedException(h2, ex);
2763 >        checkCompletedWithWrappedException(h3, ex);
2764 >        checkCompletedWithWrappedException(h4, ex);
2765 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2766      }}
2767  
2768      public void testRunAfterEither_exceptionalCompletion2() {
2769          for (ExecutionMode m : ExecutionMode.values())
2770 +        for (boolean fFirst : new boolean[] { true, false })
2771          for (Integer v1 : new Integer[] { 1, null })
2772      {
2773          final CompletableFuture<Integer> f = new CompletableFuture<>();
2774          final CompletableFuture<Integer> g = new CompletableFuture<>();
2454        final Noop r = new Noop();
2455        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456        final CFException ex = new CFException();
2457
2458        g.completeExceptionally(ex);
2459        checkCompletedWithWrappedCFException(h, ex);
2460        f.complete(v1);
2461
2462        assertEquals(0, r.invocationCount);
2463        checkCompletedNormally(f, v1);
2464        checkCompletedWithWrappedCFException(g, ex);
2465        checkCompletedWithWrappedCFException(h, ex);
2466    }}
2467
2468    public void testRunAfterEither_exceptionalCompletion3() {
2469        for (ExecutionMode m : ExecutionMode.values())
2470        for (Integer v1 : new Integer[] { 1, null })
2471    {
2472        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474        final Noop r = new Noop();
2775          final CFException ex = new CFException();
2776 +        final Noop[] rs = new Noop[6];
2777 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2778  
2779 <        g.completeExceptionally(ex);
2780 <        f.complete(v1);
2781 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2779 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2780 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2781 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2782 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2783 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2784 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2785  
2786 <        // unspecified behavior
2482 <        Integer v;
2786 >        // unspecified behavior - both source completions available
2787          try {
2788 <            assertNull(h.join());
2789 <            assertEquals(1, r.invocationCount);
2788 >            assertEquals(null, h0.join());
2789 >            rs[0].assertInvoked();
2790          } catch (CompletionException ok) {
2791 <            checkCompletedWithWrappedCFException(h, ex);
2792 <            assertEquals(0, r.invocationCount);
2791 >            checkCompletedWithWrappedException(h0, ex);
2792 >            rs[0].assertNotInvoked();
2793          }
2490
2491        checkCompletedWithWrappedCFException(g, ex);
2492        checkCompletedNormally(f, v1);
2493    }}
2494
2495    public void testRunAfterEither_exceptionalCompletion4() {
2496        for (ExecutionMode m : ExecutionMode.values())
2497        for (Integer v1 : new Integer[] { 1, null })
2498    {
2499        final CompletableFuture<Integer> f = new CompletableFuture<>();
2500        final CompletableFuture<Integer> g = new CompletableFuture<>();
2501        final Noop r = new Noop();
2502        final CFException ex = new CFException();
2503
2504        f.completeExceptionally(ex);
2505        g.complete(v1);
2506        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2507
2508        // unspecified behavior
2509        Integer v;
2794          try {
2795 <            assertNull(h.join());
2796 <            assertEquals(1, r.invocationCount);
2795 >            assertEquals(null, h1.join());
2796 >            rs[1].assertInvoked();
2797          } catch (CompletionException ok) {
2798 <            checkCompletedWithWrappedCFException(h, ex);
2799 <            assertEquals(0, r.invocationCount);
2798 >            checkCompletedWithWrappedException(h1, ex);
2799 >            rs[1].assertNotInvoked();
2800 >        }
2801 >        try {
2802 >            assertEquals(null, h2.join());
2803 >            rs[2].assertInvoked();
2804 >        } catch (CompletionException ok) {
2805 >            checkCompletedWithWrappedException(h2, ex);
2806 >            rs[2].assertNotInvoked();
2807 >        }
2808 >        try {
2809 >            assertEquals(null, h3.join());
2810 >            rs[3].assertInvoked();
2811 >        } catch (CompletionException ok) {
2812 >            checkCompletedWithWrappedException(h3, ex);
2813 >            rs[3].assertNotInvoked();
2814          }
2815  
2518        checkCompletedWithWrappedCFException(f, ex);
2519        checkCompletedNormally(g, v1);
2520    }}
2521
2522    /**
2523     * runAfterEither result completes exceptionally if action does
2524     */
2525    public void testRunAfterEither_actionFailed1() {
2526        for (ExecutionMode m : ExecutionMode.values())
2527        for (Integer v1 : new Integer[] { 1, null })
2528        for (Integer v2 : new Integer[] { 2, null })
2529    {
2530        final CompletableFuture<Integer> f = new CompletableFuture<>();
2531        final CompletableFuture<Integer> g = new CompletableFuture<>();
2532        final FailingRunnable r = new FailingRunnable();
2533        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2534
2535        f.complete(v1);
2536        checkCompletedWithWrappedCFException(h);
2537        g.complete(v2);
2538        checkCompletedNormally(f, v1);
2539        checkCompletedNormally(g, v2);
2540    }}
2541
2542    public void testRunAfterEither_actionFailed2() {
2543        for (ExecutionMode m : ExecutionMode.values())
2544        for (Integer v1 : new Integer[] { 1, null })
2545        for (Integer v2 : new Integer[] { 2, null })
2546    {
2547        final CompletableFuture<Integer> f = new CompletableFuture<>();
2548        final CompletableFuture<Integer> g = new CompletableFuture<>();
2549        final FailingRunnable r = new FailingRunnable();
2550        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2551
2552        g.complete(v2);
2553        checkCompletedWithWrappedCFException(h);
2554        f.complete(v1);
2816          checkCompletedNormally(f, v1);
2817 <        checkCompletedNormally(g, v2);
2817 >        checkCompletedExceptionally(g, ex);
2818      }}
2819  
2820      /**
2821       * runAfterEither result completes exceptionally if either source cancelled
2822       */
2823 <    public void testRunAfterEither_sourceCancelled1() {
2563 <        for (ExecutionMode m : ExecutionMode.values())
2564 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2565 <        for (Integer v1 : new Integer[] { 1, null })
2566 <    {
2567 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2568 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2569 <        final Noop r = new Noop();
2570 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2571 <
2572 <        assertTrue(f.cancel(mayInterruptIfRunning));
2573 <        checkCompletedWithWrappedCancellationException(h);
2574 <        g.complete(v1);
2575 <
2576 <        checkCancelled(f);
2577 <        assertEquals(0, r.invocationCount);
2578 <        checkCompletedNormally(g, v1);
2579 <        checkCompletedWithWrappedCancellationException(h);
2580 <    }}
2581 <
2582 <    public void testRunAfterEither_sourceCancelled2() {
2583 <        for (ExecutionMode m : ExecutionMode.values())
2584 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2585 <        for (Integer v1 : new Integer[] { 1, null })
2586 <    {
2587 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2588 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2589 <        final Noop r = new Noop();
2590 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2591 <
2592 <        assertTrue(g.cancel(mayInterruptIfRunning));
2593 <        checkCompletedWithWrappedCancellationException(h);
2594 <        f.complete(v1);
2595 <
2596 <        checkCancelled(g);
2597 <        assertEquals(0, r.invocationCount);
2598 <        checkCompletedNormally(f, v1);
2599 <        checkCompletedWithWrappedCancellationException(h);
2600 <    }}
2601 <
2602 <    public void testRunAfterEither_sourceCancelled3() {
2823 >    public void testRunAfterEither_sourceCancelled() {
2824          for (ExecutionMode m : ExecutionMode.values())
2825          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2826          for (Integer v1 : new Integer[] { 1, null })
2827      {
2828          final CompletableFuture<Integer> f = new CompletableFuture<>();
2829          final CompletableFuture<Integer> g = new CompletableFuture<>();
2830 <        final Noop r = new Noop();
2830 >        final Noop[] rs = new Noop[6];
2831 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2832  
2833 <        assertTrue(g.cancel(mayInterruptIfRunning));
2834 <        f.complete(v1);
2835 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2836 <
2837 <        // unspecified behavior
2838 <        Integer v;
2833 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2834 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2835 >        checkIncomplete(h0);
2836 >        checkIncomplete(h1);
2837 >        rs[0].assertNotInvoked();
2838 >        rs[1].assertNotInvoked();
2839 >        f.cancel(mayInterruptIfRunning);
2840 >        checkCompletedWithWrappedCancellationException(h0);
2841 >        checkCompletedWithWrappedCancellationException(h1);
2842 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2843 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2844 >        checkCompletedWithWrappedCancellationException(h2);
2845 >        checkCompletedWithWrappedCancellationException(h3);
2846 >
2847 >        assertTrue(g.complete(v1));
2848 >
2849 >        // unspecified behavior - both source completions available
2850 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2851 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2852 >        try {
2853 >            assertNull(h4.join());
2854 >            rs[4].assertInvoked();
2855 >        } catch (CompletionException ok) {
2856 >            checkCompletedWithWrappedCancellationException(h4);
2857 >            rs[4].assertNotInvoked();
2858 >        }
2859          try {
2860 <            assertNull(h.join());
2861 <            assertEquals(1, r.invocationCount);
2860 >            assertNull(h5.join());
2861 >            rs[5].assertInvoked();
2862          } catch (CompletionException ok) {
2863 <            checkCompletedWithWrappedCancellationException(h);
2864 <            assertEquals(0, r.invocationCount);
2863 >            checkCompletedWithWrappedCancellationException(h5);
2864 >            rs[5].assertNotInvoked();
2865          }
2866  
2867 <        checkCancelled(g);
2868 <        checkCompletedNormally(f, v1);
2867 >        checkCancelled(f);
2868 >        checkCompletedNormally(g, v1);
2869 >        checkCompletedWithWrappedCancellationException(h0);
2870 >        checkCompletedWithWrappedCancellationException(h1);
2871 >        checkCompletedWithWrappedCancellationException(h2);
2872 >        checkCompletedWithWrappedCancellationException(h3);
2873 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2874      }}
2875  
2876 <    public void testRunAfterEither_sourceCancelled4() {
2876 >    /**
2877 >     * runAfterEither result completes exceptionally if action does
2878 >     */
2879 >    public void testRunAfterEither_actionFailed() {
2880          for (ExecutionMode m : ExecutionMode.values())
2631        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2881          for (Integer v1 : new Integer[] { 1, null })
2882 +        for (Integer v2 : new Integer[] { 2, null })
2883      {
2884          final CompletableFuture<Integer> f = new CompletableFuture<>();
2885          final CompletableFuture<Integer> g = new CompletableFuture<>();
2886 <        final Noop r = new Noop();
2886 >        final FailingRunnable[] rs = new FailingRunnable[6];
2887 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2888  
2889 <        assertTrue(f.cancel(mayInterruptIfRunning));
2890 <        g.complete(v1);
2891 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2892 <
2893 <        // unspecified behavior
2894 <        Integer v;
2895 <        try {
2896 <            assertNull(h.join());
2897 <            assertEquals(1, r.invocationCount);
2898 <        } catch (CompletionException ok) {
2899 <            checkCompletedWithWrappedCancellationException(h);
2900 <            assertEquals(0, r.invocationCount);
2901 <        }
2889 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2890 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2891 >        assertTrue(f.complete(v1));
2892 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2893 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2894 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2895 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2896 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2897 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2898 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2899 >        assertTrue(g.complete(v2));
2900 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2901 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2902 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2903 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2904  
2905 <        checkCancelled(f);
2906 <        checkCompletedNormally(g, v1);
2905 >        checkCompletedNormally(f, v1);
2906 >        checkCompletedNormally(g, v2);
2907 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2908      }}
2909  
2910      /**
# Line 2662 | Line 2916 | public class CompletableFutureTest exten
2916          for (Integer v1 : new Integer[] { 1, null })
2917      {
2918          final CompletableFuture<Integer> f = new CompletableFuture<>();
2919 <        final CompletableFutureInc r = new CompletableFutureInc();
2920 <        if (!createIncomplete) f.complete(v1);
2921 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2922 <        if (createIncomplete) f.complete(v1);
2919 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2920 >        if (!createIncomplete) assertTrue(f.complete(v1));
2921 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2922 >        if (createIncomplete) assertTrue(f.complete(v1));
2923  
2924          checkCompletedNormally(g, inc(v1));
2925          checkCompletedNormally(f, v1);
2926 <        assertEquals(1, r.invocationCount);
2926 >        r.assertValue(v1);
2927      }}
2928  
2929      /**
# Line 2681 | Line 2935 | public class CompletableFutureTest exten
2935          for (boolean createIncomplete : new boolean[] { true, false })
2936      {
2937          final CFException ex = new CFException();
2938 <        final CompletableFutureInc r = new CompletableFutureInc();
2938 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2939          final CompletableFuture<Integer> f = new CompletableFuture<>();
2940          if (!createIncomplete) f.completeExceptionally(ex);
2941 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2941 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2942          if (createIncomplete) f.completeExceptionally(ex);
2943  
2944 <        checkCompletedWithWrappedCFException(g, ex);
2945 <        checkCompletedWithWrappedCFException(f, ex);
2946 <        assertEquals(0, r.invocationCount);
2944 >        checkCompletedWithWrappedException(g, ex);
2945 >        checkCompletedExceptionally(f, ex);
2946 >        r.assertNotInvoked();
2947      }}
2948  
2949      /**
# Line 2702 | Line 2956 | public class CompletableFutureTest exten
2956      {
2957          final CompletableFuture<Integer> f = new CompletableFuture<>();
2958          final FailingCompletableFutureFunction r
2959 <            = new FailingCompletableFutureFunction();
2960 <        if (!createIncomplete) f.complete(v1);
2961 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2962 <        if (createIncomplete) f.complete(v1);
2959 >            = new FailingCompletableFutureFunction(m);
2960 >        if (!createIncomplete) assertTrue(f.complete(v1));
2961 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2962 >        if (createIncomplete) assertTrue(f.complete(v1));
2963  
2964 <        checkCompletedWithWrappedCFException(g);
2964 >        checkCompletedWithWrappedException(g, r.ex);
2965          checkCompletedNormally(f, v1);
2966      }}
2967  
# Line 2720 | Line 2974 | public class CompletableFutureTest exten
2974          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2975      {
2976          final CompletableFuture<Integer> f = new CompletableFuture<>();
2977 <        final CompletableFutureInc r = new CompletableFutureInc();
2977 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2978          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2979 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2979 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2980          if (createIncomplete) {
2981              checkIncomplete(g);
2982              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2732 | Line 2986 | public class CompletableFutureTest exten
2986          checkCancelled(f);
2987      }}
2988  
2989 +    /**
2990 +     * thenCompose result completes exceptionally if the result of the action does
2991 +     */
2992 +    public void testThenCompose_actionReturnsFailingFuture() {
2993 +        for (ExecutionMode m : ExecutionMode.values())
2994 +        for (int order = 0; order < 6; order++)
2995 +        for (Integer v1 : new Integer[] { 1, null })
2996 +    {
2997 +        final CFException ex = new CFException();
2998 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2999 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3000 +        final CompletableFuture<Integer> h;
3001 +        // Test all permutations of orders
3002 +        switch (order) {
3003 +        case 0:
3004 +            assertTrue(f.complete(v1));
3005 +            assertTrue(g.completeExceptionally(ex));
3006 +            h = m.thenCompose(f, (x -> g));
3007 +            break;
3008 +        case 1:
3009 +            assertTrue(f.complete(v1));
3010 +            h = m.thenCompose(f, (x -> g));
3011 +            assertTrue(g.completeExceptionally(ex));
3012 +            break;
3013 +        case 2:
3014 +            assertTrue(g.completeExceptionally(ex));
3015 +            assertTrue(f.complete(v1));
3016 +            h = m.thenCompose(f, (x -> g));
3017 +            break;
3018 +        case 3:
3019 +            assertTrue(g.completeExceptionally(ex));
3020 +            h = m.thenCompose(f, (x -> g));
3021 +            assertTrue(f.complete(v1));
3022 +            break;
3023 +        case 4:
3024 +            h = m.thenCompose(f, (x -> g));
3025 +            assertTrue(f.complete(v1));
3026 +            assertTrue(g.completeExceptionally(ex));
3027 +            break;
3028 +        case 5:
3029 +            h = m.thenCompose(f, (x -> g));
3030 +            assertTrue(f.complete(v1));
3031 +            assertTrue(g.completeExceptionally(ex));
3032 +            break;
3033 +        default: throw new AssertionError();
3034 +        }
3035 +
3036 +        checkCompletedExceptionally(g, ex);
3037 +        checkCompletedWithWrappedException(h, ex);
3038 +        checkCompletedNormally(f, v1);
3039 +    }}
3040 +
3041      // other static methods
3042  
3043      /**
# Line 2748 | Line 3054 | public class CompletableFutureTest exten
3054       * when all components complete normally
3055       */
3056      public void testAllOf_normal() throws Exception {
3057 <        for (int k = 1; k < 20; ++k) {
3058 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3059 <            for (int i = 0; i < k; ++i)
3057 >        for (int k = 1; k < 10; k++) {
3058 >            CompletableFuture<Integer>[] fs
3059 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3060 >            for (int i = 0; i < k; i++)
3061 >                fs[i] = new CompletableFuture<>();
3062 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3063 >            for (int i = 0; i < k; i++) {
3064 >                checkIncomplete(f);
3065 >                checkIncomplete(CompletableFuture.allOf(fs));
3066 >                fs[i].complete(one);
3067 >            }
3068 >            checkCompletedNormally(f, null);
3069 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3070 >        }
3071 >    }
3072 >
3073 >    public void testAllOf_normal_backwards() throws Exception {
3074 >        for (int k = 1; k < 10; k++) {
3075 >            CompletableFuture<Integer>[] fs
3076 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3077 >            for (int i = 0; i < k; i++)
3078                  fs[i] = new CompletableFuture<>();
3079              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3080 <            for (int i = 0; i < k; ++i) {
3080 >            for (int i = k - 1; i >= 0; i--) {
3081                  checkIncomplete(f);
3082                  checkIncomplete(CompletableFuture.allOf(fs));
3083                  fs[i].complete(one);
# Line 2763 | Line 3087 | public class CompletableFutureTest exten
3087          }
3088      }
3089  
3090 +    public void testAllOf_exceptional() throws Exception {
3091 +        for (int k = 1; k < 10; k++) {
3092 +            CompletableFuture<Integer>[] fs
3093 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3094 +            CFException ex = new CFException();
3095 +            for (int i = 0; i < k; i++)
3096 +                fs[i] = new CompletableFuture<>();
3097 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3098 +            for (int i = 0; i < k; i++) {
3099 +                checkIncomplete(f);
3100 +                checkIncomplete(CompletableFuture.allOf(fs));
3101 +                if (i != k / 2) {
3102 +                    fs[i].complete(i);
3103 +                    checkCompletedNormally(fs[i], i);
3104 +                } else {
3105 +                    fs[i].completeExceptionally(ex);
3106 +                    checkCompletedExceptionally(fs[i], ex);
3107 +                }
3108 +            }
3109 +            checkCompletedWithWrappedException(f, ex);
3110 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3111 +        }
3112 +    }
3113 +
3114      /**
3115       * anyOf(no component futures) returns an incomplete future
3116       */
3117      public void testAnyOf_empty() throws Exception {
3118 +        for (Integer v1 : new Integer[] { 1, null })
3119 +    {
3120          CompletableFuture<Object> f = CompletableFuture.anyOf();
3121          checkIncomplete(f);
3122 <    }
3122 >
3123 >        f.complete(v1);
3124 >        checkCompletedNormally(f, v1);
3125 >    }}
3126  
3127      /**
3128       * anyOf returns a future completed normally with a value when
3129       * a component future does
3130       */
3131      public void testAnyOf_normal() throws Exception {
3132 <        for (int k = 0; k < 10; ++k) {
3132 >        for (int k = 0; k < 10; k++) {
3133              CompletableFuture[] fs = new CompletableFuture[k];
3134 <            for (int i = 0; i < k; ++i)
3134 >            for (int i = 0; i < k; i++)
3135                  fs[i] = new CompletableFuture<>();
3136              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3137              checkIncomplete(f);
3138 <            for (int i = 0; i < k; ++i) {
3139 <                fs[i].complete(one);
3140 <                checkCompletedNormally(f, one);
3141 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3138 >            for (int i = 0; i < k; i++) {
3139 >                fs[i].complete(i);
3140 >                checkCompletedNormally(f, 0);
3141 >                int x = (int) CompletableFuture.anyOf(fs).join();
3142 >                assertTrue(0 <= x && x <= i);
3143 >            }
3144 >        }
3145 >    }
3146 >    public void testAnyOf_normal_backwards() throws Exception {
3147 >        for (int k = 0; k < 10; k++) {
3148 >            CompletableFuture[] fs = new CompletableFuture[k];
3149 >            for (int i = 0; i < k; i++)
3150 >                fs[i] = new CompletableFuture<>();
3151 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3152 >            checkIncomplete(f);
3153 >            for (int i = k - 1; i >= 0; i--) {
3154 >                fs[i].complete(i);
3155 >                checkCompletedNormally(f, k - 1);
3156 >                int x = (int) CompletableFuture.anyOf(fs).join();
3157 >                assertTrue(i <= x && x <= k - 1);
3158              }
3159          }
3160      }
# Line 2794 | Line 3163 | public class CompletableFutureTest exten
3163       * anyOf result completes exceptionally when any component does.
3164       */
3165      public void testAnyOf_exceptional() throws Exception {
3166 <        for (int k = 0; k < 10; ++k) {
3166 >        for (int k = 0; k < 10; k++) {
3167              CompletableFuture[] fs = new CompletableFuture[k];
3168 <            for (int i = 0; i < k; ++i)
3168 >            CFException[] exs = new CFException[k];
3169 >            for (int i = 0; i < k; i++) {
3170                  fs[i] = new CompletableFuture<>();
3171 +                exs[i] = new CFException();
3172 +            }
3173              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3174              checkIncomplete(f);
3175 <            for (int i = 0; i < k; ++i) {
3176 <                fs[i].completeExceptionally(new CFException());
3177 <                checkCompletedWithWrappedCFException(f);
3175 >            for (int i = 0; i < k; i++) {
3176 >                fs[i].completeExceptionally(exs[i]);
3177 >                checkCompletedWithWrappedException(f, exs[0]);
3178 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3179 >            }
3180 >        }
3181 >    }
3182 >
3183 >    public void testAnyOf_exceptional_backwards() throws Exception {
3184 >        for (int k = 0; k < 10; k++) {
3185 >            CompletableFuture[] fs = new CompletableFuture[k];
3186 >            CFException[] exs = new CFException[k];
3187 >            for (int i = 0; i < k; i++) {
3188 >                fs[i] = new CompletableFuture<>();
3189 >                exs[i] = new CFException();
3190 >            }
3191 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3192 >            checkIncomplete(f);
3193 >            for (int i = k - 1; i >= 0; i--) {
3194 >                fs[i].completeExceptionally(exs[i]);
3195 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3196                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3197              }
3198          }
# Line 2815 | Line 3205 | public class CompletableFutureTest exten
3205          CompletableFuture<Integer> f = new CompletableFuture<>();
3206          CompletableFuture<Integer> g = new CompletableFuture<>();
3207          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2818        CompletableFuture<?> h;
3208          ThreadExecutor exec = new ThreadExecutor();
3209  
3210          Runnable[] throwingActions = {
3211              () -> CompletableFuture.supplyAsync(null),
3212              () -> CompletableFuture.supplyAsync(null, exec),
3213 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3213 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3214  
3215              () -> CompletableFuture.runAsync(null),
3216              () -> CompletableFuture.runAsync(null, exec),
# Line 2894 | Line 3283 | public class CompletableFutureTest exten
3283  
3284              () -> f.thenCompose(null),
3285              () -> f.thenComposeAsync(null),
3286 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3286 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3287              () -> f.thenComposeAsync(null, exec),
3288  
3289              () -> f.exceptionally(null),
# Line 2912 | Line 3301 | public class CompletableFutureTest exten
3301              () -> CompletableFuture.anyOf(null, f),
3302  
3303              () -> f.obtrudeException(null),
3304 +
3305 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3306 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3307 +            () -> CompletableFuture.delayedExecutor(1L, null),
3308 +
3309 +            () -> f.orTimeout(1L, null),
3310 +            () -> f.completeOnTimeout(42, 1L, null),
3311 +
3312 +            () -> CompletableFuture.failedFuture(null),
3313 +            () -> CompletableFuture.failedStage(null),
3314          };
3315  
3316          assertThrows(NullPointerException.class, throwingActions);
# Line 2919 | Line 3318 | public class CompletableFutureTest exten
3318      }
3319  
3320      /**
3321 +     * Test submissions to an executor that rejects all tasks.
3322 +     */
3323 +    public void testRejectingExecutor() {
3324 +        final RejectedExecutionException ex = new RejectedExecutionException();
3325 +        final Executor e = (Runnable r) -> { throw ex; };
3326 +
3327 +        for (Integer v : new Integer[] { 1, null }) {
3328 +
3329 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3330 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3331 +
3332 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3333 +
3334 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3335 +        srcs.add(complete);
3336 +        srcs.add(incomplete);
3337 +
3338 +        for (CompletableFuture<Integer> src : srcs) {
3339 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3340 +            fs.add(src.thenRunAsync(() -> {}, e));
3341 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3342 +            fs.add(src.thenApplyAsync((z) -> z, e));
3343 +
3344 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3345 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3346 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3347 +
3348 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3349 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3350 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3351 +
3352 +            fs.add(src.thenComposeAsync((z) -> null, e));
3353 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3354 +            fs.add(src.handleAsync((z, t) -> null, e));
3355 +
3356 +            for (CompletableFuture<?> future : fs) {
3357 +                if (src.isDone())
3358 +                    checkCompletedWithWrappedException(future, ex);
3359 +                else
3360 +                    checkIncomplete(future);
3361 +            }
3362 +            futures.addAll(fs);
3363 +        }
3364 +
3365 +        {
3366 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3367 +
3368 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3369 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3370 +
3371 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3372 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3373 +
3374 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3375 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3376 +
3377 +            for (CompletableFuture<?> future : fs)
3378 +                checkIncomplete(future);
3379 +            futures.addAll(fs);
3380 +        }
3381 +
3382 +        {
3383 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3384 +
3385 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3386 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3387 +
3388 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3389 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3390 +
3391 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3392 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3393 +
3394 +            for (CompletableFuture<?> future : fs)
3395 +                checkCompletedWithWrappedException(future, ex);
3396 +            futures.addAll(fs);
3397 +        }
3398 +
3399 +        incomplete.complete(v);
3400 +
3401 +        for (CompletableFuture<?> future : futures)
3402 +            checkCompletedWithWrappedException(future, ex);
3403 +        }
3404 +    }
3405 +
3406 +    /**
3407 +     * Test submissions to an executor that rejects all tasks, but
3408 +     * should never be invoked because the dependent future is
3409 +     * explicitly completed.
3410 +     */
3411 +    public void testRejectingExecutorNeverInvoked() {
3412 +        final RejectedExecutionException ex = new RejectedExecutionException();
3413 +        class CountingRejectingExecutor implements Executor {
3414 +            final AtomicInteger count = new AtomicInteger(0);
3415 +            public void execute(Runnable r) {
3416 +                count.getAndIncrement();
3417 +                throw ex;
3418 +            }
3419 +        }
3420 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3421 +
3422 +        for (Integer v : new Integer[] { 1, null }) {
3423 +
3424 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3425 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3426 +
3427 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3428 +
3429 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3430 +        srcs.add(complete);
3431 +        srcs.add(incomplete);
3432 +
3433 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3434 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3435 +        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3436 +        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3437 +
3438 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3439 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3440 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3441 +
3442 +        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3443 +        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3444 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3445 +
3446 +        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3447 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3448 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3449 +
3450 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3451 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3452 +
3453 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3454 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3455 +
3456 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3457 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3458 +
3459 +        for (CompletableFuture<?> future : fs)
3460 +            checkIncomplete(future);
3461 +
3462 +        for (CompletableFuture<?> future : fs)
3463 +            future.complete(null);
3464 +
3465 +        incomplete.complete(v);
3466 +
3467 +        for (CompletableFuture<?> future : fs)
3468 +            checkCompletedNormally(future, null);
3469 +
3470 +        assertEquals(0, e.count.get());
3471 +
3472 +        }
3473 +    }
3474 +
3475 +    /**
3476       * toCompletableFuture returns this CompletableFuture.
3477       */
3478      public void testToCompletableFuture() {
# Line 2926 | Line 3480 | public class CompletableFutureTest exten
3480          assertSame(f, f.toCompletableFuture());
3481      }
3482  
3483 +    // jdk9
3484 +
3485      /**
3486 <     * whenComplete action executes on normal completion, propagating
2931 <     * source result.
3486 >     * newIncompleteFuture returns an incomplete CompletableFuture
3487       */
3488 <    public void testWhenComplete_normalCompletion1() {
2934 <        for (ExecutionMode m : ExecutionMode.values())
2935 <        for (boolean createIncomplete : new boolean[] { true, false })
3488 >    public void testNewIncompleteFuture() {
3489          for (Integer v1 : new Integer[] { 1, null })
3490      {
3491 <        final AtomicInteger a = new AtomicInteger(0);
3492 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3493 <        if (!createIncomplete) f.complete(v1);
3494 <        final CompletableFuture<Integer> g = m.whenComplete
3495 <            (f,
2943 <             (Integer x, Throwable t) -> {
2944 <                threadAssertSame(x, v1);
2945 <                threadAssertNull(t);
2946 <                a.getAndIncrement();
2947 <            });
2948 <        if (createIncomplete) f.complete(v1);
2949 <
2950 <        checkCompletedNormally(g, v1);
3491 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3492 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3493 >        checkIncomplete(f);
3494 >        checkIncomplete(g);
3495 >        f.complete(v1);
3496          checkCompletedNormally(f, v1);
3497 <        assertEquals(1, a.get());
3497 >        checkIncomplete(g);
3498 >        g.complete(v1);
3499 >        checkCompletedNormally(g, v1);
3500 >        assertSame(g.getClass(), CompletableFuture.class);
3501      }}
3502  
3503      /**
3504 <     * whenComplete action executes on exceptional completion, propagating
2957 <     * source result.
3504 >     * completedStage returns a completed CompletionStage
3505       */
3506 <    public void testWhenComplete_exceptionalCompletion() {
3507 <        for (ExecutionMode m : ExecutionMode.values())
3508 <        for (boolean createIncomplete : new boolean[] { true, false })
3506 >    public void testCompletedStage() {
3507 >        AtomicInteger x = new AtomicInteger(0);
3508 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3509 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3510 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3511 >        assertEquals(x.get(), 1);
3512 >        assertNull(r.get());
3513 >    }
3514 >
3515 >    /**
3516 >     * defaultExecutor by default returns the commonPool if
3517 >     * it supports more than one thread.
3518 >     */
3519 >    public void testDefaultExecutor() {
3520 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3521 >        Executor e = f.defaultExecutor();
3522 >        Executor c = ForkJoinPool.commonPool();
3523 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3524 >            assertSame(e, c);
3525 >        else
3526 >            assertNotSame(e, c);
3527 >    }
3528 >
3529 >    /**
3530 >     * failedFuture returns a CompletableFuture completed
3531 >     * exceptionally with the given Exception
3532 >     */
3533 >    public void testFailedFuture() {
3534 >        CFException ex = new CFException();
3535 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3536 >        checkCompletedExceptionally(f, ex);
3537 >    }
3538 >
3539 >    /**
3540 >     * failedFuture(null) throws NPE
3541 >     */
3542 >    public void testFailedFuture_null() {
3543 >        try {
3544 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3545 >            shouldThrow();
3546 >        } catch (NullPointerException success) {}
3547 >    }
3548 >
3549 >    /**
3550 >     * copy returns a CompletableFuture that is completed normally,
3551 >     * with the same value, when source is.
3552 >     */
3553 >    public void testCopy() {
3554 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3555 >        CompletableFuture<Integer> g = f.copy();
3556 >        checkIncomplete(f);
3557 >        checkIncomplete(g);
3558 >        f.complete(1);
3559 >        checkCompletedNormally(f, 1);
3560 >        checkCompletedNormally(g, 1);
3561 >    }
3562 >
3563 >    /**
3564 >     * copy returns a CompletableFuture that is completed exceptionally
3565 >     * when source is.
3566 >     */
3567 >    public void testCopy2() {
3568 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3569 >        CompletableFuture<Integer> g = f.copy();
3570 >        checkIncomplete(f);
3571 >        checkIncomplete(g);
3572 >        CFException ex = new CFException();
3573 >        f.completeExceptionally(ex);
3574 >        checkCompletedExceptionally(f, ex);
3575 >        checkCompletedWithWrappedException(g, ex);
3576 >    }
3577 >
3578 >    /**
3579 >     * minimalCompletionStage returns a CompletableFuture that is
3580 >     * completed normally, with the same value, when source is.
3581 >     */
3582 >    public void testMinimalCompletionStage() {
3583 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3584 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3585 >        AtomicInteger x = new AtomicInteger(0);
3586 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3587 >        checkIncomplete(f);
3588 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3589 >        f.complete(1);
3590 >        checkCompletedNormally(f, 1);
3591 >        assertEquals(x.get(), 1);
3592 >        assertNull(r.get());
3593 >    }
3594 >
3595 >    /**
3596 >     * minimalCompletionStage returns a CompletableFuture that is
3597 >     * completed exceptionally when source is.
3598 >     */
3599 >    public void testMinimalCompletionStage2() {
3600 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3601 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3602 >        AtomicInteger x = new AtomicInteger(0);
3603 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3604 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3605 >        checkIncomplete(f);
3606 >        CFException ex = new CFException();
3607 >        f.completeExceptionally(ex);
3608 >        checkCompletedExceptionally(f, ex);
3609 >        assertEquals(x.get(), 0);
3610 >        assertEquals(r.get().getCause(), ex);
3611 >    }
3612 >
3613 >    /**
3614 >     * failedStage returns a CompletionStage completed
3615 >     * exceptionally with the given Exception
3616 >     */
3617 >    public void testFailedStage() {
3618 >        CFException ex = new CFException();
3619 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3620 >        AtomicInteger x = new AtomicInteger(0);
3621 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3622 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3623 >        assertEquals(x.get(), 0);
3624 >        assertEquals(r.get(), ex);
3625 >    }
3626 >
3627 >    /**
3628 >     * completeAsync completes with value of given supplier
3629 >     */
3630 >    public void testCompleteAsync() {
3631          for (Integer v1 : new Integer[] { 1, null })
3632      {
3633 <        final AtomicInteger a = new AtomicInteger(0);
3634 <        final CFException ex = new CFException();
3635 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3636 <        if (!createIncomplete) f.completeExceptionally(ex);
2968 <        final CompletableFuture<Integer> g = m.whenComplete
2969 <            (f,
2970 <             (Integer x, Throwable t) -> {
2971 <                threadAssertNull(x);
2972 <                threadAssertSame(t, ex);
2973 <                a.getAndIncrement();
2974 <            });
2975 <        if (createIncomplete) f.completeExceptionally(ex);
2976 <        checkCompletedWithWrappedCFException(f, ex);
2977 <        checkCompletedWithWrappedCFException(g, ex);
2978 <        assertEquals(1, a.get());
3633 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3634 >        f.completeAsync(() -> v1);
3635 >        f.join();
3636 >        checkCompletedNormally(f, v1);
3637      }}
3638  
3639      /**
3640 <     * whenComplete action executes on cancelled source, propagating
2983 <     * CancellationException.
3640 >     * completeAsync completes exceptionally if given supplier throws
3641       */
3642 <    public void testWhenComplete_sourceCancelled() {
3643 <        for (ExecutionMode m : ExecutionMode.values())
3644 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3645 <        for (boolean createIncomplete : new boolean[] { true, false })
3642 >    public void testCompleteAsync2() {
3643 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3644 >        CFException ex = new CFException();
3645 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3646 >        try {
3647 >            f.join();
3648 >            shouldThrow();
3649 >        } catch (CompletionException success) {}
3650 >        checkCompletedWithWrappedException(f, ex);
3651 >    }
3652 >
3653 >    /**
3654 >     * completeAsync with given executor completes with value of given supplier
3655 >     */
3656 >    public void testCompleteAsync3() {
3657 >        for (Integer v1 : new Integer[] { 1, null })
3658      {
3659 <        final AtomicInteger a = new AtomicInteger(0);
3660 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3661 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3662 <        final CompletableFuture<Integer> g = m.whenComplete
3663 <            (f,
3664 <             (Integer x, Throwable t) -> {
3665 <                threadAssertNull(x);
2997 <                threadAssertTrue(t instanceof CancellationException);
2998 <                a.getAndIncrement();
2999 <            });
3000 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3659 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3660 >        ThreadExecutor executor = new ThreadExecutor();
3661 >        f.completeAsync(() -> v1, executor);
3662 >        assertSame(v1, f.join());
3663 >        checkCompletedNormally(f, v1);
3664 >        assertEquals(1, executor.count.get());
3665 >    }}
3666  
3667 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3668 <        checkCompletedWithWrappedCancellationException(g);
3669 <        checkCancelled(f);
3670 <        assertEquals(1, a.get());
3667 >    /**
3668 >     * completeAsync with given executor completes exceptionally if
3669 >     * given supplier throws
3670 >     */
3671 >    public void testCompleteAsync4() {
3672 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3673 >        CFException ex = new CFException();
3674 >        ThreadExecutor executor = new ThreadExecutor();
3675 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3676 >        try {
3677 >            f.join();
3678 >            shouldThrow();
3679 >        } catch (CompletionException success) {}
3680 >        checkCompletedWithWrappedException(f, ex);
3681 >        assertEquals(1, executor.count.get());
3682 >    }
3683 >
3684 >    /**
3685 >     * orTimeout completes with TimeoutException if not complete
3686 >     */
3687 >    public void testOrTimeout_timesOut() {
3688 >        long timeoutMillis = timeoutMillis();
3689 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3690 >        long startTime = System.nanoTime();
3691 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3692 >        checkCompletedWithTimeoutException(f);
3693 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3694 >    }
3695 >
3696 >    /**
3697 >     * orTimeout completes normally if completed before timeout
3698 >     */
3699 >    public void testOrTimeout_completed() {
3700 >        for (Integer v1 : new Integer[] { 1, null })
3701 >    {
3702 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3703 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3704 >        long startTime = System.nanoTime();
3705 >        f.complete(v1);
3706 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3707 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3708 >        g.complete(v1);
3709 >        checkCompletedNormally(f, v1);
3710 >        checkCompletedNormally(g, v1);
3711 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3712      }}
3713  
3714      /**
3715 <     * If a whenComplete action throws an exception when triggered by
3010 <     * a normal completion, it completes exceptionally
3715 >     * completeOnTimeout completes with given value if not complete
3716       */
3717 <    public void testWhenComplete_actionFailed() {
3718 <        for (boolean createIncomplete : new boolean[] { true, false })
3719 <        for (ExecutionMode m : ExecutionMode.values())
3717 >    public void testCompleteOnTimeout_timesOut() {
3718 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3719 >                       () -> testCompleteOnTimeout_timesOut(null));
3720 >    }
3721 >
3722 >    /**
3723 >     * completeOnTimeout completes with given value if not complete
3724 >     */
3725 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3726 >        long timeoutMillis = timeoutMillis();
3727 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3728 >        long startTime = System.nanoTime();
3729 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3730 >        assertSame(v, f.join());
3731 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3732 >        f.complete(99);         // should have no effect
3733 >        checkCompletedNormally(f, v);
3734 >    }
3735 >
3736 >    /**
3737 >     * completeOnTimeout has no effect if completed within timeout
3738 >     */
3739 >    public void testCompleteOnTimeout_completed() {
3740          for (Integer v1 : new Integer[] { 1, null })
3741      {
3742 <        final AtomicInteger a = new AtomicInteger(0);
3743 <        final CFException ex = new CFException();
3744 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3745 <        if (!createIncomplete) f.complete(v1);
3746 <        final CompletableFuture<Integer> g = m.whenComplete
3747 <            (f,
3748 <             (Integer x, Throwable t) -> {
3024 <                threadAssertSame(x, v1);
3025 <                threadAssertNull(t);
3026 <                a.getAndIncrement();
3027 <                throw ex;
3028 <            });
3029 <        if (createIncomplete) f.complete(v1);
3742 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3743 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3744 >        long startTime = System.nanoTime();
3745 >        f.complete(v1);
3746 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3747 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3748 >        g.complete(v1);
3749          checkCompletedNormally(f, v1);
3750 <        checkCompletedWithWrappedCFException(g, ex);
3751 <        assertEquals(1, a.get());
3750 >        checkCompletedNormally(g, v1);
3751 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3752      }}
3753  
3754      /**
3755 <     * If a whenComplete action throws an exception when triggered by
3037 <     * a source completion that also throws an exception, the source
3038 <     * exception takes precedence.
3755 >     * delayedExecutor returns an executor that delays submission
3756       */
3757 <    public void testWhenComplete_actionFailedSourceFailed() {
3758 <        for (boolean createIncomplete : new boolean[] { true, false })
3757 >    public void testDelayedExecutor() {
3758 >        testInParallel(() -> testDelayedExecutor(null, null),
3759 >                       () -> testDelayedExecutor(null, 1),
3760 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3761 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3762 >    }
3763 >
3764 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3765 >        long timeoutMillis = timeoutMillis();
3766 >        // Use an "unreasonably long" long timeout to catch lingering threads
3767 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3768 >        final Executor delayer, longDelayer;
3769 >        if (executor == null) {
3770 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3771 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3772 >        } else {
3773 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3774 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3775 >        }
3776 >        long startTime = System.nanoTime();
3777 >        CompletableFuture<Integer> f =
3778 >            CompletableFuture.supplyAsync(() -> v, delayer);
3779 >        CompletableFuture<Integer> g =
3780 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3781 >
3782 >        assertNull(g.getNow(null));
3783 >
3784 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3785 >        long millisElapsed = millisElapsedSince(startTime);
3786 >        assertTrue(millisElapsed >= timeoutMillis);
3787 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3788 >
3789 >        checkCompletedNormally(f, v);
3790 >
3791 >        checkIncomplete(g);
3792 >        assertTrue(g.cancel(true));
3793 >    }
3794 >
3795 >    //--- tests of implementation details; not part of official tck ---
3796 >
3797 >    Object resultOf(CompletableFuture<?> f) {
3798 >        SecurityManager sm = System.getSecurityManager();
3799 >        if (sm != null) {
3800 >            try {
3801 >                System.setSecurityManager(null);
3802 >            } catch (SecurityException giveUp) {
3803 >                return "Reflection not available";
3804 >            }
3805 >        }
3806 >
3807 >        try {
3808 >            java.lang.reflect.Field resultField
3809 >                = CompletableFuture.class.getDeclaredField("result");
3810 >            resultField.setAccessible(true);
3811 >            return resultField.get(f);
3812 >        } catch (Throwable t) {
3813 >            throw new AssertionError(t);
3814 >        } finally {
3815 >            if (sm != null) System.setSecurityManager(sm);
3816 >        }
3817 >    }
3818 >
3819 >    public void testExceptionPropagationReusesResultObject() {
3820 >        if (!testImplementationDetails) return;
3821          for (ExecutionMode m : ExecutionMode.values())
3043        for (Integer v1 : new Integer[] { 1, null })
3822      {
3823 <        final AtomicInteger a = new AtomicInteger(0);
3824 <        final CFException ex1 = new CFException();
3825 <        final CFException ex2 = new CFException();
3048 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3823 >        final CFException ex = new CFException();
3824 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3825 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3826  
3827 <        if (!createIncomplete) f.completeExceptionally(ex1);
3828 <        final CompletableFuture<Integer> g = m.whenComplete
3052 <            (f,
3053 <             (Integer x, Throwable t) -> {
3054 <                threadAssertSame(t, ex1);
3055 <                threadAssertNull(x);
3056 <                a.getAndIncrement();
3057 <                throw ex2;
3058 <            });
3059 <        if (createIncomplete) f.completeExceptionally(ex1);
3827 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3828 >            = new ArrayList<>();
3829  
3830 <        checkCompletedWithWrappedCFException(f, ex1);
3831 <        checkCompletedWithWrappedCFException(g, ex1);
3832 <        assertEquals(1, a.get());
3830 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3831 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3832 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3833 >
3834 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3835 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3836 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3837 >
3838 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3839 >        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3840 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3841 >        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3842 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3843 >        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3844 >
3845 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3846 >
3847 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3848 >
3849 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3850 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3851 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3852 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3853 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3854 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3855 >
3856 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3857 >                 fun : funs) {
3858 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3859 >            f.completeExceptionally(ex);
3860 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3861 >            checkCompletedWithWrappedException(src, ex);
3862 >            CompletableFuture<?> dep = fun.apply(src);
3863 >            checkCompletedWithWrappedException(dep, ex);
3864 >            assertSame(resultOf(src), resultOf(dep));
3865 >        }
3866 >
3867 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3868 >                 fun : funs) {
3869 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3870 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3871 >            CompletableFuture<?> dep = fun.apply(src);
3872 >            f.completeExceptionally(ex);
3873 >            checkCompletedWithWrappedException(src, ex);
3874 >            checkCompletedWithWrappedException(dep, ex);
3875 >            assertSame(resultOf(src), resultOf(dep));
3876 >        }
3877 >
3878 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3879 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3880 >                 fun : funs) {
3881 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3882 >            f.cancel(mayInterruptIfRunning);
3883 >            checkCancelled(f);
3884 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3885 >            checkCompletedWithWrappedCancellationException(src);
3886 >            CompletableFuture<?> dep = fun.apply(src);
3887 >            checkCompletedWithWrappedCancellationException(dep);
3888 >            assertSame(resultOf(src), resultOf(dep));
3889 >        }
3890 >
3891 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3892 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3893 >                 fun : funs) {
3894 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3895 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3896 >            CompletableFuture<?> dep = fun.apply(src);
3897 >            f.cancel(mayInterruptIfRunning);
3898 >            checkCancelled(f);
3899 >            checkCompletedWithWrappedCancellationException(src);
3900 >            checkCompletedWithWrappedCancellationException(dep);
3901 >            assertSame(resultOf(src), resultOf(dep));
3902 >        }
3903      }}
3904  
3905 +    /**
3906 +     * Minimal completion stages throw UOE for all non-CompletionStage methods
3907 +     */
3908 +    public void testMinimalCompletionStage_minimality() {
3909 +        if (!testImplementationDetails) return;
3910 +        Function<Method, String> toSignature =
3911 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3912 +        Predicate<Method> isNotStatic =
3913 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3914 +        List<Method> minimalMethods =
3915 +            Stream.of(Object.class, CompletionStage.class)
3916 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3917 +            .filter(isNotStatic)
3918 +            .collect(Collectors.toList());
3919 +        // Methods from CompletableFuture permitted NOT to throw UOE
3920 +        String[] signatureWhitelist = {
3921 +            "newIncompleteFuture[]",
3922 +            "defaultExecutor[]",
3923 +            "minimalCompletionStage[]",
3924 +            "copy[]",
3925 +        };
3926 +        Set<String> permittedMethodSignatures =
3927 +            Stream.concat(minimalMethods.stream().map(toSignature),
3928 +                          Stream.of(signatureWhitelist))
3929 +            .collect(Collectors.toSet());
3930 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3931 +            .filter(isNotStatic)
3932 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3933 +            .collect(Collectors.toList());
3934 +
3935 +        CompletionStage<Integer> minimalStage =
3936 +            new CompletableFuture<Integer>().minimalCompletionStage();
3937 +
3938 +        List<Method> bugs = new ArrayList<>();
3939 +        for (Method method : allMethods) {
3940 +            Class<?>[] parameterTypes = method.getParameterTypes();
3941 +            Object[] args = new Object[parameterTypes.length];
3942 +            // Manufacture boxed primitives for primitive params
3943 +            for (int i = 0; i < args.length; i++) {
3944 +                Class<?> type = parameterTypes[i];
3945 +                if (parameterTypes[i] == boolean.class)
3946 +                    args[i] = false;
3947 +                else if (parameterTypes[i] == int.class)
3948 +                    args[i] = 0;
3949 +                else if (parameterTypes[i] == long.class)
3950 +                    args[i] = 0L;
3951 +            }
3952 +            try {
3953 +                method.invoke(minimalStage, args);
3954 +                bugs.add(method);
3955 +            }
3956 +            catch (java.lang.reflect.InvocationTargetException expected) {
3957 +                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3958 +                    bugs.add(method);
3959 +                    // expected.getCause().printStackTrace();
3960 +                }
3961 +            }
3962 +            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3963 +        }
3964 +        if (!bugs.isEmpty())
3965 +            throw new Error("Methods did not throw UOE: " + bugs.toString());
3966 +    }
3967 +
3968 +    static class Monad {
3969 +        static class ZeroException extends RuntimeException {
3970 +            public ZeroException() { super("monadic zero"); }
3971 +        }
3972 +        // "return", "unit"
3973 +        static <T> CompletableFuture<T> unit(T value) {
3974 +            return completedFuture(value);
3975 +        }
3976 +        // monadic zero ?
3977 +        static <T> CompletableFuture<T> zero() {
3978 +            return failedFuture(new ZeroException());
3979 +        }
3980 +        // >=>
3981 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
3982 +            (Function<T, CompletableFuture<U>> f,
3983 +             Function<U, CompletableFuture<V>> g) {
3984 +            return (x) -> f.apply(x).thenCompose(g);
3985 +        }
3986 +
3987 +        static void assertZero(CompletableFuture<?> f) {
3988 +            try {
3989 +                f.getNow(null);
3990 +                throw new AssertionFailedError("should throw");
3991 +            } catch (CompletionException success) {
3992 +                assertTrue(success.getCause() instanceof ZeroException);
3993 +            }
3994 +        }
3995 +
3996 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
3997 +                                           CompletableFuture<T> g) {
3998 +            T fval = null, gval = null;
3999 +            Throwable fex = null, gex = null;
4000 +
4001 +            try { fval = f.get(); }
4002 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4003 +            catch (Throwable ex) { fex = ex; }
4004 +
4005 +            try { gval = g.get(); }
4006 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4007 +            catch (Throwable ex) { gex = ex; }
4008 +
4009 +            if (fex != null || gex != null)
4010 +                assertSame(fex.getClass(), gex.getClass());
4011 +            else
4012 +                assertEquals(fval, gval);
4013 +        }
4014 +
4015 +        static class PlusFuture<T> extends CompletableFuture<T> {
4016 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4017 +        }
4018 +
4019 +        /** Implements "monadic plus". */
4020 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4021 +                                             CompletableFuture<? extends T> g) {
4022 +            PlusFuture<T> plus = new PlusFuture<T>();
4023 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4024 +                try {
4025 +                    if (ex == null) {
4026 +                        if (plus.complete(result))
4027 +                            if (plus.firstFailure.get() != null)
4028 +                                plus.firstFailure.set(null);
4029 +                    }
4030 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4031 +                        if (plus.isDone())
4032 +                            plus.firstFailure.set(null);
4033 +                    }
4034 +                    else {
4035 +                        // first failure has precedence
4036 +                        Throwable first = plus.firstFailure.getAndSet(null);
4037 +
4038 +                        // may fail with "Self-suppression not permitted"
4039 +                        try { first.addSuppressed(ex); }
4040 +                        catch (Exception ignored) {}
4041 +
4042 +                        plus.completeExceptionally(first);
4043 +                    }
4044 +                } catch (Throwable unexpected) {
4045 +                    plus.completeExceptionally(unexpected);
4046 +                }
4047 +            };
4048 +            f.whenComplete(action);
4049 +            g.whenComplete(action);
4050 +            return plus;
4051 +        }
4052 +    }
4053 +
4054 +    /**
4055 +     * CompletableFuture is an additive monad - sort of.
4056 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4057 +     */
4058 +    public void testAdditiveMonad() throws Throwable {
4059 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4060 +        CompletableFuture<Long> zero = Monad.zero();
4061 +
4062 +        // Some mutually non-commutative functions
4063 +        Function<Long, CompletableFuture<Long>> triple
4064 +            = (x) -> Monad.unit(3 * x);
4065 +        Function<Long, CompletableFuture<Long>> inc
4066 +            = (x) -> Monad.unit(x + 1);
4067 +
4068 +        // unit is a right identity: m >>= unit === m
4069 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4070 +                                 inc.apply(5L));
4071 +        // unit is a left identity: (unit x) >>= f === f x
4072 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4073 +                                 inc.apply(5L));
4074 +
4075 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4076 +        Monad.assertFutureEquals(
4077 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4078 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4079 +
4080 +        // The case for CompletableFuture as an additive monad is weaker...
4081 +
4082 +        // zero is a monadic zero
4083 +        Monad.assertZero(zero);
4084 +
4085 +        // left zero: zero >>= f === zero
4086 +        Monad.assertZero(zero.thenCompose(inc));
4087 +        // right zero: f >>= (\x -> zero) === zero
4088 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4089 +
4090 +        // f plus zero === f
4091 +        Monad.assertFutureEquals(Monad.unit(5L),
4092 +                                 Monad.plus(Monad.unit(5L), zero));
4093 +        // zero plus f === f
4094 +        Monad.assertFutureEquals(Monad.unit(5L),
4095 +                                 Monad.plus(zero, Monad.unit(5L)));
4096 +        // zero plus zero === zero
4097 +        Monad.assertZero(Monad.plus(zero, zero));
4098 +        {
4099 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4100 +                                                   Monad.unit(8L));
4101 +            // non-determinism
4102 +            assertTrue(f.get() == 5L || f.get() == 8L);
4103 +        }
4104 +
4105 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4106 +        // f plus godot === f (doesn't wait for godot)
4107 +        Monad.assertFutureEquals(Monad.unit(5L),
4108 +                                 Monad.plus(Monad.unit(5L), godot));
4109 +        // godot plus f === f (doesn't wait for godot)
4110 +        Monad.assertFutureEquals(Monad.unit(5L),
4111 +                                 Monad.plus(godot, Monad.unit(5L)));
4112 +    }
4113 +
4114 +    /**
4115 +     * A single CompletableFuture with many dependents.
4116 +     * A demo of scalability - runtime is O(n).
4117 +     */
4118 +    public void testManyDependents() throws Throwable {
4119 +        final int n = 1_000;
4120 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4121 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4122 +        final AtomicInteger count = new AtomicInteger(0);
4123 +        for (int i = 0; i < n; i++) {
4124 +            head.thenRun(() -> count.getAndIncrement());
4125 +            head.thenAccept((x) -> count.getAndIncrement());
4126 +            head.thenApply((x) -> count.getAndIncrement());
4127 +
4128 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4129 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4130 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4131 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4132 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4133 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4134 +
4135 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4136 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4137 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4138 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4139 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4140 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4141 +        }
4142 +        head.complete(null);
4143 +        assertEquals(5 * 3 * n, count.get());
4144 +    }
4145 +
4146 + //     static <U> U join(CompletionStage<U> stage) {
4147 + //         CompletableFuture<U> f = new CompletableFuture<>();
4148 + //         stage.whenComplete((v, ex) -> {
4149 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4150 + //         });
4151 + //         return f.join();
4152 + //     }
4153 +
4154 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4155 + //         CompletableFuture<U> f = new CompletableFuture<>();
4156 + //         stage.whenComplete((v, ex) -> {
4157 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4158 + //         });
4159 + //         return f.isDone();
4160 + //     }
4161 +
4162 + //     static <U> U join2(CompletionStage<U> stage) {
4163 + //         return stage.toCompletableFuture().copy().join();
4164 + //     }
4165 +
4166 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4167 + //         return stage.toCompletableFuture().copy().isDone();
4168 + //     }
4169 +
4170   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines