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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines