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.36 by jsr166, Sun Jun 1 23:12:45 2014 UTC vs.
Revision 1.133 by jsr166, Sun Nov 15 19:39:25 2015 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 > 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.TimeoutException;
34 + import java.util.concurrent.TimeUnit;
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());
265 <        checkCompletedWithWrappedCFException(f);
280 >        for (Integer v1 : new Integer[] { 1, null })
281 >    {
282 >        CFException ex;
283 >        CompletableFuture<Integer> f;
284 >
285          f = new CompletableFuture<>();
286 <        f.obtrudeException(new CFException());
287 <        checkCompletedWithWrappedCFException(f);
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 +        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 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 null values as well
377 <    public static int subtract(Integer x, Integer y) {
378 <        return ((x == null) ? 42 : x.intValue())
376 >    abstract 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 >    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.
400 >    static Integer inc(Integer x) {
401 >        return (x == null) ? null : x + 1;
402 >    }
403 >
404 >    class NoopConsumer extends CheckedIntegerAction
405 >        implements Consumer<Integer>
406 >    {
407 >        NoopConsumer(ExecutionMode m) { super(m); }
408 >        public void accept(Integer x) {
409 >            invoked();
410 >            value = x;
411 >        }
412 >    }
413 >
414 >    class IncFunction extends CheckedIntegerAction
415 >        implements Function<Integer,Integer>
416 >    {
417 >        IncFunction(ExecutionMode m) { super(m); }
418 >        public Integer apply(Integer x) {
419 >            invoked();
420 >            return value = inc(x);
421 >        }
422 >    }
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 final Supplier<Integer> supplyOne =
433 <        () -> Integer.valueOf(1);
434 <    static final Function<Integer, Integer> inc =
435 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
331 <    static final BiFunction<Integer, Integer, Integer> subtract =
332 <        (Integer x, Integer y) -> subtract(x, y);
333 <    static final class IncAction implements Consumer<Integer> {
334 <        int value;
335 <        public void accept(Integer x) { value = x.intValue() + 1; }
336 <    }
337 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
338 <        volatile int invocationCount = 0;
339 <        int value;
340 <        // Check this action was invoked exactly once when result is computed.
341 <        public boolean ran() { return invocationCount == 1; }
432 >    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 <        volatile int invocationCount = 0;
443 <        int value;
444 <        // Check this action was invoked exactly once when result is computed.
445 <        public boolean ran() { return invocationCount == 1; }
441 >
442 >    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++;
448 <            return subtract(x, y);
447 >            invoked();
448 >            return value = subtract(x, y);
449          }
450      }
451 <    static final class Noop implements Runnable {
452 <        boolean ran;
453 <        public void run() { ran = true; }
451 >
452 >    class Noop extends CheckedAction implements Runnable {
453 >        Noop(ExecutionMode m) { super(m); }
454 >        public void run() {
455 >            invoked();
456 >        }
457      }
458  
459 <    static final class FailingSupplier implements Supplier<Integer> {
460 <        boolean ran;
461 <        public Integer get() { ran = true; throw new CFException(); }
459 >    class FailingSupplier extends CheckedAction
460 >        implements Supplier<Integer>
461 >    {
462 >        FailingSupplier(ExecutionMode m) { super(m); }
463 >        public Integer get() {
464 >            invoked();
465 >            throw new CFException();
466 >        }
467      }
468 <    static final class FailingConsumer implements Consumer<Integer> {
469 <        boolean ran;
470 <        public void accept(Integer x) { ran = true; throw new CFException(); }
468 >
469 >    class FailingConsumer extends CheckedIntegerAction
470 >        implements Consumer<Integer>
471 >    {
472 >        FailingConsumer(ExecutionMode m) { super(m); }
473 >        public void accept(Integer x) {
474 >            invoked();
475 >            value = x;
476 >            throw new CFException();
477 >        }
478      }
479 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
480 <        boolean ran;
481 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
479 >
480 >    class FailingBiConsumer extends CheckedIntegerAction
481 >        implements BiConsumer<Integer, Integer>
482 >    {
483 >        FailingBiConsumer(ExecutionMode m) { super(m); }
484 >        public void accept(Integer x, Integer y) {
485 >            invoked();
486 >            value = subtract(x, y);
487 >            throw new CFException();
488 >        }
489      }
490 <    static final class FailingFunction implements Function<Integer, Integer> {
491 <        boolean ran;
492 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
490 >
491 >    class FailingFunction extends CheckedIntegerAction
492 >        implements Function<Integer, Integer>
493 >    {
494 >        FailingFunction(ExecutionMode m) { super(m); }
495 >        public Integer apply(Integer x) {
496 >            invoked();
497 >            value = x;
498 >            throw new CFException();
499 >        }
500      }
501 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
502 <        boolean ran;
503 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
501 >
502 >    class FailingBiFunction extends CheckedIntegerAction
503 >        implements BiFunction<Integer, Integer, Integer>
504 >    {
505 >        FailingBiFunction(ExecutionMode m) { super(m); }
506 >        public Integer apply(Integer x, Integer y) {
507 >            invoked();
508 >            value = subtract(x, y);
509 >            throw new CFException();
510 >        }
511      }
512 <    static final class FailingNoop implements Runnable {
513 <        boolean ran;
514 <        public void run() { ran = true; throw new CFException(); }
512 >
513 >    class FailingRunnable extends CheckedAction implements Runnable {
514 >        FailingRunnable(ExecutionMode m) { super(m); }
515 >        public void run() {
516 >            invoked();
517 >            throw new CFException();
518 >        }
519      }
520  
521 <    static final class CompletableFutureInc
522 <        implements Function<Integer, CompletableFuture<Integer>> {
523 <        boolean ran;
521 >    class CompletableFutureInc extends CheckedIntegerAction
522 >        implements Function<Integer, CompletableFuture<Integer>>
523 >    {
524 >        CompletableFutureInc(ExecutionMode m) { super(m); }
525          public CompletableFuture<Integer> apply(Integer x) {
526 <            ran = true;
526 >            invoked();
527 >            value = x;
528              CompletableFuture<Integer> f = new CompletableFuture<>();
529 <            f.complete(Integer.valueOf(x.intValue() + 1));
529 >            assertTrue(f.complete(inc(x)));
530              return f;
531          }
532      }
533  
534 <    static final class FailingCompletableFutureFunction
535 <        implements Function<Integer, CompletableFuture<Integer>> {
536 <        boolean ran;
534 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
535 >        implements Function<Integer, CompletableFuture<Integer>>
536 >    {
537 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
538          public CompletableFuture<Integer> apply(Integer x) {
539 <            ran = true; throw new CFException();
539 >            invoked();
540 >            value = x;
541 >            throw new CFException();
542          }
543      }
544  
545      // Used for explicit executor tests
546      static final class ThreadExecutor implements Executor {
547 <        AtomicInteger count = new AtomicInteger(0);
547 >        final AtomicInteger count = new AtomicInteger(0);
548 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
549 >        static boolean startedCurrentThread() {
550 >            return Thread.currentThread().getThreadGroup() == tg;
551 >        }
552  
553          public void execute(Runnable r) {
554              count.getAndIncrement();
555 <            new Thread(r).start();
555 >            new Thread(tg, r).start();
556          }
557      }
558  
559 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
560 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
418 <    }
419 <
420 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
421 <        boolean ran;
422 <        public Integer apply(Integer x, Throwable t) {
423 <            ran = true;
424 <            return (t == null) ? two : three;
425 <        }
426 <    }
559 >    static final boolean defaultExecutorIsCommonPool
560 >        = ForkJoinPool.getCommonPoolParallelism() > 1;
561  
562      /**
563       * Permits the testing of parallel code for the 3 different
564 <     * execution modes without repeating all the testing code.
564 >     * execution modes without copy/pasting all the test methods.
565       */
566      enum ExecutionMode {
567 <        DEFAULT {
567 >        SYNC {
568 >            public void checkExecutionMode() {
569 >                assertFalse(ThreadExecutor.startedCurrentThread());
570 >                assertNull(ForkJoinTask.getPool());
571 >            }
572 >            public CompletableFuture<Void> runAsync(Runnable a) {
573 >                throw new UnsupportedOperationException();
574 >            }
575 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
576 >                throw new UnsupportedOperationException();
577 >            }
578 >            public <T> CompletableFuture<Void> thenRun
579 >                (CompletableFuture<T> f, Runnable a) {
580 >                return f.thenRun(a);
581 >            }
582 >            public <T> CompletableFuture<Void> thenAccept
583 >                (CompletableFuture<T> f, Consumer<? super T> a) {
584 >                return f.thenAccept(a);
585 >            }
586 >            public <T,U> CompletableFuture<U> thenApply
587 >                (CompletableFuture<T> f, Function<? super T,U> a) {
588 >                return f.thenApply(a);
589 >            }
590 >            public <T,U> CompletableFuture<U> thenCompose
591 >                (CompletableFuture<T> f,
592 >                 Function<? super T,? extends CompletionStage<U>> a) {
593 >                return f.thenCompose(a);
594 >            }
595 >            public <T,U> CompletableFuture<U> handle
596 >                (CompletableFuture<T> f,
597 >                 BiFunction<? super T,Throwable,? extends U> a) {
598 >                return f.handle(a);
599 >            }
600 >            public <T> CompletableFuture<T> whenComplete
601 >                (CompletableFuture<T> f,
602 >                 BiConsumer<? super T,? super Throwable> a) {
603 >                return f.whenComplete(a);
604 >            }
605              public <T,U> CompletableFuture<Void> runAfterBoth
606                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
607                  return f.runAfterBoth(g, a);
# Line 447 | Line 618 | public class CompletableFutureTest exten
618                   BiFunction<? super T,? super U,? extends V> a) {
619                  return f.thenCombine(g, a);
620              }
621 +            public <T> CompletableFuture<Void> runAfterEither
622 +                (CompletableFuture<T> f,
623 +                 CompletionStage<?> g,
624 +                 java.lang.Runnable a) {
625 +                return f.runAfterEither(g, a);
626 +            }
627 +            public <T> CompletableFuture<Void> acceptEither
628 +                (CompletableFuture<T> f,
629 +                 CompletionStage<? extends T> g,
630 +                 Consumer<? super T> a) {
631 +                return f.acceptEither(g, a);
632 +            }
633 +            public <T,U> CompletableFuture<U> applyToEither
634 +                (CompletableFuture<T> f,
635 +                 CompletionStage<? extends T> g,
636 +                 Function<? super T,U> a) {
637 +                return f.applyToEither(g, a);
638 +            }
639          },
640  
641 < //             /** Experimental way to do more testing */
642 < //         REVERSE_DEFAULT {
643 < //             public <T,U> CompletableFuture<Void> runAfterBoth
644 < //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
645 < //                 return g.runAfterBoth(f, a);
646 < //             }
647 < //             public <T,U> CompletableFuture<Void> thenAcceptBoth
648 < //                 (CompletableFuture<T> f,
649 < //                  CompletionStage<? extends U> g,
650 < //                  BiConsumer<? super T,? super U> a) {
651 < //                 return DEFAULT.thenAcceptBoth(f, g, a);
652 < //             }
653 < //         },
654 <
655 <        DEFAULT_ASYNC {
641 >        ASYNC {
642 >            public void checkExecutionMode() {
643 >                assertEquals(defaultExecutorIsCommonPool,
644 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
645 >            }
646 >            public CompletableFuture<Void> runAsync(Runnable a) {
647 >                return CompletableFuture.runAsync(a);
648 >            }
649 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
650 >                return CompletableFuture.supplyAsync(a);
651 >            }
652 >            public <T> CompletableFuture<Void> thenRun
653 >                (CompletableFuture<T> f, Runnable a) {
654 >                return f.thenRunAsync(a);
655 >            }
656 >            public <T> CompletableFuture<Void> thenAccept
657 >                (CompletableFuture<T> f, Consumer<? super T> a) {
658 >                return f.thenAcceptAsync(a);
659 >            }
660 >            public <T,U> CompletableFuture<U> thenApply
661 >                (CompletableFuture<T> f, Function<? super T,U> a) {
662 >                return f.thenApplyAsync(a);
663 >            }
664 >            public <T,U> CompletableFuture<U> thenCompose
665 >                (CompletableFuture<T> f,
666 >                 Function<? super T,? extends CompletionStage<U>> a) {
667 >                return f.thenComposeAsync(a);
668 >            }
669 >            public <T,U> CompletableFuture<U> handle
670 >                (CompletableFuture<T> f,
671 >                 BiFunction<? super T,Throwable,? extends U> a) {
672 >                return f.handleAsync(a);
673 >            }
674 >            public <T> CompletableFuture<T> whenComplete
675 >                (CompletableFuture<T> f,
676 >                 BiConsumer<? super T,? super Throwable> a) {
677 >                return f.whenCompleteAsync(a);
678 >            }
679              public <T,U> CompletableFuture<Void> runAfterBoth
680                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
681                  return f.runAfterBothAsync(g, a);
# Line 480 | Line 692 | public class CompletableFutureTest exten
692                   BiFunction<? super T,? super U,? extends V> a) {
693                  return f.thenCombineAsync(g, a);
694              }
695 +            public <T> CompletableFuture<Void> runAfterEither
696 +                (CompletableFuture<T> f,
697 +                 CompletionStage<?> g,
698 +                 java.lang.Runnable a) {
699 +                return f.runAfterEitherAsync(g, a);
700 +            }
701 +            public <T> CompletableFuture<Void> acceptEither
702 +                (CompletableFuture<T> f,
703 +                 CompletionStage<? extends T> g,
704 +                 Consumer<? super T> a) {
705 +                return f.acceptEitherAsync(g, a);
706 +            }
707 +            public <T,U> CompletableFuture<U> applyToEither
708 +                (CompletableFuture<T> f,
709 +                 CompletionStage<? extends T> g,
710 +                 Function<? super T,U> a) {
711 +                return f.applyToEitherAsync(g, a);
712 +            }
713          },
714  
485 //         REVERSE_DEFAULT_ASYNC {
486 //             public <T,U> CompletableFuture<Void> runAfterBoth
487 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
488 //                 return f.runAfterBothAsync(g, a);
489 //             }
490 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
491 //                 (CompletableFuture<T> f,
492 //                  CompletionStage<? extends U> g,
493 //                  BiConsumer<? super T,? super U> a) {
494 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
495 //             }
496 //         },
497
715          EXECUTOR {
716 +            public void checkExecutionMode() {
717 +                assertTrue(ThreadExecutor.startedCurrentThread());
718 +            }
719 +            public CompletableFuture<Void> runAsync(Runnable a) {
720 +                return CompletableFuture.runAsync(a, new ThreadExecutor());
721 +            }
722 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
723 +                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
724 +            }
725 +            public <T> CompletableFuture<Void> thenRun
726 +                (CompletableFuture<T> f, Runnable a) {
727 +                return f.thenRunAsync(a, new ThreadExecutor());
728 +            }
729 +            public <T> CompletableFuture<Void> thenAccept
730 +                (CompletableFuture<T> f, Consumer<? super T> a) {
731 +                return f.thenAcceptAsync(a, new ThreadExecutor());
732 +            }
733 +            public <T,U> CompletableFuture<U> thenApply
734 +                (CompletableFuture<T> f, Function<? super T,U> a) {
735 +                return f.thenApplyAsync(a, new ThreadExecutor());
736 +            }
737 +            public <T,U> CompletableFuture<U> thenCompose
738 +                (CompletableFuture<T> f,
739 +                 Function<? super T,? extends CompletionStage<U>> a) {
740 +                return f.thenComposeAsync(a, new ThreadExecutor());
741 +            }
742 +            public <T,U> CompletableFuture<U> handle
743 +                (CompletableFuture<T> f,
744 +                 BiFunction<? super T,Throwable,? extends U> a) {
745 +                return f.handleAsync(a, new ThreadExecutor());
746 +            }
747 +            public <T> CompletableFuture<T> whenComplete
748 +                (CompletableFuture<T> f,
749 +                 BiConsumer<? super T,? super Throwable> a) {
750 +                return f.whenCompleteAsync(a, new ThreadExecutor());
751 +            }
752              public <T,U> CompletableFuture<Void> runAfterBoth
753                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
754                  return f.runAfterBothAsync(g, a, new ThreadExecutor());
# Line 512 | Line 765 | public class CompletableFutureTest exten
765                   BiFunction<? super T,? super U,? extends V> a) {
766                  return f.thenCombineAsync(g, a, new ThreadExecutor());
767              }
768 +            public <T> CompletableFuture<Void> runAfterEither
769 +                (CompletableFuture<T> f,
770 +                 CompletionStage<?> g,
771 +                 java.lang.Runnable a) {
772 +                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
773 +            }
774 +            public <T> CompletableFuture<Void> acceptEither
775 +                (CompletableFuture<T> f,
776 +                 CompletionStage<? extends T> g,
777 +                 Consumer<? super T> a) {
778 +                return f.acceptEitherAsync(g, a, new ThreadExecutor());
779 +            }
780 +            public <T,U> CompletableFuture<U> applyToEither
781 +                (CompletableFuture<T> f,
782 +                 CompletionStage<? extends T> g,
783 +                 Function<? super T,U> a) {
784 +                return f.applyToEitherAsync(g, a, new ThreadExecutor());
785 +            }
786          };
787  
788 +        public abstract void checkExecutionMode();
789 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
790 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
791 +        public abstract <T> CompletableFuture<Void> thenRun
792 +            (CompletableFuture<T> f, Runnable a);
793 +        public abstract <T> CompletableFuture<Void> thenAccept
794 +            (CompletableFuture<T> f, Consumer<? super T> a);
795 +        public abstract <T,U> CompletableFuture<U> thenApply
796 +            (CompletableFuture<T> f, Function<? super T,U> a);
797 +        public abstract <T,U> CompletableFuture<U> thenCompose
798 +            (CompletableFuture<T> f,
799 +             Function<? super T,? extends CompletionStage<U>> a);
800 +        public abstract <T,U> CompletableFuture<U> handle
801 +            (CompletableFuture<T> f,
802 +             BiFunction<? super T,Throwable,? extends U> a);
803 +        public abstract <T> CompletableFuture<T> whenComplete
804 +            (CompletableFuture<T> f,
805 +             BiConsumer<? super T,? super Throwable> a);
806          public abstract <T,U> CompletableFuture<Void> runAfterBoth
807              (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
808          public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
# Line 524 | Line 813 | public class CompletableFutureTest exten
813              (CompletableFuture<T> f,
814               CompletionStage<? extends U> g,
815               BiFunction<? super T,? super U,? extends V> a);
816 +        public abstract <T> CompletableFuture<Void> runAfterEither
817 +            (CompletableFuture<T> f,
818 +             CompletionStage<?> g,
819 +             java.lang.Runnable a);
820 +        public abstract <T> CompletableFuture<Void> acceptEither
821 +            (CompletableFuture<T> f,
822 +             CompletionStage<? extends T> g,
823 +             Consumer<? super T> a);
824 +        public abstract <T,U> CompletableFuture<U> applyToEither
825 +            (CompletableFuture<T> f,
826 +             CompletionStage<? extends T> g,
827 +             Function<? super T,U> a);
828      }
829  
830      /**
831 <     * exceptionally action completes with function value on source
832 <     * exception; otherwise with source value
831 >     * exceptionally action is not invoked when source completes
832 >     * normally, and source result is propagated
833       */
834 <    public void testExceptionally() {
835 <        CompletableFuture<Integer> f = new CompletableFuture<>();
836 <        ExceptionToInteger r = new ExceptionToInteger();
837 <        CompletableFuture<Integer> g = f.exceptionally(r);
838 <        f.completeExceptionally(new CFException());
839 <        checkCompletedNormally(g, three);
834 >    public void testExceptionally_normalCompletion() {
835 >        for (boolean createIncomplete : new boolean[] { true, false })
836 >        for (Integer v1 : new Integer[] { 1, null })
837 >    {
838 >        final AtomicInteger a = new AtomicInteger(0);
839 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
840 >        if (!createIncomplete) assertTrue(f.complete(v1));
841 >        final CompletableFuture<Integer> g = f.exceptionally
842 >            ((Throwable t) -> {
843 >                a.getAndIncrement();
844 >                threadFail("should not be called");
845 >                return null;            // unreached
846 >            });
847 >        if (createIncomplete) assertTrue(f.complete(v1));
848  
849 <        f = new CompletableFuture<>();
850 <        r = new ExceptionToInteger();
851 <        g = f.exceptionally(r);
852 <        f.complete(one);
544 <        checkCompletedNormally(g, one);
545 <    }
849 >        checkCompletedNormally(g, v1);
850 >        checkCompletedNormally(f, v1);
851 >        assertEquals(0, a.get());
852 >    }}
853  
854      /**
855 <     * handle action completes normally with function value on either
856 <     * normal or exceptional completion of source
855 >     * exceptionally action completes with function value on source
856 >     * exception
857       */
858 <    public void testHandle() {
859 <        CompletableFuture<Integer> f, g;
860 <        IntegerHandler r;
861 <
862 <        f = new CompletableFuture<>();
863 <        f.completeExceptionally(new CFException());
864 <        g = f.handle(r = new IntegerHandler());
865 <        assertTrue(r.ran);
866 <        checkCompletedNormally(g, three);
867 <
868 <        f = new CompletableFuture<>();
869 <        g = f.handle(r = new IntegerHandler());
870 <        assertFalse(r.ran);
871 <        f.completeExceptionally(new CFException());
872 <        checkCompletedNormally(g, three);
873 <        assertTrue(r.ran);
858 >    public void testExceptionally_exceptionalCompletion() {
859 >        for (boolean createIncomplete : new boolean[] { true, false })
860 >        for (Integer v1 : new Integer[] { 1, null })
861 >    {
862 >        final AtomicInteger a = new AtomicInteger(0);
863 >        final CFException ex = new CFException();
864 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
865 >        if (!createIncomplete) f.completeExceptionally(ex);
866 >        final CompletableFuture<Integer> g = f.exceptionally
867 >            ((Throwable t) -> {
868 >                ExecutionMode.SYNC.checkExecutionMode();
869 >                threadAssertSame(t, ex);
870 >                a.getAndIncrement();
871 >                return v1;
872 >            });
873 >        if (createIncomplete) f.completeExceptionally(ex);
874  
875 <        f = new CompletableFuture<>();
876 <        f.complete(one);
877 <        g = f.handle(r = new IntegerHandler());
571 <        assertTrue(r.ran);
572 <        checkCompletedNormally(g, two);
875 >        checkCompletedNormally(g, v1);
876 >        assertEquals(1, a.get());
877 >    }}
878  
879 <        f = new CompletableFuture<>();
880 <        g = f.handle(r = new IntegerHandler());
881 <        assertFalse(r.ran);
882 <        f.complete(one);
883 <        assertTrue(r.ran);
884 <        checkCompletedNormally(g, two);
885 <    }
879 >    public void testExceptionally_exceptionalCompletionActionFailed() {
880 >        for (boolean createIncomplete : new boolean[] { true, false })
881 >    {
882 >        final AtomicInteger a = new AtomicInteger(0);
883 >        final CFException ex1 = new CFException();
884 >        final CFException ex2 = new CFException();
885 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
886 >        if (!createIncomplete) f.completeExceptionally(ex1);
887 >        final CompletableFuture<Integer> g = f.exceptionally
888 >            ((Throwable t) -> {
889 >                ExecutionMode.SYNC.checkExecutionMode();
890 >                threadAssertSame(t, ex1);
891 >                a.getAndIncrement();
892 >                throw ex2;
893 >            });
894 >        if (createIncomplete) f.completeExceptionally(ex1);
895 >
896 >        checkCompletedWithWrappedException(g, ex2);
897 >        assertEquals(1, a.get());
898 >    }}
899  
900      /**
901 <     * runAsync completes after running Runnable
901 >     * whenComplete action executes on normal completion, propagating
902 >     * source result.
903       */
904 <    public void testRunAsync() {
905 <        Noop r = new Noop();
906 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
907 <        assertNull(f.join());
908 <        assertTrue(r.ran);
909 <        checkCompletedNormally(f, null);
910 <    }
904 >    public void testWhenComplete_normalCompletion() {
905 >        for (ExecutionMode m : ExecutionMode.values())
906 >        for (boolean createIncomplete : new boolean[] { true, false })
907 >        for (Integer v1 : new Integer[] { 1, null })
908 >    {
909 >        final AtomicInteger a = new AtomicInteger(0);
910 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
911 >        if (!createIncomplete) assertTrue(f.complete(v1));
912 >        final CompletableFuture<Integer> g = m.whenComplete
913 >            (f,
914 >             (Integer x, Throwable t) -> {
915 >                m.checkExecutionMode();
916 >                threadAssertSame(x, v1);
917 >                threadAssertNull(t);
918 >                a.getAndIncrement();
919 >            });
920 >        if (createIncomplete) assertTrue(f.complete(v1));
921  
922 <    /**
923 <     * runAsync with executor completes after running Runnable
924 <     */
925 <    public void testRunAsync2() {
597 <        Noop r = new Noop();
598 <        ThreadExecutor exec = new ThreadExecutor();
599 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
600 <        assertNull(f.join());
601 <        assertTrue(r.ran);
602 <        checkCompletedNormally(f, null);
603 <        assertEquals(1, exec.count.get());
604 <    }
922 >        checkCompletedNormally(g, v1);
923 >        checkCompletedNormally(f, v1);
924 >        assertEquals(1, a.get());
925 >    }}
926  
927      /**
928 <     * failing runAsync completes exceptionally after running Runnable
928 >     * whenComplete action executes on exceptional completion, propagating
929 >     * source result.
930       */
931 <    public void testRunAsync3() {
932 <        FailingNoop r = new FailingNoop();
933 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
934 <        checkCompletedWithWrappedCFException(f);
935 <        assertTrue(r.ran);
936 <    }
931 >    public void testWhenComplete_exceptionalCompletion() {
932 >        for (ExecutionMode m : ExecutionMode.values())
933 >        for (boolean createIncomplete : new boolean[] { true, false })
934 >    {
935 >        final AtomicInteger a = new AtomicInteger(0);
936 >        final CFException ex = new CFException();
937 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
938 >        if (!createIncomplete) f.completeExceptionally(ex);
939 >        final CompletableFuture<Integer> g = m.whenComplete
940 >            (f,
941 >             (Integer x, Throwable t) -> {
942 >                m.checkExecutionMode();
943 >                threadAssertNull(x);
944 >                threadAssertSame(t, ex);
945 >                a.getAndIncrement();
946 >            });
947 >        if (createIncomplete) f.completeExceptionally(ex);
948 >
949 >        checkCompletedWithWrappedException(g, ex);
950 >        checkCompletedExceptionally(f, ex);
951 >        assertEquals(1, a.get());
952 >    }}
953  
954      /**
955 <     * supplyAsync completes with result of supplier
955 >     * whenComplete action executes on cancelled source, propagating
956 >     * CancellationException.
957       */
958 <    public void testSupplyAsync() {
959 <        CompletableFuture<Integer> f;
960 <        f = CompletableFuture.supplyAsync(supplyOne);
961 <        assertEquals(f.join(), one);
962 <        checkCompletedNormally(f, one);
963 <    }
958 >    public void testWhenComplete_sourceCancelled() {
959 >        for (ExecutionMode m : ExecutionMode.values())
960 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
961 >        for (boolean createIncomplete : new boolean[] { true, false })
962 >    {
963 >        final AtomicInteger a = new AtomicInteger(0);
964 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
965 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
966 >        final CompletableFuture<Integer> g = m.whenComplete
967 >            (f,
968 >             (Integer x, Throwable t) -> {
969 >                m.checkExecutionMode();
970 >                threadAssertNull(x);
971 >                threadAssertTrue(t instanceof CancellationException);
972 >                a.getAndIncrement();
973 >            });
974 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
975  
976 <    /**
977 <     * supplyAsync with executor completes with result of supplier
978 <     */
979 <    public void testSupplyAsync2() {
630 <        CompletableFuture<Integer> f;
631 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
632 <        assertEquals(f.join(), one);
633 <        checkCompletedNormally(f, one);
634 <    }
976 >        checkCompletedWithWrappedCancellationException(g);
977 >        checkCancelled(f);
978 >        assertEquals(1, a.get());
979 >    }}
980  
981      /**
982 <     * Failing supplyAsync completes exceptionally
982 >     * If a whenComplete action throws an exception when triggered by
983 >     * a normal completion, it completes exceptionally
984       */
985 <    public void testSupplyAsync3() {
986 <        FailingSupplier r = new FailingSupplier();
987 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
988 <        checkCompletedWithWrappedCFException(f);
989 <        assertTrue(r.ran);
990 <    }
985 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
986 >        for (boolean createIncomplete : new boolean[] { true, false })
987 >        for (ExecutionMode m : ExecutionMode.values())
988 >        for (Integer v1 : new Integer[] { 1, null })
989 >    {
990 >        final AtomicInteger a = new AtomicInteger(0);
991 >        final CFException ex = new CFException();
992 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
993 >        if (!createIncomplete) assertTrue(f.complete(v1));
994 >        final CompletableFuture<Integer> g = m.whenComplete
995 >            (f,
996 >             (Integer x, Throwable t) -> {
997 >                m.checkExecutionMode();
998 >                threadAssertSame(x, v1);
999 >                threadAssertNull(t);
1000 >                a.getAndIncrement();
1001 >                throw ex;
1002 >            });
1003 >        if (createIncomplete) assertTrue(f.complete(v1));
1004  
1005 <    // seq completion methods
1005 >        checkCompletedWithWrappedException(g, ex);
1006 >        checkCompletedNormally(f, v1);
1007 >        assertEquals(1, a.get());
1008 >    }}
1009  
1010      /**
1011 <     * thenRun result completes normally after normal completion of source
1011 >     * If a whenComplete action throws an exception when triggered by
1012 >     * a source completion that also throws an exception, the source
1013 >     * exception takes precedence.
1014       */
1015 <    public void testThenRun() {
1016 <        CompletableFuture<Integer> f;
1017 <        CompletableFuture<Void> g;
1018 <        Noop r;
1019 <
1020 <        f = new CompletableFuture<>();
1021 <        g = f.thenRun(r = new Noop());
1022 <        f.complete(null);
1023 <        checkCompletedNormally(g, null);
1024 <        assertTrue(r.ran);
1025 <
1026 <        f = new CompletableFuture<>();
1027 <        f.complete(null);
1028 <        g = f.thenRun(r = new Noop());
1029 <        checkCompletedNormally(g, null);
1030 <        assertTrue(r.ran);
1031 <    }
1015 >    public void testWhenComplete_actionFailedSourceFailed() {
1016 >        for (boolean createIncomplete : new boolean[] { true, false })
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >    {
1019 >        final AtomicInteger a = new AtomicInteger(0);
1020 >        final CFException ex1 = new CFException();
1021 >        final CFException ex2 = new CFException();
1022 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1023 >
1024 >        if (!createIncomplete) f.completeExceptionally(ex1);
1025 >        final CompletableFuture<Integer> g = m.whenComplete
1026 >            (f,
1027 >             (Integer x, Throwable t) -> {
1028 >                m.checkExecutionMode();
1029 >                threadAssertSame(t, ex1);
1030 >                threadAssertNull(x);
1031 >                a.getAndIncrement();
1032 >                throw ex2;
1033 >            });
1034 >        if (createIncomplete) f.completeExceptionally(ex1);
1035 >
1036 >        checkCompletedWithWrappedException(g, ex1);
1037 >        checkCompletedExceptionally(f, ex1);
1038 >        assertEquals(1, a.get());
1039 >    }}
1040  
1041      /**
1042 <     * thenRun result completes exceptionally after exceptional
1042 >     * handle action completes normally with function value on normal
1043       * completion of source
1044       */
1045 <    public void testThenRun2() {
1046 <        CompletableFuture<Integer> f;
1047 <        CompletableFuture<Void> g;
1048 <        Noop r;
1049 <
1050 <        f = new CompletableFuture<>();
1051 <        g = f.thenRun(r = new Noop());
1052 <        f.completeExceptionally(new CFException());
1053 <        checkCompletedWithWrappedCFException(g);
1054 <        assertFalse(r.ran);
1045 >    public void testHandle_normalCompletion() {
1046 >        for (ExecutionMode m : ExecutionMode.values())
1047 >        for (boolean createIncomplete : new boolean[] { true, false })
1048 >        for (Integer v1 : new Integer[] { 1, null })
1049 >    {
1050 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1051 >        final AtomicInteger a = new AtomicInteger(0);
1052 >        if (!createIncomplete) assertTrue(f.complete(v1));
1053 >        final CompletableFuture<Integer> g = m.handle
1054 >            (f,
1055 >             (Integer x, Throwable t) -> {
1056 >                m.checkExecutionMode();
1057 >                threadAssertSame(x, v1);
1058 >                threadAssertNull(t);
1059 >                a.getAndIncrement();
1060 >                return inc(v1);
1061 >            });
1062 >        if (createIncomplete) assertTrue(f.complete(v1));
1063  
1064 <        f = new CompletableFuture<>();
1065 <        f.completeExceptionally(new CFException());
1066 <        g = f.thenRun(r = new Noop());
1067 <        checkCompletedWithWrappedCFException(g);
688 <        assertFalse(r.ran);
689 <    }
1064 >        checkCompletedNormally(g, inc(v1));
1065 >        checkCompletedNormally(f, v1);
1066 >        assertEquals(1, a.get());
1067 >    }}
1068  
1069      /**
1070 <     * thenRun result completes exceptionally if action does
1070 >     * handle action completes normally with function value on
1071 >     * exceptional completion of source
1072       */
1073 <    public void testThenRun3() {
1074 <        CompletableFuture<Integer> f;
1075 <        CompletableFuture<Void> g;
1076 <        FailingNoop r;
1077 <
1078 <        f = new CompletableFuture<>();
1079 <        g = f.thenRun(r = new FailingNoop());
1080 <        f.complete(null);
1081 <        checkCompletedWithWrappedCFException(g);
1073 >    public void testHandle_exceptionalCompletion() {
1074 >        for (ExecutionMode m : ExecutionMode.values())
1075 >        for (boolean createIncomplete : new boolean[] { true, false })
1076 >        for (Integer v1 : new Integer[] { 1, null })
1077 >    {
1078 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1079 >        final AtomicInteger a = new AtomicInteger(0);
1080 >        final CFException ex = new CFException();
1081 >        if (!createIncomplete) f.completeExceptionally(ex);
1082 >        final CompletableFuture<Integer> g = m.handle
1083 >            (f,
1084 >             (Integer x, Throwable t) -> {
1085 >                m.checkExecutionMode();
1086 >                threadAssertNull(x);
1087 >                threadAssertSame(t, ex);
1088 >                a.getAndIncrement();
1089 >                return v1;
1090 >            });
1091 >        if (createIncomplete) f.completeExceptionally(ex);
1092  
1093 <        f = new CompletableFuture<>();
1094 <        f.complete(null);
1095 <        g = f.thenRun(r = new FailingNoop());
1096 <        checkCompletedWithWrappedCFException(g);
708 <    }
1093 >        checkCompletedNormally(g, v1);
1094 >        checkCompletedExceptionally(f, ex);
1095 >        assertEquals(1, a.get());
1096 >    }}
1097  
1098      /**
1099 <     * thenRun result completes exceptionally if source cancelled
1099 >     * handle action completes normally with function value on
1100 >     * cancelled source
1101       */
1102 <    public void testThenRun4() {
1103 <        CompletableFuture<Integer> f;
1104 <        CompletableFuture<Void> g;
1105 <        Noop r;
1106 <
1107 <        f = new CompletableFuture<>();
1108 <        g = f.thenRun(r = new Noop());
1109 <        assertTrue(f.cancel(true));
1110 <        checkCompletedWithWrappedCancellationException(g);
1102 >    public void testHandle_sourceCancelled() {
1103 >        for (ExecutionMode m : ExecutionMode.values())
1104 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1105 >        for (boolean createIncomplete : new boolean[] { true, false })
1106 >        for (Integer v1 : new Integer[] { 1, null })
1107 >    {
1108 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1109 >        final AtomicInteger a = new AtomicInteger(0);
1110 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1111 >        final CompletableFuture<Integer> g = m.handle
1112 >            (f,
1113 >             (Integer x, Throwable t) -> {
1114 >                m.checkExecutionMode();
1115 >                threadAssertNull(x);
1116 >                threadAssertTrue(t instanceof CancellationException);
1117 >                a.getAndIncrement();
1118 >                return v1;
1119 >            });
1120 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1121  
1122 <        f = new CompletableFuture<>();
1123 <        assertTrue(f.cancel(true));
1124 <        g = f.thenRun(r = new Noop());
1125 <        checkCompletedWithWrappedCancellationException(g);
727 <    }
1122 >        checkCompletedNormally(g, v1);
1123 >        checkCancelled(f);
1124 >        assertEquals(1, a.get());
1125 >    }}
1126  
1127      /**
1128 <     * thenApply result completes normally after normal completion of source
1128 >     * handle result completes exceptionally if action does
1129       */
1130 <    public void testThenApply() {
1131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1132 <        CompletableFuture<Integer> g = f.thenApply(inc);
1133 <        f.complete(one);
1134 <        checkCompletedNormally(g, two);
1135 <    }
1130 >    public void testHandle_sourceFailedActionFailed() {
1131 >        for (ExecutionMode m : ExecutionMode.values())
1132 >        for (boolean createIncomplete : new boolean[] { true, false })
1133 >    {
1134 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1135 >        final AtomicInteger a = new AtomicInteger(0);
1136 >        final CFException ex1 = new CFException();
1137 >        final CFException ex2 = new CFException();
1138 >        if (!createIncomplete) f.completeExceptionally(ex1);
1139 >        final CompletableFuture<Integer> g = m.handle
1140 >            (f,
1141 >             (Integer x, Throwable t) -> {
1142 >                m.checkExecutionMode();
1143 >                threadAssertNull(x);
1144 >                threadAssertSame(ex1, t);
1145 >                a.getAndIncrement();
1146 >                throw ex2;
1147 >            });
1148 >        if (createIncomplete) f.completeExceptionally(ex1);
1149 >
1150 >        checkCompletedWithWrappedException(g, ex2);
1151 >        checkCompletedExceptionally(f, ex1);
1152 >        assertEquals(1, a.get());
1153 >    }}
1154  
1155      /**
1156 <     * thenApply result completes exceptionally after exceptional
1157 <     * completion of source
1156 >     * If a "handle action" throws an exception when triggered by
1157 >     * a normal completion, it completes exceptionally
1158       */
1159 <    public void testThenApply2() {
1160 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1161 <        CompletableFuture<Integer> g = f.thenApply(inc);
1162 <        f.completeExceptionally(new CFException());
1163 <        checkCompletedWithWrappedCFException(g);
1164 <    }
1159 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1160 >        for (ExecutionMode m : ExecutionMode.values())
1161 >        for (boolean createIncomplete : new boolean[] { true, false })
1162 >        for (Integer v1 : new Integer[] { 1, null })
1163 >    {
1164 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1165 >        final AtomicInteger a = new AtomicInteger(0);
1166 >        final CFException ex = new CFException();
1167 >        if (!createIncomplete) assertTrue(f.complete(v1));
1168 >        final CompletableFuture<Integer> g = m.handle
1169 >            (f,
1170 >             (Integer x, Throwable t) -> {
1171 >                m.checkExecutionMode();
1172 >                threadAssertSame(x, v1);
1173 >                threadAssertNull(t);
1174 >                a.getAndIncrement();
1175 >                throw ex;
1176 >            });
1177 >        if (createIncomplete) assertTrue(f.complete(v1));
1178  
1179 <    /**
1180 <     * thenApply result completes exceptionally if action does
1181 <     */
1182 <    public void testThenApply3() {
754 <        CompletableFuture<Integer> f = new CompletableFuture<>();
755 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
756 <        f.complete(one);
757 <        checkCompletedWithWrappedCFException(g);
758 <    }
1179 >        checkCompletedWithWrappedException(g, ex);
1180 >        checkCompletedNormally(f, v1);
1181 >        assertEquals(1, a.get());
1182 >    }}
1183  
1184      /**
1185 <     * thenApply result completes exceptionally if source cancelled
1185 >     * runAsync completes after running Runnable
1186       */
1187 <    public void testThenApply4() {
1188 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1189 <        CompletableFuture<Integer> g = f.thenApply(inc);
1190 <        assertTrue(f.cancel(true));
1191 <        checkCompletedWithWrappedCancellationException(g);
1192 <    }
1187 >    public void testRunAsync_normalCompletion() {
1188 >        ExecutionMode[] executionModes = {
1189 >            ExecutionMode.ASYNC,
1190 >            ExecutionMode.EXECUTOR,
1191 >        };
1192 >        for (ExecutionMode m : executionModes)
1193 >    {
1194 >        final Noop r = new Noop(m);
1195 >        final CompletableFuture<Void> f = m.runAsync(r);
1196 >        assertNull(f.join());
1197 >        checkCompletedNormally(f, null);
1198 >        r.assertInvoked();
1199 >    }}
1200  
1201      /**
1202 <     * thenAccept result completes normally after normal completion of source
1202 >     * failing runAsync completes exceptionally after running Runnable
1203       */
1204 <    public void testThenAccept() {
1205 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1206 <        IncAction r = new IncAction();
1207 <        CompletableFuture<Void> g = f.thenAccept(r);
1208 <        f.complete(one);
1209 <        checkCompletedNormally(g, null);
1210 <        assertEquals(r.value, 2);
1211 <    }
1204 >    public void testRunAsync_exceptionalCompletion() {
1205 >        ExecutionMode[] executionModes = {
1206 >            ExecutionMode.ASYNC,
1207 >            ExecutionMode.EXECUTOR,
1208 >        };
1209 >        for (ExecutionMode m : executionModes)
1210 >    {
1211 >        final FailingRunnable r = new FailingRunnable(m);
1212 >        final CompletableFuture<Void> f = m.runAsync(r);
1213 >        checkCompletedWithWrappedCFException(f);
1214 >        r.assertInvoked();
1215 >    }}
1216  
1217      /**
1218 <     * thenAccept result completes exceptionally after exceptional
784 <     * completion of source
1218 >     * supplyAsync completes with result of supplier
1219       */
1220 <    public void testThenAccept2() {
1221 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        IncAction r = new IncAction();
1223 <        CompletableFuture<Void> g = f.thenAccept(r);
1224 <        f.completeExceptionally(new CFException());
1225 <        checkCompletedWithWrappedCFException(g);
1226 <    }
1220 >    public void testSupplyAsync_normalCompletion() {
1221 >        ExecutionMode[] executionModes = {
1222 >            ExecutionMode.ASYNC,
1223 >            ExecutionMode.EXECUTOR,
1224 >        };
1225 >        for (ExecutionMode m : executionModes)
1226 >        for (Integer v1 : new Integer[] { 1, null })
1227 >    {
1228 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1229 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1230 >        assertSame(v1, f.join());
1231 >        checkCompletedNormally(f, v1);
1232 >        r.assertInvoked();
1233 >    }}
1234  
1235      /**
1236 <     * thenAccept result completes exceptionally if action does
1236 >     * Failing supplyAsync completes exceptionally
1237       */
1238 <    public void testThenAccept3() {
1239 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1240 <        FailingConsumer r = new FailingConsumer();
1241 <        CompletableFuture<Void> g = f.thenAccept(r);
1242 <        f.complete(one);
1243 <        checkCompletedWithWrappedCFException(g);
1244 <        assertTrue(r.ran);
1245 <    }
1238 >    public void testSupplyAsync_exceptionalCompletion() {
1239 >        ExecutionMode[] executionModes = {
1240 >            ExecutionMode.ASYNC,
1241 >            ExecutionMode.EXECUTOR,
1242 >        };
1243 >        for (ExecutionMode m : executionModes)
1244 >    {
1245 >        FailingSupplier r = new FailingSupplier(m);
1246 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1247 >        checkCompletedWithWrappedCFException(f);
1248 >        r.assertInvoked();
1249 >    }}
1250  
1251 <    /**
807 <     * thenAccept result completes exceptionally if source cancelled
808 <     */
809 <    public void testThenAccept4() {
810 <        CompletableFuture<Integer> f = new CompletableFuture<>();
811 <        IncAction r = new IncAction();
812 <        CompletableFuture<Void> g = f.thenAccept(r);
813 <        assertTrue(f.cancel(true));
814 <        checkCompletedWithWrappedCancellationException(g);
815 <    }
1251 >    // seq completion methods
1252  
1253      /**
1254 <     * thenCombine result completes normally after normal completion
819 <     * of sources
1254 >     * thenRun result completes normally after normal completion of source
1255       */
1256 <    public void testThenCombine_normalCompletion1() {
1256 >    public void testThenRun_normalCompletion() {
1257          for (ExecutionMode m : ExecutionMode.values())
1258          for (Integer v1 : new Integer[] { 1, null })
1259 <        for (Integer v2 : new Integer[] { 2, null }) {
825 <
1259 >    {
1260          final CompletableFuture<Integer> f = new CompletableFuture<>();
1261 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1262 <        final SubtractFunction r = new SubtractFunction();
829 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
830 <
831 <        f.complete(v1);
832 <        checkIncomplete(h);
833 <        assertFalse(r.ran());
834 <        g.complete(v2);
1261 >        final Noop[] rs = new Noop[6];
1262 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1263  
1264 <        checkCompletedNormally(h, subtract(v1, v2));
1264 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1265 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1266 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1267 >        checkIncomplete(h0);
1268 >        checkIncomplete(h1);
1269 >        checkIncomplete(h2);
1270 >        assertTrue(f.complete(v1));
1271 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1272 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1273 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1274 >
1275 >        checkCompletedNormally(h0, null);
1276 >        checkCompletedNormally(h1, null);
1277 >        checkCompletedNormally(h2, null);
1278 >        checkCompletedNormally(h3, null);
1279 >        checkCompletedNormally(h4, null);
1280 >        checkCompletedNormally(h5, null);
1281          checkCompletedNormally(f, v1);
1282 <        checkCompletedNormally(g, v2);
1283 <        }
840 <    }
1282 >        for (Noop r : rs) r.assertInvoked();
1283 >    }}
1284  
1285 <    public void testThenCombine_normalCompletion2() {
1285 >    /**
1286 >     * thenRun result completes exceptionally after exceptional
1287 >     * completion of source
1288 >     */
1289 >    public void testThenRun_exceptionalCompletion() {
1290          for (ExecutionMode m : ExecutionMode.values())
1291 <        for (Integer v1 : new Integer[] { 1, null })
1292 <        for (Integer v2 : new Integer[] { 2, null }) {
846 <
1291 >    {
1292 >        final CFException ex = new CFException();
1293          final CompletableFuture<Integer> f = new CompletableFuture<>();
1294 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1295 <        final SubtractFunction r = new SubtractFunction();
850 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1294 >        final Noop[] rs = new Noop[6];
1295 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1296  
1297 <        g.complete(v2);
1298 <        checkIncomplete(h);
1299 <        assertFalse(r.ran());
1300 <        f.complete(v1);
1297 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1298 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1299 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1300 >        checkIncomplete(h0);
1301 >        checkIncomplete(h1);
1302 >        checkIncomplete(h2);
1303 >        assertTrue(f.completeExceptionally(ex));
1304 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1305 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1306 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1307 >
1308 >        checkCompletedWithWrappedException(h0, ex);
1309 >        checkCompletedWithWrappedException(h1, ex);
1310 >        checkCompletedWithWrappedException(h2, ex);
1311 >        checkCompletedWithWrappedException(h3, ex);
1312 >        checkCompletedWithWrappedException(h4, ex);
1313 >        checkCompletedWithWrappedException(h5, ex);
1314 >        checkCompletedExceptionally(f, ex);
1315 >        for (Noop r : rs) r.assertNotInvoked();
1316 >    }}
1317  
1318 <        checkCompletedNormally(h, subtract(v1, v2));
1319 <        checkCompletedNormally(f, v1);
1320 <        checkCompletedNormally(g, v2);
1321 <        }
861 <    }
862 <
863 <    public void testThenCombine_normalCompletion3() {
1318 >    /**
1319 >     * thenRun result completes exceptionally if source cancelled
1320 >     */
1321 >    public void testThenRun_sourceCancelled() {
1322          for (ExecutionMode m : ExecutionMode.values())
1323 <        for (Integer v1 : new Integer[] { 1, null })
1324 <        for (Integer v2 : new Integer[] { 2, null }) {
867 <
1323 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1324 >    {
1325          final CompletableFuture<Integer> f = new CompletableFuture<>();
1326 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1327 <        final SubtractFunction r = new SubtractFunction();
871 <
872 <        g.complete(v2);
873 <        f.complete(v1);
874 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1326 >        final Noop[] rs = new Noop[6];
1327 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1328  
1329 <        checkCompletedNormally(h, subtract(v1, v2));
1330 <        checkCompletedNormally(f, v1);
1331 <        checkCompletedNormally(g, v2);
1332 <        }
1333 <    }
1329 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1330 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1331 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1332 >        checkIncomplete(h0);
1333 >        checkIncomplete(h1);
1334 >        checkIncomplete(h2);
1335 >        assertTrue(f.cancel(mayInterruptIfRunning));
1336 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1337 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1338 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1339 >
1340 >        checkCompletedWithWrappedCancellationException(h0);
1341 >        checkCompletedWithWrappedCancellationException(h1);
1342 >        checkCompletedWithWrappedCancellationException(h2);
1343 >        checkCompletedWithWrappedCancellationException(h3);
1344 >        checkCompletedWithWrappedCancellationException(h4);
1345 >        checkCompletedWithWrappedCancellationException(h5);
1346 >        checkCancelled(f);
1347 >        for (Noop r : rs) r.assertNotInvoked();
1348 >    }}
1349  
1350 <    public void testThenCombine_normalCompletion4() {
1350 >    /**
1351 >     * thenRun result completes exceptionally if action does
1352 >     */
1353 >    public void testThenRun_actionFailed() {
1354          for (ExecutionMode m : ExecutionMode.values())
1355          for (Integer v1 : new Integer[] { 1, null })
1356 <        for (Integer v2 : new Integer[] { 2, null }) {
886 <
1356 >    {
1357          final CompletableFuture<Integer> f = new CompletableFuture<>();
1358 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1359 <        final SubtractFunction r = new SubtractFunction();
890 <
891 <        f.complete(v1);
892 <        g.complete(v2);
893 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1358 >        final FailingRunnable[] rs = new FailingRunnable[6];
1359 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1360  
1361 <        checkCompletedNormally(h, subtract(v1, v2));
1361 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1362 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1363 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1364 >        assertTrue(f.complete(v1));
1365 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1366 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1367 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1368 >
1369 >        checkCompletedWithWrappedCFException(h0);
1370 >        checkCompletedWithWrappedCFException(h1);
1371 >        checkCompletedWithWrappedCFException(h2);
1372 >        checkCompletedWithWrappedCFException(h3);
1373 >        checkCompletedWithWrappedCFException(h4);
1374 >        checkCompletedWithWrappedCFException(h5);
1375          checkCompletedNormally(f, v1);
1376 <        checkCompletedNormally(g, v2);
898 <        }
899 <    }
1376 >    }}
1377  
1378      /**
1379 <     * thenCombine result completes exceptionally after exceptional
903 <     * completion of either source
1379 >     * thenApply result completes normally after normal completion of source
1380       */
1381 <    public void testThenCombine_exceptionalCompletion1() {
906 <        for (ExecutionMode m : ExecutionMode.values())
907 <        for (Integer v1 : new Integer[] { 1, null }) {
908 <
909 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
910 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
911 <        final SubtractFunction r = new SubtractFunction();
912 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
913 <        final CFException ex = new CFException();
914 <
915 <        f.completeExceptionally(ex);
916 <        checkIncomplete(h);
917 <        g.complete(v1);
918 <
919 <        checkCompletedWithWrappedCFException(h, ex);
920 <        checkCompletedWithWrappedCFException(f, ex);
921 <        assertFalse(r.ran());
922 <        checkCompletedNormally(g, v1);
923 <        }
924 <    }
925 <
926 <    public void testThenCombine_exceptionalCompletion2() {
1381 >    public void testThenApply_normalCompletion() {
1382          for (ExecutionMode m : ExecutionMode.values())
1383 <        for (Integer v1 : new Integer[] { 1, null }) {
1384 <
1383 >        for (Integer v1 : new Integer[] { 1, null })
1384 >    {
1385          final CompletableFuture<Integer> f = new CompletableFuture<>();
1386 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1387 <        final SubtractFunction r = new SubtractFunction();
933 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, subtract);
934 <        final CFException ex = new CFException();
1386 >        final IncFunction[] rs = new IncFunction[4];
1387 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1388  
1389 <        g.completeExceptionally(ex);
1390 <        checkIncomplete(h);
1391 <        f.complete(v1);
1392 <
1393 <        checkCompletedWithWrappedCFException(h, ex);
1394 <        checkCompletedWithWrappedCFException(g, ex);
1395 <        assertFalse(r.ran());
1389 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1390 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1391 >        checkIncomplete(h0);
1392 >        checkIncomplete(h1);
1393 >        assertTrue(f.complete(v1));
1394 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1395 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1396 >
1397 >        checkCompletedNormally(h0, inc(v1));
1398 >        checkCompletedNormally(h1, inc(v1));
1399 >        checkCompletedNormally(h2, inc(v1));
1400 >        checkCompletedNormally(h3, inc(v1));
1401          checkCompletedNormally(f, v1);
1402 <        }
1403 <    }
1402 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1403 >    }}
1404  
1405 <    public void testThenCombine_exceptionalCompletion3() {
1405 >    /**
1406 >     * thenApply result completes exceptionally after exceptional
1407 >     * completion of source
1408 >     */
1409 >    public void testThenApply_exceptionalCompletion() {
1410          for (ExecutionMode m : ExecutionMode.values())
1411 <        for (Integer v1 : new Integer[] { 1, null }) {
950 <
951 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
952 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
953 <        final SubtractFunction r = new SubtractFunction();
1411 >    {
1412          final CFException ex = new CFException();
1413 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1414 +        final IncFunction[] rs = new IncFunction[4];
1415 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1416  
1417 <        g.completeExceptionally(ex);
1418 <        f.complete(v1);
1419 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1417 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1418 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1419 >        assertTrue(f.completeExceptionally(ex));
1420 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1421 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1422 >
1423 >        checkCompletedWithWrappedException(h0, ex);
1424 >        checkCompletedWithWrappedException(h1, ex);
1425 >        checkCompletedWithWrappedException(h2, ex);
1426 >        checkCompletedWithWrappedException(h3, ex);
1427 >        checkCompletedExceptionally(f, ex);
1428 >        for (IncFunction r : rs) r.assertNotInvoked();
1429 >    }}
1430  
1431 <        checkCompletedWithWrappedCFException(h, ex);
1432 <        checkCompletedWithWrappedCFException(g, ex);
1433 <        assertFalse(r.ran());
1434 <        checkCompletedNormally(f, v1);
964 <        }
965 <    }
966 <
967 <    public void testThenCombine_exceptionalCompletion4() {
1431 >    /**
1432 >     * thenApply result completes exceptionally if source cancelled
1433 >     */
1434 >    public void testThenApply_sourceCancelled() {
1435          for (ExecutionMode m : ExecutionMode.values())
1436 <        for (Integer v1 : new Integer[] { 1, null }) {
1437 <
1436 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1437 >    {
1438          final CompletableFuture<Integer> f = new CompletableFuture<>();
1439 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1440 <        final SubtractFunction r = new SubtractFunction();
974 <        final CFException ex = new CFException();
1439 >        final IncFunction[] rs = new IncFunction[4];
1440 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1441  
1442 <        f.completeExceptionally(ex);
1443 <        g.complete(v1);
1444 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, subtract);
1442 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1443 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1444 >        assertTrue(f.cancel(mayInterruptIfRunning));
1445 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1446 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1447  
1448 <        checkCompletedWithWrappedCFException(h, ex);
1449 <        checkCompletedWithWrappedCFException(f, ex);
1450 <        assertFalse(r.ran());
1451 <        checkCompletedNormally(g, v1);
1452 <        }
1453 <    }
1448 >        checkCompletedWithWrappedCancellationException(h0);
1449 >        checkCompletedWithWrappedCancellationException(h1);
1450 >        checkCompletedWithWrappedCancellationException(h2);
1451 >        checkCompletedWithWrappedCancellationException(h3);
1452 >        checkCancelled(f);
1453 >        for (IncFunction r : rs) r.assertNotInvoked();
1454 >    }}
1455  
1456      /**
1457 <     * thenCombine result completes exceptionally if action does
1457 >     * thenApply result completes exceptionally if action does
1458       */
1459 <    public void testThenCombine_actionFailed1() {
1459 >    public void testThenApply_actionFailed() {
1460          for (ExecutionMode m : ExecutionMode.values())
1461          for (Integer v1 : new Integer[] { 1, null })
1462 <        for (Integer v2 : new Integer[] { 2, null }) {
994 <
1462 >    {
1463          final CompletableFuture<Integer> f = new CompletableFuture<>();
1464 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1465 <        final FailingBiFunction r = new FailingBiFunction();
998 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1464 >        final FailingFunction[] rs = new FailingFunction[4];
1465 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1466  
1467 <        f.complete(v1);
1468 <        checkIncomplete(h);
1469 <        g.complete(v2);
1470 <
1471 <        checkCompletedWithWrappedCFException(h);
1467 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1468 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1469 >        assertTrue(f.complete(v1));
1470 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1471 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1472 >
1473 >        checkCompletedWithWrappedCFException(h0);
1474 >        checkCompletedWithWrappedCFException(h1);
1475 >        checkCompletedWithWrappedCFException(h2);
1476 >        checkCompletedWithWrappedCFException(h3);
1477          checkCompletedNormally(f, v1);
1478 <        checkCompletedNormally(g, v2);
1007 <        }
1008 <    }
1478 >    }}
1479  
1480 <    public void testThenCombine_actionFailed2() {
1480 >    /**
1481 >     * thenAccept result completes normally after normal completion of source
1482 >     */
1483 >    public void testThenAccept_normalCompletion() {
1484          for (ExecutionMode m : ExecutionMode.values())
1485          for (Integer v1 : new Integer[] { 1, null })
1486 <        for (Integer v2 : new Integer[] { 2, null }) {
1014 <
1486 >    {
1487          final CompletableFuture<Integer> f = new CompletableFuture<>();
1488 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1489 <        final FailingBiFunction r = new FailingBiFunction();
1018 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1488 >        final NoopConsumer[] rs = new NoopConsumer[4];
1489 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1490  
1491 <        g.complete(v2);
1492 <        checkIncomplete(h);
1493 <        f.complete(v1);
1494 <
1495 <        checkCompletedWithWrappedCFException(h);
1491 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1492 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1493 >        checkIncomplete(h0);
1494 >        checkIncomplete(h1);
1495 >        assertTrue(f.complete(v1));
1496 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1497 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1498 >
1499 >        checkCompletedNormally(h0, null);
1500 >        checkCompletedNormally(h1, null);
1501 >        checkCompletedNormally(h2, null);
1502 >        checkCompletedNormally(h3, null);
1503          checkCompletedNormally(f, v1);
1504 <        checkCompletedNormally(g, v2);
1505 <        }
1028 <    }
1504 >        for (NoopConsumer r : rs) r.assertValue(v1);
1505 >    }}
1506  
1507      /**
1508 <     * thenCombine result completes exceptionally if either source cancelled
1508 >     * thenAccept result completes exceptionally after exceptional
1509 >     * completion of source
1510       */
1511 <    public void testThenCombine_sourceCancelled1() {
1511 >    public void testThenAccept_exceptionalCompletion() {
1512          for (ExecutionMode m : ExecutionMode.values())
1513 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1514 <        for (Integer v1 : new Integer[] { 1, null }) {
1037 <
1513 >    {
1514 >        final CFException ex = new CFException();
1515          final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1517 <        final SubtractFunction r = new SubtractFunction();
1041 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1042 <
1043 <        assertTrue(f.cancel(mayInterruptIfRunning));
1044 <        checkIncomplete(h);
1045 <        g.complete(v1);
1516 >        final NoopConsumer[] rs = new NoopConsumer[4];
1517 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1518  
1519 <        checkCompletedWithWrappedCancellationException(h);
1520 <        checkCancelled(f);
1521 <        assertFalse(r.ran());
1522 <        checkCompletedNormally(g, v1);
1523 <        }
1524 <    }
1519 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1520 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1521 >        assertTrue(f.completeExceptionally(ex));
1522 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1523 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1524 >
1525 >        checkCompletedWithWrappedException(h0, ex);
1526 >        checkCompletedWithWrappedException(h1, ex);
1527 >        checkCompletedWithWrappedException(h2, ex);
1528 >        checkCompletedWithWrappedException(h3, ex);
1529 >        checkCompletedExceptionally(f, ex);
1530 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1531 >    }}
1532  
1533 <    public void testThenCombine_sourceCancelled2() {
1533 >    /**
1534 >     * thenAccept result completes exceptionally if source cancelled
1535 >     */
1536 >    public void testThenAccept_sourceCancelled() {
1537          for (ExecutionMode m : ExecutionMode.values())
1538          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1539 <        for (Integer v1 : new Integer[] { 1, null }) {
1058 <
1539 >    {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1542 <        final SubtractFunction r = new SubtractFunction();
1062 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1541 >        final NoopConsumer[] rs = new NoopConsumer[4];
1542 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1543  
1544 <        assertTrue(g.cancel(mayInterruptIfRunning));
1545 <        checkIncomplete(h);
1546 <        f.complete(v1);
1544 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1545 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1546 >        assertTrue(f.cancel(mayInterruptIfRunning));
1547 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1548 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1549  
1550 <        checkCompletedWithWrappedCancellationException(h);
1551 <        checkCancelled(g);
1552 <        assertFalse(r.ran());
1553 <        checkCompletedNormally(f, v1);
1554 <        }
1555 <    }
1550 >        checkCompletedWithWrappedCancellationException(h0);
1551 >        checkCompletedWithWrappedCancellationException(h1);
1552 >        checkCompletedWithWrappedCancellationException(h2);
1553 >        checkCompletedWithWrappedCancellationException(h3);
1554 >        checkCancelled(f);
1555 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1556 >    }}
1557  
1558 <    public void testThenCombine_sourceCancelled3() {
1558 >    /**
1559 >     * thenAccept result completes exceptionally if action does
1560 >     */
1561 >    public void testThenAccept_actionFailed() {
1562          for (ExecutionMode m : ExecutionMode.values())
1563 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1564 <        for (Integer v1 : new Integer[] { 1, null }) {
1079 <
1563 >        for (Integer v1 : new Integer[] { 1, null })
1564 >    {
1565          final CompletableFuture<Integer> f = new CompletableFuture<>();
1566 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1567 <        final SubtractFunction r = new SubtractFunction();
1566 >        final FailingConsumer[] rs = new FailingConsumer[4];
1567 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1568  
1569 <        assertTrue(g.cancel(mayInterruptIfRunning));
1570 <        f.complete(v1);
1571 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1572 <
1573 <        checkCompletedWithWrappedCancellationException(h);
1574 <        checkCancelled(g);
1575 <        assertFalse(r.ran());
1569 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1570 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1571 >        assertTrue(f.complete(v1));
1572 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1573 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1574 >
1575 >        checkCompletedWithWrappedCFException(h0);
1576 >        checkCompletedWithWrappedCFException(h1);
1577 >        checkCompletedWithWrappedCFException(h2);
1578 >        checkCompletedWithWrappedCFException(h3);
1579          checkCompletedNormally(f, v1);
1580 <        }
1093 <    }
1580 >    }}
1581  
1582 <    public void testThenCombine_sourceCancelled4() {
1582 >    /**
1583 >     * thenCombine result completes normally after normal completion
1584 >     * of sources
1585 >     */
1586 >    public void testThenCombine_normalCompletion() {
1587          for (ExecutionMode m : ExecutionMode.values())
1588 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1589 <        for (Integer v1 : new Integer[] { 1, null }) {
1590 <
1588 >        for (boolean fFirst : new boolean[] { true, false })
1589 >        for (Integer v1 : new Integer[] { 1, null })
1590 >        for (Integer v2 : new Integer[] { 2, null })
1591 >    {
1592          final CompletableFuture<Integer> f = new CompletableFuture<>();
1593          final CompletableFuture<Integer> g = new CompletableFuture<>();
1594 <        final SubtractFunction r = new SubtractFunction();
1594 >        final SubtractFunction[] rs = new SubtractFunction[6];
1595 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1596  
1597 <        assertTrue(f.cancel(mayInterruptIfRunning));
1598 <        g.complete(v1);
1599 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1597 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1598 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1599 >        final Integer w1 =  fFirst ? v1 : v2;
1600 >        final Integer w2 = !fFirst ? v1 : v2;
1601 >
1602 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1603 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1604 >        assertTrue(fst.complete(w1));
1605 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1606 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1607 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1608 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1609 >        checkCompletedNormally(h1, subtract(w1, w1));
1610 >        checkCompletedNormally(h3, subtract(w1, w1));
1611 >        rs[1].assertValue(subtract(w1, w1));
1612 >        rs[3].assertValue(subtract(w1, w1));
1613 >        assertTrue(snd.complete(w2));
1614 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1615 >
1616 >        checkCompletedNormally(h0, subtract(v1, v2));
1617 >        checkCompletedNormally(h2, subtract(v1, v2));
1618 >        checkCompletedNormally(h4, subtract(v1, v2));
1619 >        rs[0].assertValue(subtract(v1, v2));
1620 >        rs[2].assertValue(subtract(v1, v2));
1621 >        rs[4].assertValue(subtract(v1, v2));
1622  
1623 <        checkCompletedWithWrappedCancellationException(h);
1624 <        checkCancelled(f);
1625 <        assertFalse(r.ran());
1111 <        checkCompletedNormally(g, v1);
1112 <        }
1113 <    }
1623 >        checkCompletedNormally(f, v1);
1624 >        checkCompletedNormally(g, v2);
1625 >    }}
1626  
1627      /**
1628 <     * thenAcceptBoth result completes normally after normal
1629 <     * completion of sources
1628 >     * thenCombine result completes exceptionally after exceptional
1629 >     * completion of either source
1630       */
1631 <    public void testThenAcceptBoth_normalCompletion1() {
1631 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1632          for (ExecutionMode m : ExecutionMode.values())
1633 +        for (boolean fFirst : new boolean[] { true, false })
1634 +        for (boolean failFirst : new boolean[] { true, false })
1635          for (Integer v1 : new Integer[] { 1, null })
1636 <        for (Integer v2 : new Integer[] { 2, null }) {
1123 <
1636 >    {
1637          final CompletableFuture<Integer> f = new CompletableFuture<>();
1638          final CompletableFuture<Integer> g = new CompletableFuture<>();
1639 <        final SubtractAction r = new SubtractAction();
1640 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1641 <
1642 <        f.complete(v1);
1643 <        checkIncomplete(h);
1644 <        assertEquals(r.value, 0);
1645 <        g.complete(v2);
1646 <
1647 <        checkCompletedNormally(h, null);
1648 <        assertEquals(r.value, subtract(v1, v2));
1649 <        checkCompletedNormally(f, v1);
1650 <        checkCompletedNormally(g, v2);
1651 <        }
1652 <    }
1639 >        final CFException ex = new CFException();
1640 >        final SubtractFunction r1 = new SubtractFunction(m);
1641 >        final SubtractFunction r2 = new SubtractFunction(m);
1642 >        final SubtractFunction r3 = new SubtractFunction(m);
1643 >
1644 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1645 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1646 >        final Callable<Boolean> complete1 = failFirst ?
1647 >            () -> fst.completeExceptionally(ex) :
1648 >            () -> fst.complete(v1);
1649 >        final Callable<Boolean> complete2 = failFirst ?
1650 >            () -> snd.complete(v1) :
1651 >            () -> snd.completeExceptionally(ex);
1652 >
1653 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1654 >        assertTrue(complete1.call());
1655 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1656 >        checkIncomplete(h1);
1657 >        checkIncomplete(h2);
1658 >        assertTrue(complete2.call());
1659 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1660 >
1661 >        checkCompletedWithWrappedException(h1, ex);
1662 >        checkCompletedWithWrappedException(h2, ex);
1663 >        checkCompletedWithWrappedException(h3, ex);
1664 >        r1.assertNotInvoked();
1665 >        r2.assertNotInvoked();
1666 >        r3.assertNotInvoked();
1667 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1668 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1669 >    }}
1670  
1671 <    public void testThenAcceptBoth_normalCompletion2() {
1671 >    /**
1672 >     * thenCombine result completes exceptionally if either source cancelled
1673 >     */
1674 >    public void testThenCombine_sourceCancelled() throws Throwable {
1675          for (ExecutionMode m : ExecutionMode.values())
1676 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1677 +        for (boolean fFirst : new boolean[] { true, false })
1678 +        for (boolean failFirst : new boolean[] { true, false })
1679          for (Integer v1 : new Integer[] { 1, null })
1680 <        for (Integer v2 : new Integer[] { 2, null }) {
1145 <
1680 >    {
1681          final CompletableFuture<Integer> f = new CompletableFuture<>();
1682          final CompletableFuture<Integer> g = new CompletableFuture<>();
1683 <        final SubtractAction r = new SubtractAction();
1684 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1685 <
1686 <        g.complete(v2);
1687 <        checkIncomplete(h);
1688 <        assertEquals(r.value, 0);
1689 <        f.complete(v1);
1690 <
1691 <        checkCompletedNormally(h, null);
1692 <        assertEquals(r.value, subtract(v1, v2));
1693 <        checkCompletedNormally(f, v1);
1694 <        checkCompletedNormally(g, v2);
1695 <        }
1696 <    }
1683 >        final SubtractFunction r1 = new SubtractFunction(m);
1684 >        final SubtractFunction r2 = new SubtractFunction(m);
1685 >        final SubtractFunction r3 = new SubtractFunction(m);
1686 >
1687 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1688 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1689 >        final Callable<Boolean> complete1 = failFirst ?
1690 >            () -> fst.cancel(mayInterruptIfRunning) :
1691 >            () -> fst.complete(v1);
1692 >        final Callable<Boolean> complete2 = failFirst ?
1693 >            () -> snd.complete(v1) :
1694 >            () -> snd.cancel(mayInterruptIfRunning);
1695 >
1696 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1697 >        assertTrue(complete1.call());
1698 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1699 >        checkIncomplete(h1);
1700 >        checkIncomplete(h2);
1701 >        assertTrue(complete2.call());
1702 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1703 >
1704 >        checkCompletedWithWrappedCancellationException(h1);
1705 >        checkCompletedWithWrappedCancellationException(h2);
1706 >        checkCompletedWithWrappedCancellationException(h3);
1707 >        r1.assertNotInvoked();
1708 >        r2.assertNotInvoked();
1709 >        r3.assertNotInvoked();
1710 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1711 >        checkCancelled(failFirst ? fst : snd);
1712 >    }}
1713  
1714 <    public void testThenAcceptBoth_normalCompletion3() {
1714 >    /**
1715 >     * thenCombine result completes exceptionally if action does
1716 >     */
1717 >    public void testThenCombine_actionFailed() {
1718          for (ExecutionMode m : ExecutionMode.values())
1719 +        for (boolean fFirst : new boolean[] { true, false })
1720          for (Integer v1 : new Integer[] { 1, null })
1721 <        for (Integer v2 : new Integer[] { 2, null }) {
1722 <
1721 >        for (Integer v2 : new Integer[] { 2, null })
1722 >    {
1723          final CompletableFuture<Integer> f = new CompletableFuture<>();
1724          final CompletableFuture<Integer> g = new CompletableFuture<>();
1725 <        final SubtractAction r = new SubtractAction();
1726 <
1727 <        g.complete(v2);
1728 <        f.complete(v1);
1729 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1730 <
1731 <        checkCompletedNormally(h, null);
1732 <        assertEquals(r.value, subtract(v1, v2));
1725 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1726 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1727 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1728 >
1729 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1730 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1731 >        final Integer w1 =  fFirst ? v1 : v2;
1732 >        final Integer w2 = !fFirst ? v1 : v2;
1733 >
1734 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1735 >        assertTrue(fst.complete(w1));
1736 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1737 >        assertTrue(snd.complete(w2));
1738 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1739 >
1740 >        checkCompletedWithWrappedCFException(h1);
1741 >        checkCompletedWithWrappedCFException(h2);
1742 >        checkCompletedWithWrappedCFException(h3);
1743 >        r1.assertInvoked();
1744 >        r2.assertInvoked();
1745 >        r3.assertInvoked();
1746          checkCompletedNormally(f, v1);
1747          checkCompletedNormally(g, v2);
1748 <        }
1181 <    }
1748 >    }}
1749  
1750 <    public void testThenAcceptBoth_normalCompletion4() {
1750 >    /**
1751 >     * thenAcceptBoth result completes normally after normal
1752 >     * completion of sources
1753 >     */
1754 >    public void testThenAcceptBoth_normalCompletion() {
1755          for (ExecutionMode m : ExecutionMode.values())
1756 +        for (boolean fFirst : new boolean[] { true, false })
1757          for (Integer v1 : new Integer[] { 1, null })
1758 <        for (Integer v2 : new Integer[] { 2, null }) {
1759 <
1758 >        for (Integer v2 : new Integer[] { 2, null })
1759 >    {
1760          final CompletableFuture<Integer> f = new CompletableFuture<>();
1761          final CompletableFuture<Integer> g = new CompletableFuture<>();
1762 <        final SubtractAction r = new SubtractAction();
1763 <
1764 <        f.complete(v1);
1765 <        g.complete(v2);
1766 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1767 <
1768 <        checkCompletedNormally(h, null);
1769 <        assertEquals(r.value, subtract(v1, v2));
1762 >        final SubtractAction r1 = new SubtractAction(m);
1763 >        final SubtractAction r2 = new SubtractAction(m);
1764 >        final SubtractAction r3 = new SubtractAction(m);
1765 >
1766 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1767 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1768 >        final Integer w1 =  fFirst ? v1 : v2;
1769 >        final Integer w2 = !fFirst ? v1 : v2;
1770 >
1771 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1772 >        assertTrue(fst.complete(w1));
1773 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1774 >        checkIncomplete(h1);
1775 >        checkIncomplete(h2);
1776 >        r1.assertNotInvoked();
1777 >        r2.assertNotInvoked();
1778 >        assertTrue(snd.complete(w2));
1779 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1780 >
1781 >        checkCompletedNormally(h1, null);
1782 >        checkCompletedNormally(h2, null);
1783 >        checkCompletedNormally(h3, null);
1784 >        r1.assertValue(subtract(v1, v2));
1785 >        r2.assertValue(subtract(v1, v2));
1786 >        r3.assertValue(subtract(v1, v2));
1787          checkCompletedNormally(f, v1);
1788          checkCompletedNormally(g, v2);
1789 <        }
1201 <    }
1789 >    }}
1790  
1791      /**
1792       * thenAcceptBoth result completes exceptionally after exceptional
1793       * completion of either source
1794       */
1795 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1795 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1796          for (ExecutionMode m : ExecutionMode.values())
1797 <        for (Integer v1 : new Integer[] { 1, null }) {
1798 <
1797 >        for (boolean fFirst : new boolean[] { true, false })
1798 >        for (boolean failFirst : new boolean[] { true, false })
1799 >        for (Integer v1 : new Integer[] { 1, null })
1800 >    {
1801          final CompletableFuture<Integer> f = new CompletableFuture<>();
1802          final CompletableFuture<Integer> g = new CompletableFuture<>();
1213        final SubtractAction r = new SubtractAction();
1214        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1803          final CFException ex = new CFException();
1804 +        final SubtractAction r1 = new SubtractAction(m);
1805 +        final SubtractAction r2 = new SubtractAction(m);
1806 +        final SubtractAction r3 = new SubtractAction(m);
1807 +
1808 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1809 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1810 +        final Callable<Boolean> complete1 = failFirst ?
1811 +            () -> fst.completeExceptionally(ex) :
1812 +            () -> fst.complete(v1);
1813 +        final Callable<Boolean> complete2 = failFirst ?
1814 +            () -> snd.complete(v1) :
1815 +            () -> snd.completeExceptionally(ex);
1816 +
1817 +        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1818 +        assertTrue(complete1.call());
1819 +        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1820 +        checkIncomplete(h1);
1821 +        checkIncomplete(h2);
1822 +        assertTrue(complete2.call());
1823 +        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1824 +
1825 +        checkCompletedWithWrappedException(h1, ex);
1826 +        checkCompletedWithWrappedException(h2, ex);
1827 +        checkCompletedWithWrappedException(h3, ex);
1828 +        r1.assertNotInvoked();
1829 +        r2.assertNotInvoked();
1830 +        r3.assertNotInvoked();
1831 +        checkCompletedNormally(failFirst ? snd : fst, v1);
1832 +        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1833 +    }}
1834  
1835 <        f.completeExceptionally(ex);
1836 <        checkIncomplete(h);
1837 <        g.complete(v1);
1838 <
1221 <        checkCompletedWithWrappedCFException(h, ex);
1222 <        checkCompletedWithWrappedCFException(f, ex);
1223 <        assertFalse(r.ran());
1224 <        checkCompletedNormally(g, v1);
1225 <        }
1226 <    }
1227 <
1228 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1835 >    /**
1836 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1837 >     */
1838 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1839          for (ExecutionMode m : ExecutionMode.values())
1840 <        for (Integer v1 : new Integer[] { 1, null }) {
1841 <
1840 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1841 >        for (boolean fFirst : new boolean[] { true, false })
1842 >        for (boolean failFirst : new boolean[] { true, false })
1843 >        for (Integer v1 : new Integer[] { 1, null })
1844 >    {
1845          final CompletableFuture<Integer> f = new CompletableFuture<>();
1846          final CompletableFuture<Integer> g = new CompletableFuture<>();
1847 <        final SubtractAction r = new SubtractAction();
1848 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1849 <        final CFException ex = new CFException();
1850 <
1851 <        g.completeExceptionally(ex);
1852 <        checkIncomplete(h);
1853 <        f.complete(v1);
1847 >        final SubtractAction r1 = new SubtractAction(m);
1848 >        final SubtractAction r2 = new SubtractAction(m);
1849 >        final SubtractAction r3 = new SubtractAction(m);
1850 >
1851 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1852 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1853 >        final Callable<Boolean> complete1 = failFirst ?
1854 >            () -> fst.cancel(mayInterruptIfRunning) :
1855 >            () -> fst.complete(v1);
1856 >        final Callable<Boolean> complete2 = failFirst ?
1857 >            () -> snd.complete(v1) :
1858 >            () -> snd.cancel(mayInterruptIfRunning);
1859 >
1860 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1861 >        assertTrue(complete1.call());
1862 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1863 >        checkIncomplete(h1);
1864 >        checkIncomplete(h2);
1865 >        assertTrue(complete2.call());
1866 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1867 >
1868 >        checkCompletedWithWrappedCancellationException(h1);
1869 >        checkCompletedWithWrappedCancellationException(h2);
1870 >        checkCompletedWithWrappedCancellationException(h3);
1871 >        r1.assertNotInvoked();
1872 >        r2.assertNotInvoked();
1873 >        r3.assertNotInvoked();
1874 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1875 >        checkCancelled(failFirst ? fst : snd);
1876 >    }}
1877  
1878 <        checkCompletedWithWrappedCFException(h, ex);
1879 <        checkCompletedWithWrappedCFException(g, ex);
1880 <        assertFalse(r.ran());
1878 >    /**
1879 >     * thenAcceptBoth result completes exceptionally if action does
1880 >     */
1881 >    public void testThenAcceptBoth_actionFailed() {
1882 >        for (ExecutionMode m : ExecutionMode.values())
1883 >        for (boolean fFirst : new boolean[] { true, false })
1884 >        for (Integer v1 : new Integer[] { 1, null })
1885 >        for (Integer v2 : new Integer[] { 2, null })
1886 >    {
1887 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1888 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1889 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1890 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1891 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1892 >
1893 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1894 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1895 >        final Integer w1 =  fFirst ? v1 : v2;
1896 >        final Integer w2 = !fFirst ? v1 : v2;
1897 >
1898 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1899 >        assertTrue(fst.complete(w1));
1900 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1901 >        assertTrue(snd.complete(w2));
1902 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1903 >
1904 >        checkCompletedWithWrappedCFException(h1);
1905 >        checkCompletedWithWrappedCFException(h2);
1906 >        checkCompletedWithWrappedCFException(h3);
1907 >        r1.assertInvoked();
1908 >        r2.assertInvoked();
1909 >        r3.assertInvoked();
1910          checkCompletedNormally(f, v1);
1911 <        }
1912 <    }
1911 >        checkCompletedNormally(g, v2);
1912 >    }}
1913  
1914 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1914 >    /**
1915 >     * runAfterBoth result completes normally after normal
1916 >     * completion of sources
1917 >     */
1918 >    public void testRunAfterBoth_normalCompletion() {
1919          for (ExecutionMode m : ExecutionMode.values())
1920 <        for (Integer v1 : new Integer[] { 1, null }) {
1921 <
1920 >        for (boolean fFirst : new boolean[] { true, false })
1921 >        for (Integer v1 : new Integer[] { 1, null })
1922 >        for (Integer v2 : new Integer[] { 2, null })
1923 >    {
1924          final CompletableFuture<Integer> f = new CompletableFuture<>();
1925          final CompletableFuture<Integer> g = new CompletableFuture<>();
1926 <        final SubtractAction r = new SubtractAction();
1927 <        final CFException ex = new CFException();
1928 <
1929 <        g.completeExceptionally(ex);
1930 <        f.complete(v1);
1931 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1932 <
1933 <        checkCompletedWithWrappedCFException(h, ex);
1934 <        checkCompletedWithWrappedCFException(g, ex);
1935 <        assertFalse(r.ran());
1926 >        final Noop r1 = new Noop(m);
1927 >        final Noop r2 = new Noop(m);
1928 >        final Noop r3 = new Noop(m);
1929 >
1930 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1931 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1932 >        final Integer w1 =  fFirst ? v1 : v2;
1933 >        final Integer w2 = !fFirst ? v1 : v2;
1934 >
1935 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1936 >        assertTrue(fst.complete(w1));
1937 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1938 >        checkIncomplete(h1);
1939 >        checkIncomplete(h2);
1940 >        r1.assertNotInvoked();
1941 >        r2.assertNotInvoked();
1942 >        assertTrue(snd.complete(w2));
1943 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1944 >
1945 >        checkCompletedNormally(h1, null);
1946 >        checkCompletedNormally(h2, null);
1947 >        checkCompletedNormally(h3, null);
1948 >        r1.assertInvoked();
1949 >        r2.assertInvoked();
1950 >        r3.assertInvoked();
1951          checkCompletedNormally(f, v1);
1952 <        }
1953 <    }
1952 >        checkCompletedNormally(g, v2);
1953 >    }}
1954  
1955 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1955 >    /**
1956 >     * runAfterBoth result completes exceptionally after exceptional
1957 >     * completion of either source
1958 >     */
1959 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1960          for (ExecutionMode m : ExecutionMode.values())
1961 <        for (Integer v1 : new Integer[] { 1, null }) {
1962 <
1961 >        for (boolean fFirst : new boolean[] { true, false })
1962 >        for (boolean failFirst : new boolean[] { true, false })
1963 >        for (Integer v1 : new Integer[] { 1, null })
1964 >    {
1965          final CompletableFuture<Integer> f = new CompletableFuture<>();
1966          final CompletableFuture<Integer> g = new CompletableFuture<>();
1275        final SubtractAction r = new SubtractAction();
1967          final CFException ex = new CFException();
1968 <
1969 <        f.completeExceptionally(ex);
1970 <        g.complete(v1);
1971 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1972 <
1973 <        checkCompletedWithWrappedCFException(h, ex);
1974 <        checkCompletedWithWrappedCFException(f, ex);
1975 <        assertFalse(r.ran());
1976 <        checkCompletedNormally(g, v1);
1977 <        }
1978 <    }
1968 >        final Noop r1 = new Noop(m);
1969 >        final Noop r2 = new Noop(m);
1970 >        final Noop r3 = new Noop(m);
1971 >
1972 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1973 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1974 >        final Callable<Boolean> complete1 = failFirst ?
1975 >            () -> fst.completeExceptionally(ex) :
1976 >            () -> fst.complete(v1);
1977 >        final Callable<Boolean> complete2 = failFirst ?
1978 >            () -> snd.complete(v1) :
1979 >            () -> snd.completeExceptionally(ex);
1980 >
1981 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1982 >        assertTrue(complete1.call());
1983 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1984 >        checkIncomplete(h1);
1985 >        checkIncomplete(h2);
1986 >        assertTrue(complete2.call());
1987 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1988 >
1989 >        checkCompletedWithWrappedException(h1, ex);
1990 >        checkCompletedWithWrappedException(h2, ex);
1991 >        checkCompletedWithWrappedException(h3, ex);
1992 >        r1.assertNotInvoked();
1993 >        r2.assertNotInvoked();
1994 >        r3.assertNotInvoked();
1995 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1996 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1997 >    }}
1998  
1999      /**
2000 <     * thenAcceptBoth result completes exceptionally if action does
2000 >     * runAfterBoth result completes exceptionally if either source cancelled
2001       */
2002 <    public void testThenAcceptBoth_actionFailed1() {
2002 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2003          for (ExecutionMode m : ExecutionMode.values())
2004 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2005 +        for (boolean fFirst : new boolean[] { true, false })
2006 +        for (boolean failFirst : new boolean[] { true, false })
2007          for (Integer v1 : new Integer[] { 1, null })
2008 <        for (Integer v2 : new Integer[] { 2, null }) {
1296 <
2008 >    {
2009          final CompletableFuture<Integer> f = new CompletableFuture<>();
2010          final CompletableFuture<Integer> g = new CompletableFuture<>();
2011 <        final FailingBiConsumer r = new FailingBiConsumer();
2012 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2013 <
2014 <        f.complete(v1);
2015 <        checkIncomplete(h);
2016 <        g.complete(v2);
2011 >        final Noop r1 = new Noop(m);
2012 >        final Noop r2 = new Noop(m);
2013 >        final Noop r3 = new Noop(m);
2014 >
2015 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2016 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2017 >        final Callable<Boolean> complete1 = failFirst ?
2018 >            () -> fst.cancel(mayInterruptIfRunning) :
2019 >            () -> fst.complete(v1);
2020 >        final Callable<Boolean> complete2 = failFirst ?
2021 >            () -> snd.complete(v1) :
2022 >            () -> snd.cancel(mayInterruptIfRunning);
2023 >
2024 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2025 >        assertTrue(complete1.call());
2026 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2027 >        checkIncomplete(h1);
2028 >        checkIncomplete(h2);
2029 >        assertTrue(complete2.call());
2030 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2031 >
2032 >        checkCompletedWithWrappedCancellationException(h1);
2033 >        checkCompletedWithWrappedCancellationException(h2);
2034 >        checkCompletedWithWrappedCancellationException(h3);
2035 >        r1.assertNotInvoked();
2036 >        r2.assertNotInvoked();
2037 >        r3.assertNotInvoked();
2038 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2039 >        checkCancelled(failFirst ? fst : snd);
2040 >    }}
2041  
2042 <        checkCompletedWithWrappedCFException(h);
2042 >    /**
2043 >     * runAfterBoth result completes exceptionally if action does
2044 >     */
2045 >    public void testRunAfterBoth_actionFailed() {
2046 >        for (ExecutionMode m : ExecutionMode.values())
2047 >        for (boolean fFirst : new boolean[] { true, false })
2048 >        for (Integer v1 : new Integer[] { 1, null })
2049 >        for (Integer v2 : new Integer[] { 2, null })
2050 >    {
2051 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2052 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2053 >        final FailingRunnable r1 = new FailingRunnable(m);
2054 >        final FailingRunnable r2 = new FailingRunnable(m);
2055 >        final FailingRunnable r3 = new FailingRunnable(m);
2056 >
2057 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2058 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2059 >        final Integer w1 =  fFirst ? v1 : v2;
2060 >        final Integer w2 = !fFirst ? v1 : v2;
2061 >
2062 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2063 >        assertTrue(fst.complete(w1));
2064 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2065 >        assertTrue(snd.complete(w2));
2066 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2067 >
2068 >        checkCompletedWithWrappedCFException(h1);
2069 >        checkCompletedWithWrappedCFException(h2);
2070 >        checkCompletedWithWrappedCFException(h3);
2071 >        r1.assertInvoked();
2072 >        r2.assertInvoked();
2073 >        r3.assertInvoked();
2074          checkCompletedNormally(f, v1);
2075          checkCompletedNormally(g, v2);
2076 <        }
1310 <    }
2076 >    }}
2077  
2078 <    public void testThenAcceptBoth_actionFailed2() {
2078 >    /**
2079 >     * applyToEither result completes normally after normal completion
2080 >     * of either source
2081 >     */
2082 >    public void testApplyToEither_normalCompletion() {
2083          for (ExecutionMode m : ExecutionMode.values())
2084          for (Integer v1 : new Integer[] { 1, null })
2085 <        for (Integer v2 : new Integer[] { 2, null }) {
2086 <
2085 >        for (Integer v2 : new Integer[] { 2, null })
2086 >    {
2087          final CompletableFuture<Integer> f = new CompletableFuture<>();
2088          final CompletableFuture<Integer> g = new CompletableFuture<>();
2089 <        final FailingBiConsumer r = new FailingBiConsumer();
2090 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2089 >        final IncFunction[] rs = new IncFunction[6];
2090 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2091  
2092 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2093 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2094 +        checkIncomplete(h0);
2095 +        checkIncomplete(h1);
2096 +        rs[0].assertNotInvoked();
2097 +        rs[1].assertNotInvoked();
2098 +        f.complete(v1);
2099 +        checkCompletedNormally(h0, inc(v1));
2100 +        checkCompletedNormally(h1, inc(v1));
2101 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2102 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2103 +        checkCompletedNormally(h2, inc(v1));
2104 +        checkCompletedNormally(h3, inc(v1));
2105          g.complete(v2);
1323        checkIncomplete(h);
1324        f.complete(v1);
2106  
2107 <        checkCompletedWithWrappedCFException(h);
2107 >        // unspecified behavior - both source completions available
2108 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2109 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2110 >        rs[4].assertValue(h4.join());
2111 >        rs[5].assertValue(h5.join());
2112 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2113 >                   Objects.equals(inc(v2), h4.join()));
2114 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2115 >                   Objects.equals(inc(v2), h5.join()));
2116 >
2117          checkCompletedNormally(f, v1);
2118          checkCompletedNormally(g, v2);
2119 <        }
2120 <    }
2119 >        checkCompletedNormally(h0, inc(v1));
2120 >        checkCompletedNormally(h1, inc(v1));
2121 >        checkCompletedNormally(h2, inc(v1));
2122 >        checkCompletedNormally(h3, inc(v1));
2123 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2124 >    }}
2125  
2126      /**
2127 <     * thenAcceptBoth result completes exceptionally if either source cancelled
2127 >     * applyToEither result completes exceptionally after exceptional
2128 >     * completion of either source
2129       */
2130 <    public void testThenAcceptBoth_sourceCancelled1() {
2130 >    public void testApplyToEither_exceptionalCompletion() {
2131          for (ExecutionMode m : ExecutionMode.values())
2132 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2133 <        for (Integer v1 : new Integer[] { 1, null }) {
1339 <
2132 >        for (Integer v1 : new Integer[] { 1, null })
2133 >    {
2134          final CompletableFuture<Integer> f = new CompletableFuture<>();
2135          final CompletableFuture<Integer> g = new CompletableFuture<>();
2136 <        final SubtractAction r = new SubtractAction();
2137 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2136 >        final CFException ex = new CFException();
2137 >        final IncFunction[] rs = new IncFunction[6];
2138 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2139  
2140 <        assertTrue(f.cancel(mayInterruptIfRunning));
2141 <        checkIncomplete(h);
2140 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2141 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2142 >        checkIncomplete(h0);
2143 >        checkIncomplete(h1);
2144 >        rs[0].assertNotInvoked();
2145 >        rs[1].assertNotInvoked();
2146 >        f.completeExceptionally(ex);
2147 >        checkCompletedWithWrappedException(h0, ex);
2148 >        checkCompletedWithWrappedException(h1, ex);
2149 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2150 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2151 >        checkCompletedWithWrappedException(h2, ex);
2152 >        checkCompletedWithWrappedException(h3, ex);
2153          g.complete(v1);
2154  
2155 <        checkCompletedWithWrappedCancellationException(h);
2156 <        checkCancelled(f);
2157 <        assertFalse(r.ran());
2158 <        checkCompletedNormally(g, v1);
2155 >        // unspecified behavior - both source completions available
2156 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2157 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2158 >        try {
2159 >            assertEquals(inc(v1), h4.join());
2160 >            rs[4].assertValue(inc(v1));
2161 >        } catch (CompletionException ok) {
2162 >            checkCompletedWithWrappedException(h4, ex);
2163 >            rs[4].assertNotInvoked();
2164 >        }
2165 >        try {
2166 >            assertEquals(inc(v1), h5.join());
2167 >            rs[5].assertValue(inc(v1));
2168 >        } catch (CompletionException ok) {
2169 >            checkCompletedWithWrappedException(h5, ex);
2170 >            rs[5].assertNotInvoked();
2171          }
1354    }
2172  
2173 <    public void testThenAcceptBoth_sourceCancelled2() {
2174 <        for (ExecutionMode m : ExecutionMode.values())
2175 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2176 <        for (Integer v1 : new Integer[] { 1, null }) {
2173 >        checkCompletedExceptionally(f, ex);
2174 >        checkCompletedNormally(g, v1);
2175 >        checkCompletedWithWrappedException(h0, ex);
2176 >        checkCompletedWithWrappedException(h1, ex);
2177 >        checkCompletedWithWrappedException(h2, ex);
2178 >        checkCompletedWithWrappedException(h3, ex);
2179 >        checkCompletedWithWrappedException(h4, ex);
2180 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2181 >    }}
2182  
2183 +    public void testApplyToEither_exceptionalCompletion2() {
2184 +        for (ExecutionMode m : ExecutionMode.values())
2185 +        for (boolean fFirst : new boolean[] { true, false })
2186 +        for (Integer v1 : new Integer[] { 1, null })
2187 +    {
2188          final CompletableFuture<Integer> f = new CompletableFuture<>();
2189          final CompletableFuture<Integer> g = new CompletableFuture<>();
2190 <        final SubtractAction r = new SubtractAction();
2191 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2190 >        final CFException ex = new CFException();
2191 >        final IncFunction[] rs = new IncFunction[6];
2192 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2193  
2194 <        assertTrue(g.cancel(mayInterruptIfRunning));
2195 <        checkIncomplete(h);
2196 <        f.complete(v1);
2194 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2195 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2196 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2197 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2198 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2199 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2200  
2201 <        checkCompletedWithWrappedCancellationException(h);
2202 <        checkCancelled(g);
2203 <        assertFalse(r.ran());
2204 <        checkCompletedNormally(f, v1);
2201 >        // unspecified behavior - both source completions available
2202 >        try {
2203 >            assertEquals(inc(v1), h0.join());
2204 >            rs[0].assertValue(inc(v1));
2205 >        } catch (CompletionException ok) {
2206 >            checkCompletedWithWrappedException(h0, ex);
2207 >            rs[0].assertNotInvoked();
2208 >        }
2209 >        try {
2210 >            assertEquals(inc(v1), h1.join());
2211 >            rs[1].assertValue(inc(v1));
2212 >        } catch (CompletionException ok) {
2213 >            checkCompletedWithWrappedException(h1, ex);
2214 >            rs[1].assertNotInvoked();
2215 >        }
2216 >        try {
2217 >            assertEquals(inc(v1), h2.join());
2218 >            rs[2].assertValue(inc(v1));
2219 >        } catch (CompletionException ok) {
2220 >            checkCompletedWithWrappedException(h2, ex);
2221 >            rs[2].assertNotInvoked();
2222 >        }
2223 >        try {
2224 >            assertEquals(inc(v1), h3.join());
2225 >            rs[3].assertValue(inc(v1));
2226 >        } catch (CompletionException ok) {
2227 >            checkCompletedWithWrappedException(h3, ex);
2228 >            rs[3].assertNotInvoked();
2229          }
1375    }
1376
1377    public void testThenAcceptBoth_sourceCancelled3() {
1378        for (ExecutionMode m : ExecutionMode.values())
1379        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1380        for (Integer v1 : new Integer[] { 1, null }) {
1381
1382        final CompletableFuture<Integer> f = new CompletableFuture<>();
1383        final CompletableFuture<Integer> g = new CompletableFuture<>();
1384        final SubtractAction r = new SubtractAction();
1385
1386        assertTrue(g.cancel(mayInterruptIfRunning));
1387        f.complete(v1);
1388        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2230  
1390        checkCompletedWithWrappedCancellationException(h);
1391        checkCancelled(g);
1392        assertFalse(r.ran());
2231          checkCompletedNormally(f, v1);
2232 <        }
2233 <    }
2232 >        checkCompletedExceptionally(g, ex);
2233 >    }}
2234  
2235 <    public void testThenAcceptBoth_sourceCancelled4() {
2235 >    /**
2236 >     * applyToEither result completes exceptionally if either source cancelled
2237 >     */
2238 >    public void testApplyToEither_sourceCancelled() {
2239          for (ExecutionMode m : ExecutionMode.values())
2240          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2241 <        for (Integer v1 : new Integer[] { 1, null }) {
2242 <
2241 >        for (Integer v1 : new Integer[] { 1, null })
2242 >    {
2243          final CompletableFuture<Integer> f = new CompletableFuture<>();
2244          final CompletableFuture<Integer> g = new CompletableFuture<>();
2245 <        final SubtractAction r = new SubtractAction();
2245 >        final IncFunction[] rs = new IncFunction[6];
2246 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2247  
2248 <        assertTrue(f.cancel(mayInterruptIfRunning));
2248 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2249 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2250 >        checkIncomplete(h0);
2251 >        checkIncomplete(h1);
2252 >        rs[0].assertNotInvoked();
2253 >        rs[1].assertNotInvoked();
2254 >        f.cancel(mayInterruptIfRunning);
2255 >        checkCompletedWithWrappedCancellationException(h0);
2256 >        checkCompletedWithWrappedCancellationException(h1);
2257 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2258 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2259 >        checkCompletedWithWrappedCancellationException(h2);
2260 >        checkCompletedWithWrappedCancellationException(h3);
2261          g.complete(v1);
1408        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2262  
2263 <        checkCompletedWithWrappedCancellationException(h);
2263 >        // unspecified behavior - both source completions available
2264 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2265 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2266 >        try {
2267 >            assertEquals(inc(v1), h4.join());
2268 >            rs[4].assertValue(inc(v1));
2269 >        } catch (CompletionException ok) {
2270 >            checkCompletedWithWrappedCancellationException(h4);
2271 >            rs[4].assertNotInvoked();
2272 >        }
2273 >        try {
2274 >            assertEquals(inc(v1), h5.join());
2275 >            rs[5].assertValue(inc(v1));
2276 >        } catch (CompletionException ok) {
2277 >            checkCompletedWithWrappedCancellationException(h5);
2278 >            rs[5].assertNotInvoked();
2279 >        }
2280 >
2281          checkCancelled(f);
1412        assertFalse(r.ran());
2282          checkCompletedNormally(g, v1);
2283 <        }
2284 <    }
2283 >        checkCompletedWithWrappedCancellationException(h0);
2284 >        checkCompletedWithWrappedCancellationException(h1);
2285 >        checkCompletedWithWrappedCancellationException(h2);
2286 >        checkCompletedWithWrappedCancellationException(h3);
2287 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2288 >    }}
2289  
2290 <    /**
1418 <     * runAfterBoth result completes normally after normal
1419 <     * completion of sources
1420 <     */
1421 <    public void testRunAfterBoth_normalCompletion1() {
2290 >    public void testApplyToEither_sourceCancelled2() {
2291          for (ExecutionMode m : ExecutionMode.values())
2292 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2293 +        for (boolean fFirst : new boolean[] { true, false })
2294          for (Integer v1 : new Integer[] { 1, null })
2295 <        for (Integer v2 : new Integer[] { 2, null }) {
1425 <
2295 >    {
2296          final CompletableFuture<Integer> f = new CompletableFuture<>();
2297          final CompletableFuture<Integer> g = new CompletableFuture<>();
2298 <        final Noop r = new Noop();
2299 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2298 >        final IncFunction[] rs = new IncFunction[6];
2299 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2300  
2301 <        f.complete(v1);
2302 <        checkIncomplete(h);
2303 <        assertFalse(r.ran);
2304 <        g.complete(v2);
2301 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2302 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2303 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2304 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2305 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2306 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2307  
2308 <        checkCompletedNormally(h, null);
2309 <        assertTrue(r.ran);
2310 <        checkCompletedNormally(f, v1);
2311 <        checkCompletedNormally(g, v2);
2308 >        // unspecified behavior - both source completions available
2309 >        try {
2310 >            assertEquals(inc(v1), h0.join());
2311 >            rs[0].assertValue(inc(v1));
2312 >        } catch (CompletionException ok) {
2313 >            checkCompletedWithWrappedCancellationException(h0);
2314 >            rs[0].assertNotInvoked();
2315 >        }
2316 >        try {
2317 >            assertEquals(inc(v1), h1.join());
2318 >            rs[1].assertValue(inc(v1));
2319 >        } catch (CompletionException ok) {
2320 >            checkCompletedWithWrappedCancellationException(h1);
2321 >            rs[1].assertNotInvoked();
2322 >        }
2323 >        try {
2324 >            assertEquals(inc(v1), h2.join());
2325 >            rs[2].assertValue(inc(v1));
2326 >        } catch (CompletionException ok) {
2327 >            checkCompletedWithWrappedCancellationException(h2);
2328 >            rs[2].assertNotInvoked();
2329 >        }
2330 >        try {
2331 >            assertEquals(inc(v1), h3.join());
2332 >            rs[3].assertValue(inc(v1));
2333 >        } catch (CompletionException ok) {
2334 >            checkCompletedWithWrappedCancellationException(h3);
2335 >            rs[3].assertNotInvoked();
2336          }
1441    }
1442
1443    public void testRunAfterBoth_normalCompletion2() {
1444        for (ExecutionMode m : ExecutionMode.values())
1445        for (Integer v1 : new Integer[] { 1, null })
1446        for (Integer v2 : new Integer[] { 2, null }) {
1447
1448        final CompletableFuture<Integer> f = new CompletableFuture<>();
1449        final CompletableFuture<Integer> g = new CompletableFuture<>();
1450        final Noop r = new Noop();
1451        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1452
1453        g.complete(v2);
1454        checkIncomplete(h);
1455        assertFalse(r.ran);
1456        f.complete(v1);
2337  
1458        checkCompletedNormally(h, null);
1459        assertTrue(r.ran);
2338          checkCompletedNormally(f, v1);
2339 <        checkCompletedNormally(g, v2);
2340 <        }
1463 <    }
2339 >        checkCancelled(g);
2340 >    }}
2341  
2342 <    public void testRunAfterBoth_normalCompletion3() {
2342 >    /**
2343 >     * applyToEither result completes exceptionally if action does
2344 >     */
2345 >    public void testApplyToEither_actionFailed() {
2346          for (ExecutionMode m : ExecutionMode.values())
2347          for (Integer v1 : new Integer[] { 1, null })
2348 <        for (Integer v2 : new Integer[] { 2, null }) {
2349 <
2348 >        for (Integer v2 : new Integer[] { 2, null })
2349 >    {
2350          final CompletableFuture<Integer> f = new CompletableFuture<>();
2351          final CompletableFuture<Integer> g = new CompletableFuture<>();
2352 <        final Noop r = new Noop();
2352 >        final FailingFunction[] rs = new FailingFunction[6];
2353 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2354 >
2355 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2356 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2357 >        f.complete(v1);
2358 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2359 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2360 >        checkCompletedWithWrappedCFException(h0);
2361 >        checkCompletedWithWrappedCFException(h1);
2362 >        checkCompletedWithWrappedCFException(h2);
2363 >        checkCompletedWithWrappedCFException(h3);
2364 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2365  
2366          g.complete(v2);
1475        f.complete(v1);
1476        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2367  
2368 <        checkCompletedNormally(h, null);
2369 <        assertTrue(r.ran);
2368 >        // unspecified behavior - both source completions available
2369 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2370 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2371 >
2372 >        checkCompletedWithWrappedCFException(h4);
2373 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2374 >                   Objects.equals(v2, rs[4].value));
2375 >        checkCompletedWithWrappedCFException(h5);
2376 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2377 >                   Objects.equals(v2, rs[5].value));
2378 >
2379          checkCompletedNormally(f, v1);
2380          checkCompletedNormally(g, v2);
2381 <        }
1483 <    }
2381 >    }}
2382  
2383 <    public void testRunAfterBoth_normalCompletion4() {
2383 >    /**
2384 >     * acceptEither result completes normally after normal completion
2385 >     * of either source
2386 >     */
2387 >    public void testAcceptEither_normalCompletion() {
2388          for (ExecutionMode m : ExecutionMode.values())
2389          for (Integer v1 : new Integer[] { 1, null })
2390 <        for (Integer v2 : new Integer[] { 2, null }) {
2391 <
2390 >        for (Integer v2 : new Integer[] { 2, null })
2391 >    {
2392          final CompletableFuture<Integer> f = new CompletableFuture<>();
2393          final CompletableFuture<Integer> g = new CompletableFuture<>();
2394 <        final Noop r = new Noop();
2394 >        final NoopConsumer[] rs = new NoopConsumer[6];
2395 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2396  
2397 <        f.complete(v1);
2397 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2398 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2399 >        checkIncomplete(h0);
2400 >        checkIncomplete(h1);
2401 >        rs[0].assertNotInvoked();
2402 >        rs[1].assertNotInvoked();
2403 >        f.complete(v1);
2404 >        checkCompletedNormally(h0, null);
2405 >        checkCompletedNormally(h1, null);
2406 >        rs[0].assertValue(v1);
2407 >        rs[1].assertValue(v1);
2408 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2409 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2410 >        checkCompletedNormally(h2, null);
2411 >        checkCompletedNormally(h3, null);
2412 >        rs[2].assertValue(v1);
2413 >        rs[3].assertValue(v1);
2414          g.complete(v2);
1496        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2415  
2416 <        checkCompletedNormally(h, null);
2417 <        assertTrue(r.ran);
2416 >        // unspecified behavior - both source completions available
2417 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2418 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2419 >        checkCompletedNormally(h4, null);
2420 >        checkCompletedNormally(h5, null);
2421 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2422 >                   Objects.equals(v2, rs[4].value));
2423 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2424 >                   Objects.equals(v2, rs[5].value));
2425 >
2426          checkCompletedNormally(f, v1);
2427          checkCompletedNormally(g, v2);
2428 <        }
2429 <    }
2428 >        checkCompletedNormally(h0, null);
2429 >        checkCompletedNormally(h1, null);
2430 >        checkCompletedNormally(h2, null);
2431 >        checkCompletedNormally(h3, null);
2432 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2433 >    }}
2434  
2435      /**
2436 <     * runAfterBoth result completes exceptionally after exceptional
2436 >     * acceptEither result completes exceptionally after exceptional
2437       * completion of either source
2438       */
2439 <    public void testRunAfterBoth_exceptionalCompletion1() {
2439 >    public void testAcceptEither_exceptionalCompletion() {
2440          for (ExecutionMode m : ExecutionMode.values())
2441 <        for (Integer v1 : new Integer[] { 1, null }) {
2442 <
2441 >        for (Integer v1 : new Integer[] { 1, null })
2442 >    {
2443          final CompletableFuture<Integer> f = new CompletableFuture<>();
2444          final CompletableFuture<Integer> g = new CompletableFuture<>();
1515        final Noop r = new Noop();
1516        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2445          final CFException ex = new CFException();
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.completeExceptionally(ex);
2456 <        checkIncomplete(h);
2456 >        checkCompletedWithWrappedException(h0, ex);
2457 >        checkCompletedWithWrappedException(h1, ex);
2458 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2459 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2460 >        checkCompletedWithWrappedException(h2, ex);
2461 >        checkCompletedWithWrappedException(h3, ex);
2462 >
2463          g.complete(v1);
2464  
2465 <        checkCompletedWithWrappedCFException(h, ex);
2466 <        checkCompletedWithWrappedCFException(f, ex);
2467 <        assertFalse(r.ran);
2468 <        checkCompletedNormally(g, v1);
2465 >        // unspecified behavior - both source completions available
2466 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2467 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2468 >        try {
2469 >            assertNull(h4.join());
2470 >            rs[4].assertValue(v1);
2471 >        } catch (CompletionException ok) {
2472 >            checkCompletedWithWrappedException(h4, ex);
2473 >            rs[4].assertNotInvoked();
2474 >        }
2475 >        try {
2476 >            assertNull(h5.join());
2477 >            rs[5].assertValue(v1);
2478 >        } catch (CompletionException ok) {
2479 >            checkCompletedWithWrappedException(h5, ex);
2480 >            rs[5].assertNotInvoked();
2481          }
1528    }
2482  
2483 <    public void testRunAfterBoth_exceptionalCompletion2() {
2484 <        for (ExecutionMode m : ExecutionMode.values())
2485 <        for (Integer v1 : new Integer[] { 1, null }) {
2483 >        checkCompletedExceptionally(f, ex);
2484 >        checkCompletedNormally(g, v1);
2485 >        checkCompletedWithWrappedException(h0, ex);
2486 >        checkCompletedWithWrappedException(h1, ex);
2487 >        checkCompletedWithWrappedException(h2, ex);
2488 >        checkCompletedWithWrappedException(h3, ex);
2489 >        checkCompletedWithWrappedException(h4, ex);
2490 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2491 >    }}
2492  
2493 +    public void testAcceptEither_exceptionalCompletion2() {
2494 +        for (ExecutionMode m : ExecutionMode.values())
2495 +        for (boolean fFirst : new boolean[] { true, false })
2496 +        for (Integer v1 : new Integer[] { 1, null })
2497 +    {
2498          final CompletableFuture<Integer> f = new CompletableFuture<>();
2499          final CompletableFuture<Integer> g = new CompletableFuture<>();
1536        final Noop r = new Noop();
1537        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2500          final CFException ex = new CFException();
2501 +        final NoopConsumer[] rs = new NoopConsumer[6];
2502 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2503  
2504 <        g.completeExceptionally(ex);
2505 <        checkIncomplete(h);
2506 <        f.complete(v1);
2504 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2505 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2506 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2507 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2508 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2509 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2510  
2511 <        checkCompletedWithWrappedCFException(h, ex);
2512 <        checkCompletedWithWrappedCFException(g, ex);
2513 <        assertFalse(r.ran);
2514 <        checkCompletedNormally(f, v1);
2511 >        // unspecified behavior - both source completions available
2512 >        try {
2513 >            assertEquals(null, h0.join());
2514 >            rs[0].assertValue(v1);
2515 >        } catch (CompletionException ok) {
2516 >            checkCompletedWithWrappedException(h0, ex);
2517 >            rs[0].assertNotInvoked();
2518 >        }
2519 >        try {
2520 >            assertEquals(null, h1.join());
2521 >            rs[1].assertValue(v1);
2522 >        } catch (CompletionException ok) {
2523 >            checkCompletedWithWrappedException(h1, ex);
2524 >            rs[1].assertNotInvoked();
2525 >        }
2526 >        try {
2527 >            assertEquals(null, h2.join());
2528 >            rs[2].assertValue(v1);
2529 >        } catch (CompletionException ok) {
2530 >            checkCompletedWithWrappedException(h2, ex);
2531 >            rs[2].assertNotInvoked();
2532 >        }
2533 >        try {
2534 >            assertEquals(null, h3.join());
2535 >            rs[3].assertValue(v1);
2536 >        } catch (CompletionException ok) {
2537 >            checkCompletedWithWrappedException(h3, ex);
2538 >            rs[3].assertNotInvoked();
2539          }
1549    }
1550
1551    public void testRunAfterBoth_exceptionalCompletion3() {
1552        for (ExecutionMode m : ExecutionMode.values())
1553        for (Integer v1 : new Integer[] { 1, null }) {
1554
1555        final CompletableFuture<Integer> f = new CompletableFuture<>();
1556        final CompletableFuture<Integer> g = new CompletableFuture<>();
1557        final Noop r = new Noop();
1558        final CFException ex = new CFException();
1559
1560        g.completeExceptionally(ex);
1561        f.complete(v1);
1562        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2540  
1564        checkCompletedWithWrappedCFException(h, ex);
1565        checkCompletedWithWrappedCFException(g, ex);
1566        assertFalse(r.ran);
2541          checkCompletedNormally(f, v1);
2542 <        }
2543 <    }
2542 >        checkCompletedExceptionally(g, ex);
2543 >    }}
2544  
2545 <    public void testRunAfterBoth_exceptionalCompletion4() {
2545 >    /**
2546 >     * acceptEither result completes exceptionally if either source cancelled
2547 >     */
2548 >    public void testAcceptEither_sourceCancelled() {
2549          for (ExecutionMode m : ExecutionMode.values())
2550 <        for (Integer v1 : new Integer[] { 1, null }) {
2551 <
2550 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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();
2555 >        final NoopConsumer[] rs = new NoopConsumer[6];
2556 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2557 >
2558 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2559 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2560 >        checkIncomplete(h0);
2561 >        checkIncomplete(h1);
2562 >        rs[0].assertNotInvoked();
2563 >        rs[1].assertNotInvoked();
2564 >        f.cancel(mayInterruptIfRunning);
2565 >        checkCompletedWithWrappedCancellationException(h0);
2566 >        checkCompletedWithWrappedCancellationException(h1);
2567 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2568 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2569 >        checkCompletedWithWrappedCancellationException(h2);
2570 >        checkCompletedWithWrappedCancellationException(h3);
2571  
1580        f.completeExceptionally(ex);
2572          g.complete(v1);
1582        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2573  
2574 <        checkCompletedWithWrappedCFException(h, ex);
2575 <        checkCompletedWithWrappedCFException(f, ex);
2576 <        assertFalse(r.ran);
2577 <        checkCompletedNormally(g, v1);
2574 >        // unspecified behavior - both source completions available
2575 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2576 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2577 >        try {
2578 >            assertNull(h4.join());
2579 >            rs[4].assertValue(v1);
2580 >        } catch (CompletionException ok) {
2581 >            checkCompletedWithWrappedCancellationException(h4);
2582 >            rs[4].assertNotInvoked();
2583 >        }
2584 >        try {
2585 >            assertNull(h5.join());
2586 >            rs[5].assertValue(v1);
2587 >        } catch (CompletionException ok) {
2588 >            checkCompletedWithWrappedCancellationException(h5);
2589 >            rs[5].assertNotInvoked();
2590          }
2591 <    }
2591 >
2592 >        checkCancelled(f);
2593 >        checkCompletedNormally(g, v1);
2594 >        checkCompletedWithWrappedCancellationException(h0);
2595 >        checkCompletedWithWrappedCancellationException(h1);
2596 >        checkCompletedWithWrappedCancellationException(h2);
2597 >        checkCompletedWithWrappedCancellationException(h3);
2598 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2599 >    }}
2600  
2601      /**
2602 <     * runAfterBoth result completes exceptionally if action does
2602 >     * acceptEither result completes exceptionally if action does
2603       */
2604 <    public void testRunAfterBoth_actionFailed1() {
2604 >    public void testAcceptEither_actionFailed() {
2605          for (ExecutionMode m : ExecutionMode.values())
2606          for (Integer v1 : new Integer[] { 1, null })
2607 <        for (Integer v2 : new Integer[] { 2, null }) {
2608 <
2607 >        for (Integer v2 : new Integer[] { 2, null })
2608 >    {
2609          final CompletableFuture<Integer> f = new CompletableFuture<>();
2610          final CompletableFuture<Integer> g = new CompletableFuture<>();
2611 <        final FailingNoop r = new FailingNoop();
2612 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2611 >        final FailingConsumer[] rs = new FailingConsumer[6];
2612 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2613 >
2614 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2615 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2616 >        f.complete(v1);
2617 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2618 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2619 >        checkCompletedWithWrappedCFException(h0);
2620 >        checkCompletedWithWrappedCFException(h1);
2621 >        checkCompletedWithWrappedCFException(h2);
2622 >        checkCompletedWithWrappedCFException(h3);
2623 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2624  
1604        f.complete(v1);
1605        checkIncomplete(h);
2625          g.complete(v2);
2626  
2627 <        checkCompletedWithWrappedCFException(h);
2627 >        // unspecified behavior - both source completions available
2628 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2629 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2630 >
2631 >        checkCompletedWithWrappedCFException(h4);
2632 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2633 >                   Objects.equals(v2, rs[4].value));
2634 >        checkCompletedWithWrappedCFException(h5);
2635 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2636 >                   Objects.equals(v2, rs[5].value));
2637 >
2638          checkCompletedNormally(f, v1);
2639          checkCompletedNormally(g, v2);
2640 <        }
1612 <    }
2640 >    }}
2641  
2642 <    public void testRunAfterBoth_actionFailed2() {
2642 >    /**
2643 >     * runAfterEither result completes normally after normal completion
2644 >     * of either source
2645 >     */
2646 >    public void testRunAfterEither_normalCompletion() {
2647          for (ExecutionMode m : ExecutionMode.values())
2648          for (Integer v1 : new Integer[] { 1, null })
2649 <        for (Integer v2 : new Integer[] { 2, null }) {
2650 <
2649 >        for (Integer v2 : new Integer[] { 2, null })
2650 >    {
2651          final CompletableFuture<Integer> f = new CompletableFuture<>();
2652          final CompletableFuture<Integer> g = new CompletableFuture<>();
2653 <        final FailingNoop r = new FailingNoop();
2654 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2653 >        final Noop[] rs = new Noop[6];
2654 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2655 >
2656 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2657 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2658 >        checkIncomplete(h0);
2659 >        checkIncomplete(h1);
2660 >        rs[0].assertNotInvoked();
2661 >        rs[1].assertNotInvoked();
2662 >        f.complete(v1);
2663 >        checkCompletedNormally(h0, null);
2664 >        checkCompletedNormally(h1, null);
2665 >        rs[0].assertInvoked();
2666 >        rs[1].assertInvoked();
2667 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2668 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2669 >        checkCompletedNormally(h2, null);
2670 >        checkCompletedNormally(h3, null);
2671 >        rs[2].assertInvoked();
2672 >        rs[3].assertInvoked();
2673  
2674          g.complete(v2);
1625        checkIncomplete(h);
1626        f.complete(v1);
2675  
2676 <        checkCompletedWithWrappedCFException(h);
2676 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2677 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2678 >
2679          checkCompletedNormally(f, v1);
2680          checkCompletedNormally(g, v2);
2681 <        }
2682 <    }
2681 >        checkCompletedNormally(h0, null);
2682 >        checkCompletedNormally(h1, null);
2683 >        checkCompletedNormally(h2, null);
2684 >        checkCompletedNormally(h3, null);
2685 >        checkCompletedNormally(h4, null);
2686 >        checkCompletedNormally(h5, null);
2687 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2688 >    }}
2689  
2690      /**
2691 <     * runAfterBoth result completes exceptionally if either source cancelled
2691 >     * runAfterEither result completes exceptionally after exceptional
2692 >     * completion of either source
2693       */
2694 <    public void testRunAfterBoth_sourceCancelled1() {
2694 >    public void testRunAfterEither_exceptionalCompletion() {
2695          for (ExecutionMode m : ExecutionMode.values())
2696 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2697 <        for (Integer v1 : new Integer[] { 1, null }) {
1641 <
2696 >        for (Integer v1 : new Integer[] { 1, null })
2697 >    {
2698          final CompletableFuture<Integer> f = new CompletableFuture<>();
2699          final CompletableFuture<Integer> g = new CompletableFuture<>();
2700 <        final Noop r = new Noop();
2701 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2700 >        final CFException ex = new CFException();
2701 >        final Noop[] rs = new Noop[6];
2702 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2703  
2704 <        assertTrue(f.cancel(mayInterruptIfRunning));
2705 <        checkIncomplete(h);
2706 <        g.complete(v1);
2704 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2705 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2706 >        checkIncomplete(h0);
2707 >        checkIncomplete(h1);
2708 >        rs[0].assertNotInvoked();
2709 >        rs[1].assertNotInvoked();
2710 >        assertTrue(f.completeExceptionally(ex));
2711 >        checkCompletedWithWrappedException(h0, ex);
2712 >        checkCompletedWithWrappedException(h1, ex);
2713 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2714 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2715 >        checkCompletedWithWrappedException(h2, ex);
2716 >        checkCompletedWithWrappedException(h3, ex);
2717 >
2718 >        assertTrue(g.complete(v1));
2719 >
2720 >        // unspecified behavior - both source completions available
2721 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2722 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2723 >        try {
2724 >            assertNull(h4.join());
2725 >            rs[4].assertInvoked();
2726 >        } catch (CompletionException ok) {
2727 >            checkCompletedWithWrappedException(h4, ex);
2728 >            rs[4].assertNotInvoked();
2729 >        }
2730 >        try {
2731 >            assertNull(h5.join());
2732 >            rs[5].assertInvoked();
2733 >        } catch (CompletionException ok) {
2734 >            checkCompletedWithWrappedException(h5, ex);
2735 >            rs[5].assertNotInvoked();
2736 >        }
2737  
2738 <        checkCompletedWithWrappedCancellationException(h);
1652 <        checkCancelled(f);
1653 <        assertFalse(r.ran);
2738 >        checkCompletedExceptionally(f, ex);
2739          checkCompletedNormally(g, v1);
2740 <        }
2741 <    }
2740 >        checkCompletedWithWrappedException(h0, ex);
2741 >        checkCompletedWithWrappedException(h1, ex);
2742 >        checkCompletedWithWrappedException(h2, ex);
2743 >        checkCompletedWithWrappedException(h3, ex);
2744 >        checkCompletedWithWrappedException(h4, ex);
2745 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2746 >    }}
2747  
2748 <    public void testRunAfterBoth_sourceCancelled2() {
2748 >    public void testRunAfterEither_exceptionalCompletion2() {
2749          for (ExecutionMode m : ExecutionMode.values())
2750 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2751 <        for (Integer v1 : new Integer[] { 1, null }) {
2752 <
2750 >        for (boolean fFirst : new boolean[] { true, false })
2751 >        for (Integer v1 : new Integer[] { 1, null })
2752 >    {
2753          final CompletableFuture<Integer> f = new CompletableFuture<>();
2754          final CompletableFuture<Integer> g = new CompletableFuture<>();
2755 <        final Noop r = new Noop();
2756 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2755 >        final CFException ex = new CFException();
2756 >        final Noop[] rs = new Noop[6];
2757 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2758  
2759 <        assertTrue(g.cancel(mayInterruptIfRunning));
2760 <        checkIncomplete(h);
2761 <        f.complete(v1);
2759 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2760 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2761 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2762 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2763 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2764 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2765  
2766 <        checkCompletedWithWrappedCancellationException(h);
2767 <        checkCancelled(g);
2768 <        assertFalse(r.ran);
2769 <        checkCompletedNormally(f, v1);
2766 >        // unspecified behavior - both source completions available
2767 >        try {
2768 >            assertEquals(null, h0.join());
2769 >            rs[0].assertInvoked();
2770 >        } catch (CompletionException ok) {
2771 >            checkCompletedWithWrappedException(h0, ex);
2772 >            rs[0].assertNotInvoked();
2773 >        }
2774 >        try {
2775 >            assertEquals(null, h1.join());
2776 >            rs[1].assertInvoked();
2777 >        } catch (CompletionException ok) {
2778 >            checkCompletedWithWrappedException(h1, ex);
2779 >            rs[1].assertNotInvoked();
2780 >        }
2781 >        try {
2782 >            assertEquals(null, h2.join());
2783 >            rs[2].assertInvoked();
2784 >        } catch (CompletionException ok) {
2785 >            checkCompletedWithWrappedException(h2, ex);
2786 >            rs[2].assertNotInvoked();
2787 >        }
2788 >        try {
2789 >            assertEquals(null, h3.join());
2790 >            rs[3].assertInvoked();
2791 >        } catch (CompletionException ok) {
2792 >            checkCompletedWithWrappedException(h3, ex);
2793 >            rs[3].assertNotInvoked();
2794          }
1677    }
1678
1679    public void testRunAfterBoth_sourceCancelled3() {
1680        for (ExecutionMode m : ExecutionMode.values())
1681        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1682        for (Integer v1 : new Integer[] { 1, null }) {
1683
1684        final CompletableFuture<Integer> f = new CompletableFuture<>();
1685        final CompletableFuture<Integer> g = new CompletableFuture<>();
1686        final Noop r = new Noop();
1687
1688        assertTrue(g.cancel(mayInterruptIfRunning));
1689        f.complete(v1);
1690        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2795  
1692        checkCompletedWithWrappedCancellationException(h);
1693        checkCancelled(g);
1694        assertFalse(r.ran);
2796          checkCompletedNormally(f, v1);
2797 <        }
2798 <    }
2797 >        checkCompletedExceptionally(g, ex);
2798 >    }}
2799  
2800 <    public void testRunAfterBoth_sourceCancelled4() {
2800 >    /**
2801 >     * runAfterEither result completes exceptionally if either source cancelled
2802 >     */
2803 >    public void testRunAfterEither_sourceCancelled() {
2804          for (ExecutionMode m : ExecutionMode.values())
2805          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2806 <        for (Integer v1 : new Integer[] { 1, null }) {
2807 <
2806 >        for (Integer v1 : new Integer[] { 1, null })
2807 >    {
2808          final CompletableFuture<Integer> f = new CompletableFuture<>();
2809          final CompletableFuture<Integer> g = new CompletableFuture<>();
2810 <        final Noop r = new Noop();
2810 >        final Noop[] rs = new Noop[6];
2811 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2812  
2813 <        assertTrue(f.cancel(mayInterruptIfRunning));
2814 <        g.complete(v1);
2815 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2813 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2814 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2815 >        checkIncomplete(h0);
2816 >        checkIncomplete(h1);
2817 >        rs[0].assertNotInvoked();
2818 >        rs[1].assertNotInvoked();
2819 >        f.cancel(mayInterruptIfRunning);
2820 >        checkCompletedWithWrappedCancellationException(h0);
2821 >        checkCompletedWithWrappedCancellationException(h1);
2822 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2823 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2824 >        checkCompletedWithWrappedCancellationException(h2);
2825 >        checkCompletedWithWrappedCancellationException(h3);
2826 >
2827 >        assertTrue(g.complete(v1));
2828 >
2829 >        // unspecified behavior - both source completions available
2830 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2831 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2832 >        try {
2833 >            assertNull(h4.join());
2834 >            rs[4].assertInvoked();
2835 >        } catch (CompletionException ok) {
2836 >            checkCompletedWithWrappedCancellationException(h4);
2837 >            rs[4].assertNotInvoked();
2838 >        }
2839 >        try {
2840 >            assertNull(h5.join());
2841 >            rs[5].assertInvoked();
2842 >        } catch (CompletionException ok) {
2843 >            checkCompletedWithWrappedCancellationException(h5);
2844 >            rs[5].assertNotInvoked();
2845 >        }
2846  
1712        checkCompletedWithWrappedCancellationException(h);
2847          checkCancelled(f);
1714        assertFalse(r.ran);
2848          checkCompletedNormally(g, v1);
2849 <        }
2850 <    }
2851 <
2852 <    /**
2853 <     * applyToEither result completes normally after normal completion
2854 <     * of either source
1722 <     */
1723 <    public void testApplyToEither() {
1724 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1725 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1726 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1727 <        f.complete(one);
1728 <        checkCompletedNormally(g, two);
1729 <        f2.complete(one);
1730 <        checkCompletedNormally(g, two);
1731 <
1732 <        f = new CompletableFuture<>();
1733 <        f.complete(one);
1734 <        f2 = new CompletableFuture<>();
1735 <        g = f.applyToEither(f2, inc);
1736 <        checkCompletedNormally(g, two);
1737 <    }
1738 <
1739 <    /**
1740 <     * applyToEither result completes exceptionally after exceptional
1741 <     * completion of either source
1742 <     */
1743 <    public void testApplyToEither2() {
1744 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1745 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1746 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1747 <        f.completeExceptionally(new CFException());
1748 <        f2.complete(one);
1749 <        checkCompletedWithWrappedCFException(g);
1750 <
1751 <        f = new CompletableFuture<>();
1752 <        f2 = new CompletableFuture<>();
1753 <        f2.completeExceptionally(new CFException());
1754 <        g = f.applyToEither(f2, inc);
1755 <        checkCompletedWithWrappedCFException(g);
1756 <    }
1757 <
1758 <    /**
1759 <     * applyToEither result completes exceptionally if action does
1760 <     */
1761 <    public void testApplyToEither3() {
1762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1763 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1764 <        FailingFunction r = new FailingFunction();
1765 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1766 <        f2.complete(two);
1767 <        checkCompletedWithWrappedCFException(g);
1768 <    }
1769 <
1770 <    /**
1771 <     * applyToEither result completes exceptionally if either source cancelled
1772 <     */
1773 <    public void testApplyToEither4() {
1774 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1775 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1776 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1777 <        assertTrue(f.cancel(true));
1778 <        checkCompletedWithWrappedCancellationException(g);
1779 <        f = new CompletableFuture<>();
1780 <        f2 = new CompletableFuture<>();
1781 <        assertTrue(f2.cancel(true));
1782 <        checkCompletedWithWrappedCancellationException(g);
1783 <    }
1784 <
1785 <    /**
1786 <     * acceptEither result completes normally after normal completion
1787 <     * of either source
1788 <     */
1789 <    public void testAcceptEither() {
1790 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1791 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1792 <        IncAction r = new IncAction();
1793 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1794 <        f.complete(one);
1795 <        checkCompletedNormally(g, null);
1796 <        f2.complete(one);
1797 <        checkCompletedNormally(g, null);
1798 <        assertEquals(r.value, 2);
1799 <
1800 <        r = new IncAction();
1801 <        f = new CompletableFuture<>();
1802 <        f.complete(one);
1803 <        f2 = new CompletableFuture<>();
1804 <        g = f.acceptEither(f2, r);
1805 <        checkCompletedNormally(g, null);
1806 <        assertEquals(r.value, 2);
1807 <    }
1808 <
1809 <    /**
1810 <     * acceptEither result completes exceptionally after exceptional
1811 <     * completion of either source
1812 <     */
1813 <    public void testAcceptEither2() {
1814 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1815 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1816 <        IncAction r = new IncAction();
1817 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1818 <        f.completeExceptionally(new CFException());
1819 <        f2.complete(one);
1820 <        checkCompletedWithWrappedCFException(g);
1821 <
1822 <        r = new IncAction();
1823 <        f = new CompletableFuture<>();
1824 <        f2 = new CompletableFuture<>();
1825 <        f2.completeExceptionally(new CFException());
1826 <        g = f.acceptEither(f2, r);
1827 <        checkCompletedWithWrappedCFException(g);
1828 <    }
1829 <
1830 <    /**
1831 <     * acceptEither result completes exceptionally if action does
1832 <     */
1833 <    public void testAcceptEither3() {
1834 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1835 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1836 <        FailingConsumer r = new FailingConsumer();
1837 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1838 <        f2.complete(two);
1839 <        checkCompletedWithWrappedCFException(g);
1840 <    }
1841 <
1842 <    /**
1843 <     * acceptEither result completes exceptionally if either source cancelled
1844 <     */
1845 <    public void testAcceptEither4() {
1846 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1847 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1848 <        IncAction r = new IncAction();
1849 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1850 <        assertTrue(f.cancel(true));
1851 <        checkCompletedWithWrappedCancellationException(g);
1852 <        f = new CompletableFuture<>();
1853 <        f2 = new CompletableFuture<>();
1854 <        assertTrue(f2.cancel(true));
1855 <        checkCompletedWithWrappedCancellationException(g);
1856 <    }
1857 <
1858 <    /**
1859 <     * runAfterEither result completes normally after normal completion
1860 <     * of either source
1861 <     */
1862 <    public void testRunAfterEither() {
1863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1864 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1865 <        Noop r = new Noop();
1866 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1867 <        f.complete(one);
1868 <        checkCompletedNormally(g, null);
1869 <        f2.complete(one);
1870 <        checkCompletedNormally(g, null);
1871 <        assertTrue(r.ran);
1872 <
1873 <        r = new Noop();
1874 <        f = new CompletableFuture<>();
1875 <        f.complete(one);
1876 <        f2 = new CompletableFuture<>();
1877 <        g = f.runAfterEither(f2, r);
1878 <        checkCompletedNormally(g, null);
1879 <        assertTrue(r.ran);
1880 <    }
1881 <
1882 <    /**
1883 <     * runAfterEither result completes exceptionally after exceptional
1884 <     * completion of either source
1885 <     */
1886 <    public void testRunAfterEither2() {
1887 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1888 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1889 <        Noop r = new Noop();
1890 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1891 <        f.completeExceptionally(new CFException());
1892 <        f2.complete(one);
1893 <        checkCompletedWithWrappedCFException(g);
1894 <
1895 <        r = new Noop();
1896 <        f = new CompletableFuture<>();
1897 <        f2 = new CompletableFuture<>();
1898 <        f2.completeExceptionally(new CFException());
1899 <        g = f.runAfterEither(f2, r);
1900 <        checkCompletedWithWrappedCFException(g);
1901 <    }
2849 >        checkCompletedWithWrappedCancellationException(h0);
2850 >        checkCompletedWithWrappedCancellationException(h1);
2851 >        checkCompletedWithWrappedCancellationException(h2);
2852 >        checkCompletedWithWrappedCancellationException(h3);
2853 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2854 >    }}
2855  
2856      /**
2857       * runAfterEither result completes exceptionally if action does
2858       */
2859 <    public void testRunAfterEither3() {
2860 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2861 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2862 <        FailingNoop r = new FailingNoop();
2863 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2864 <        f2.complete(two);
2865 <        checkCompletedWithWrappedCFException(g);
2866 <    }
2859 >    public void testRunAfterEither_actionFailed() {
2860 >        for (ExecutionMode m : ExecutionMode.values())
2861 >        for (Integer v1 : new Integer[] { 1, null })
2862 >        for (Integer v2 : new Integer[] { 2, null })
2863 >    {
2864 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2865 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2866 >        final FailingRunnable[] rs = new FailingRunnable[6];
2867 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2868  
2869 <    /**
2870 <     * runAfterEither result completes exceptionally if either source cancelled
2871 <     */
2872 <    public void testRunAfterEither4() {
2873 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2874 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2875 <        Noop r = new Noop();
2876 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2877 <        assertTrue(f.cancel(true));
2878 <        checkCompletedWithWrappedCancellationException(g);
2879 <        f = new CompletableFuture<>();
2880 <        f2 = new CompletableFuture<>();
2881 <        assertTrue(f2.cancel(true));
2882 <        checkCompletedWithWrappedCancellationException(g);
2883 <    }
2869 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2870 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2871 >        assertTrue(f.complete(v1));
2872 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2873 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2874 >        checkCompletedWithWrappedCFException(h0);
2875 >        checkCompletedWithWrappedCFException(h1);
2876 >        checkCompletedWithWrappedCFException(h2);
2877 >        checkCompletedWithWrappedCFException(h3);
2878 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2879 >        assertTrue(g.complete(v2));
2880 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2881 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2882 >        checkCompletedWithWrappedCFException(h4);
2883 >        checkCompletedWithWrappedCFException(h5);
2884 >
2885 >        checkCompletedNormally(f, v1);
2886 >        checkCompletedNormally(g, v2);
2887 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2888 >    }}
2889  
2890      /**
2891       * thenCompose result completes normally after normal completion of source
2892       */
2893 <    public void testThenCompose() {
2894 <        CompletableFuture<Integer> f, g;
2895 <        CompletableFutureInc r;
2896 <
2897 <        f = new CompletableFuture<>();
2898 <        g = f.thenCompose(r = new CompletableFutureInc());
2899 <        f.complete(one);
2900 <        checkCompletedNormally(g, two);
2901 <        assertTrue(r.ran);
2893 >    public void testThenCompose_normalCompletion() {
2894 >        for (ExecutionMode m : ExecutionMode.values())
2895 >        for (boolean createIncomplete : new boolean[] { true, false })
2896 >        for (Integer v1 : new Integer[] { 1, null })
2897 >    {
2898 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2899 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2900 >        if (!createIncomplete) assertTrue(f.complete(v1));
2901 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2902 >        if (createIncomplete) assertTrue(f.complete(v1));
2903  
2904 <        f = new CompletableFuture<>();
2905 <        f.complete(one);
2906 <        g = f.thenCompose(r = new CompletableFutureInc());
2907 <        checkCompletedNormally(g, two);
1948 <        assertTrue(r.ran);
1949 <    }
2904 >        checkCompletedNormally(g, inc(v1));
2905 >        checkCompletedNormally(f, v1);
2906 >        r.assertValue(v1);
2907 >    }}
2908  
2909      /**
2910       * thenCompose result completes exceptionally after exceptional
2911       * completion of source
2912       */
2913 <    public void testThenCompose2() {
2914 <        CompletableFuture<Integer> f, g;
2915 <        CompletableFutureInc r;
2916 <
2917 <        f = new CompletableFuture<>();
2918 <        g = f.thenCompose(r = new CompletableFutureInc());
2919 <        f.completeExceptionally(new CFException());
2920 <        checkCompletedWithWrappedCFException(g);
2921 <
2922 <        f = new CompletableFuture<>();
2923 <        f.completeExceptionally(new CFException());
2924 <        g = f.thenCompose(r = new CompletableFutureInc());
2925 <        checkCompletedWithWrappedCFException(g);
2926 <    }
2913 >    public void testThenCompose_exceptionalCompletion() {
2914 >        for (ExecutionMode m : ExecutionMode.values())
2915 >        for (boolean createIncomplete : new boolean[] { true, false })
2916 >    {
2917 >        final CFException ex = new CFException();
2918 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2919 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2920 >        if (!createIncomplete) f.completeExceptionally(ex);
2921 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2922 >        if (createIncomplete) f.completeExceptionally(ex);
2923 >
2924 >        checkCompletedWithWrappedException(g, ex);
2925 >        checkCompletedExceptionally(f, ex);
2926 >        r.assertNotInvoked();
2927 >    }}
2928  
2929      /**
2930       * thenCompose result completes exceptionally if action does
2931       */
2932 <    public void testThenCompose3() {
2933 <        CompletableFuture<Integer> f, g;
2934 <        FailingCompletableFutureFunction r;
2935 <
2936 <        f = new CompletableFuture<>();
2937 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2938 <        f.complete(one);
2939 <        checkCompletedWithWrappedCFException(g);
2932 >    public void testThenCompose_actionFailed() {
2933 >        for (ExecutionMode m : ExecutionMode.values())
2934 >        for (boolean createIncomplete : new boolean[] { true, false })
2935 >        for (Integer v1 : new Integer[] { 1, null })
2936 >    {
2937 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2938 >        final FailingCompletableFutureFunction r
2939 >            = new FailingCompletableFutureFunction(m);
2940 >        if (!createIncomplete) assertTrue(f.complete(v1));
2941 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2942 >        if (createIncomplete) assertTrue(f.complete(v1));
2943  
1982        f = new CompletableFuture<>();
1983        f.complete(one);
1984        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2944          checkCompletedWithWrappedCFException(g);
2945 <    }
2945 >        checkCompletedNormally(f, v1);
2946 >    }}
2947  
2948      /**
2949       * thenCompose result completes exceptionally if source cancelled
2950       */
2951 <    public void testThenCompose4() {
2952 <        CompletableFuture<Integer> f, g;
2953 <        CompletableFutureInc r;
2954 <
2955 <        f = new CompletableFuture<>();
2956 <        g = f.thenCompose(r = new CompletableFutureInc());
2957 <        assertTrue(f.cancel(true));
2958 <        checkCompletedWithWrappedCancellationException(g);
2959 <
2960 <        f = new CompletableFuture<>();
2961 <        assertTrue(f.cancel(true));
2962 <        g = f.thenCompose(r = new CompletableFutureInc());
2963 <        checkCompletedWithWrappedCancellationException(g);
2004 <    }
2005 <
2006 <    // asyncs
2007 <
2008 <    /**
2009 <     * thenRunAsync result completes normally after normal completion of source
2010 <     */
2011 <    public void testThenRunAsync() {
2012 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2013 <        Noop r = new Noop();
2014 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2015 <        f.complete(null);
2016 <        checkCompletedNormally(g, null);
2017 <
2018 <        // reordered version
2019 <        f = new CompletableFuture<>();
2020 <        f.complete(null);
2021 <        r = new Noop();
2022 <        g = f.thenRunAsync(r);
2023 <        checkCompletedNormally(g, null);
2024 <    }
2025 <
2026 <    /**
2027 <     * thenRunAsync result completes exceptionally after exceptional
2028 <     * completion of source
2029 <     */
2030 <    public void testThenRunAsync2() {
2031 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2032 <        Noop r = new Noop();
2033 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2034 <        f.completeExceptionally(new CFException());
2035 <        try {
2036 <            g.join();
2037 <            shouldThrow();
2038 <        } catch (CompletionException success) {}
2039 <        checkCompletedWithWrappedCFException(g);
2040 <    }
2041 <
2042 <    /**
2043 <     * thenRunAsync result completes exceptionally if action does
2044 <     */
2045 <    public void testThenRunAsync3() {
2046 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2047 <        FailingNoop r = new FailingNoop();
2048 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2049 <        f.complete(null);
2050 <        checkCompletedWithWrappedCFException(g);
2051 <    }
2052 <
2053 <    /**
2054 <     * thenRunAsync result completes exceptionally if source cancelled
2055 <     */
2056 <    public void testThenRunAsync4() {
2057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2058 <        Noop r = new Noop();
2059 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2060 <        assertTrue(f.cancel(true));
2061 <        checkCompletedWithWrappedCancellationException(g);
2062 <    }
2063 <
2064 <    /**
2065 <     * thenApplyAsync result completes normally after normal completion of source
2066 <     */
2067 <    public void testThenApplyAsync() {
2068 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2069 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2070 <        f.complete(one);
2071 <        checkCompletedNormally(g, two);
2072 <    }
2073 <
2074 <    /**
2075 <     * thenApplyAsync result completes exceptionally after exceptional
2076 <     * completion of source
2077 <     */
2078 <    public void testThenApplyAsync2() {
2079 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2080 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2081 <        f.completeExceptionally(new CFException());
2082 <        checkCompletedWithWrappedCFException(g);
2083 <    }
2084 <
2085 <    /**
2086 <     * thenApplyAsync result completes exceptionally if action does
2087 <     */
2088 <    public void testThenApplyAsync3() {
2089 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2090 <        FailingFunction r = new FailingFunction();
2091 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2092 <        f.complete(null);
2093 <        checkCompletedWithWrappedCFException(g);
2094 <    }
2095 <
2096 <    /**
2097 <     * thenApplyAsync result completes exceptionally if source cancelled
2098 <     */
2099 <    public void testThenApplyAsync4() {
2100 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2101 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2102 <        assertTrue(f.cancel(true));
2103 <        checkCompletedWithWrappedCancellationException(g);
2104 <    }
2105 <
2106 <    /**
2107 <     * thenAcceptAsync result completes normally after normal
2108 <     * completion of source
2109 <     */
2110 <    public void testThenAcceptAsync() {
2111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2112 <        IncAction r = new IncAction();
2113 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2114 <        f.complete(one);
2115 <        checkCompletedNormally(g, null);
2116 <        assertEquals(r.value, 2);
2117 <    }
2118 <
2119 <    /**
2120 <     * thenAcceptAsync result completes exceptionally after exceptional
2121 <     * completion of source
2122 <     */
2123 <    public void testThenAcceptAsync2() {
2124 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2125 <        IncAction r = new IncAction();
2126 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2127 <        f.completeExceptionally(new CFException());
2128 <        checkCompletedWithWrappedCFException(g);
2129 <    }
2130 <
2131 <    /**
2132 <     * thenAcceptAsync result completes exceptionally if action does
2133 <     */
2134 <    public void testThenAcceptAsync3() {
2135 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2136 <        FailingConsumer r = new FailingConsumer();
2137 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2138 <        f.complete(null);
2139 <        checkCompletedWithWrappedCFException(g);
2140 <    }
2141 <
2142 <    /**
2143 <     * thenAcceptAsync result completes exceptionally if source cancelled
2144 <     */
2145 <    public void testThenAcceptAsync4() {
2146 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2147 <        IncAction r = new IncAction();
2148 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2149 <        assertTrue(f.cancel(true));
2150 <        checkCompletedWithWrappedCancellationException(g);
2151 <    }
2152 <
2153 <    /**
2154 <     * applyToEitherAsync result completes normally after normal
2155 <     * completion of sources
2156 <     */
2157 <    public void testApplyToEitherAsync() {
2158 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2159 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2160 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2161 <        f.complete(one);
2162 <        checkCompletedNormally(g, two);
2163 <
2164 <        f = new CompletableFuture<>();
2165 <        f.complete(one);
2166 <        f2 = new CompletableFuture<>();
2167 <        g = f.applyToEitherAsync(f2, inc);
2168 <        checkCompletedNormally(g, two);
2169 <    }
2170 <
2171 <    /**
2172 <     * applyToEitherAsync result completes exceptionally after exceptional
2173 <     * completion of source
2174 <     */
2175 <    public void testApplyToEitherAsync2() {
2176 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2177 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2178 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2179 <        f.completeExceptionally(new CFException());
2180 <        checkCompletedWithWrappedCFException(g);
2181 <
2182 <        f = new CompletableFuture<>();
2183 <        f2 = new CompletableFuture<>();
2184 <        f2.completeExceptionally(new CFException());
2185 <        g = f.applyToEitherAsync(f2, inc);
2186 <        f.complete(one);
2187 <        checkCompletedWithWrappedCFException(g);
2188 <    }
2189 <
2190 <    /**
2191 <     * applyToEitherAsync result completes exceptionally if action does
2192 <     */
2193 <    public void testApplyToEitherAsync3() {
2194 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2195 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2196 <        FailingFunction r = new FailingFunction();
2197 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2198 <        f.complete(one);
2199 <        checkCompletedWithWrappedCFException(g);
2200 <    }
2201 <
2202 <    /**
2203 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2204 <     */
2205 <    public void testApplyToEitherAsync4() {
2206 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2207 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2208 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2209 <        assertTrue(f.cancel(true));
2210 <        checkCompletedWithWrappedCancellationException(g);
2211 <
2212 <        f = new CompletableFuture<>();
2213 <        f2 = new CompletableFuture<>();
2214 <        assertTrue(f2.cancel(true));
2215 <        g = f.applyToEitherAsync(f2, inc);
2216 <        checkCompletedWithWrappedCancellationException(g);
2217 <    }
2218 <
2219 <    /**
2220 <     * acceptEitherAsync result completes normally after normal
2221 <     * completion of sources
2222 <     */
2223 <    public void testAcceptEitherAsync() {
2224 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2225 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2226 <        IncAction r = new IncAction();
2227 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2228 <        f.complete(one);
2229 <        checkCompletedNormally(g, null);
2230 <        assertEquals(r.value, 2);
2231 <
2232 <        r = new IncAction();
2233 <        f = new CompletableFuture<>();
2234 <        f.complete(one);
2235 <        f2 = new CompletableFuture<>();
2236 <        g = f.acceptEitherAsync(f2, r);
2237 <        checkCompletedNormally(g, null);
2238 <        assertEquals(r.value, 2);
2239 <    }
2240 <
2241 <    /**
2242 <     * acceptEitherAsync result completes exceptionally after exceptional
2243 <     * completion of source
2244 <     */
2245 <    public void testAcceptEitherAsync2() {
2246 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2247 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2248 <        IncAction r = new IncAction();
2249 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2250 <        f.completeExceptionally(new CFException());
2251 <        checkCompletedWithWrappedCFException(g);
2252 <
2253 <        r = new IncAction();
2254 <        f = new CompletableFuture<>();
2255 <        f2 = new CompletableFuture<>();
2256 <        f2.completeExceptionally(new CFException());
2257 <        g = f.acceptEitherAsync(f2, r);
2258 <        f.complete(one);
2259 <        checkCompletedWithWrappedCFException(g);
2260 <    }
2261 <
2262 <    /**
2263 <     * acceptEitherAsync result completes exceptionally if action does
2264 <     */
2265 <    public void testAcceptEitherAsync3() {
2266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2267 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2268 <        FailingConsumer r = new FailingConsumer();
2269 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2270 <        f.complete(one);
2271 <        checkCompletedWithWrappedCFException(g);
2272 <    }
2273 <
2274 <    /**
2275 <     * acceptEitherAsync result completes exceptionally if either
2276 <     * source cancelled
2277 <     */
2278 <    public void testAcceptEitherAsync4() {
2279 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2280 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2281 <        IncAction r = new IncAction();
2282 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2283 <        assertTrue(f.cancel(true));
2284 <        checkCompletedWithWrappedCancellationException(g);
2285 <
2286 <        r = new IncAction();
2287 <        f = new CompletableFuture<>();
2288 <        f2 = new CompletableFuture<>();
2289 <        assertTrue(f2.cancel(true));
2290 <        g = f.acceptEitherAsync(f2, r);
2291 <        checkCompletedWithWrappedCancellationException(g);
2292 <    }
2293 <
2294 <    /**
2295 <     * runAfterEitherAsync result completes normally after normal
2296 <     * completion of sources
2297 <     */
2298 <    public void testRunAfterEitherAsync() {
2299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2300 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2301 <        Noop r = new Noop();
2302 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2303 <        f.complete(one);
2304 <        checkCompletedNormally(g, null);
2305 <        assertTrue(r.ran);
2306 <
2307 <        r = new Noop();
2308 <        f = new CompletableFuture<>();
2309 <        f.complete(one);
2310 <        f2 = new CompletableFuture<>();
2311 <        g = f.runAfterEitherAsync(f2, r);
2312 <        checkCompletedNormally(g, null);
2313 <        assertTrue(r.ran);
2314 <    }
2315 <
2316 <    /**
2317 <     * runAfterEitherAsync result completes exceptionally after exceptional
2318 <     * completion of source
2319 <     */
2320 <    public void testRunAfterEitherAsync2() {
2321 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2322 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2323 <        Noop r = new Noop();
2324 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2325 <        f.completeExceptionally(new CFException());
2326 <        checkCompletedWithWrappedCFException(g);
2327 <
2328 <        r = new Noop();
2329 <        f = new CompletableFuture<>();
2330 <        f2 = new CompletableFuture<>();
2331 <        f2.completeExceptionally(new CFException());
2332 <        g = f.runAfterEitherAsync(f2, r);
2333 <        f.complete(one);
2334 <        checkCompletedWithWrappedCFException(g);
2335 <    }
2336 <
2337 <    /**
2338 <     * runAfterEitherAsync result completes exceptionally if action does
2339 <     */
2340 <    public void testRunAfterEitherAsync3() {
2341 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2342 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2343 <        FailingNoop r = new FailingNoop();
2344 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2345 <        f.complete(one);
2346 <        checkCompletedWithWrappedCFException(g);
2347 <    }
2348 <
2349 <    /**
2350 <     * runAfterEitherAsync result completes exceptionally if either
2351 <     * source cancelled
2352 <     */
2353 <    public void testRunAfterEitherAsync4() {
2354 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2355 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2356 <        Noop r = new Noop();
2357 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2358 <        assertTrue(f.cancel(true));
2359 <        checkCompletedWithWrappedCancellationException(g);
2360 <
2361 <        r = new Noop();
2362 <        f = new CompletableFuture<>();
2363 <        f2 = new CompletableFuture<>();
2364 <        assertTrue(f2.cancel(true));
2365 <        g = f.runAfterEitherAsync(f2, r);
2366 <        checkCompletedWithWrappedCancellationException(g);
2367 <    }
2368 <
2369 <    /**
2370 <     * thenComposeAsync result completes normally after normal
2371 <     * completion of source
2372 <     */
2373 <    public void testThenComposeAsync() {
2374 <        CompletableFuture<Integer> f, g;
2375 <        CompletableFutureInc r;
2376 <
2377 <        f = new CompletableFuture<>();
2378 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2379 <        f.complete(one);
2380 <        checkCompletedNormally(g, two);
2381 <
2382 <        f = new CompletableFuture<>();
2383 <        f.complete(one);
2384 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2385 <        checkCompletedNormally(g, two);
2386 <    }
2387 <
2388 <    /**
2389 <     * thenComposeAsync result completes exceptionally after
2390 <     * exceptional completion of source
2391 <     */
2392 <    public void testThenComposeAsync2() {
2393 <        CompletableFuture<Integer> f, g;
2394 <        CompletableFutureInc r;
2395 <
2396 <        f = new CompletableFuture<>();
2397 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2398 <        f.completeExceptionally(new CFException());
2399 <        checkCompletedWithWrappedCFException(g);
2400 <        assertFalse(r.ran);
2401 <
2402 <        f = new CompletableFuture<>();
2403 <        f.completeExceptionally(new CFException());
2404 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2405 <        checkCompletedWithWrappedCFException(g);
2406 <        assertFalse(r.ran);
2407 <    }
2408 <
2409 <    /**
2410 <     * thenComposeAsync result completes exceptionally if action does
2411 <     */
2412 <    public void testThenComposeAsync3() {
2413 <        CompletableFuture<Integer> f, g;
2414 <        FailingCompletableFutureFunction r;
2415 <
2416 <        f = new CompletableFuture<>();
2417 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2418 <        f.complete(one);
2419 <        checkCompletedWithWrappedCFException(g);
2420 <
2421 <        f = new CompletableFuture<>();
2422 <        f.complete(one);
2423 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2424 <        checkCompletedWithWrappedCFException(g);
2425 <    }
2426 <
2427 <    /**
2428 <     * thenComposeAsync result completes exceptionally if source cancelled
2429 <     */
2430 <    public void testThenComposeAsync4() {
2431 <        CompletableFuture<Integer> f, g;
2432 <        CompletableFutureInc r;
2433 <
2434 <        f = new CompletableFuture<>();
2435 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2436 <        assertTrue(f.cancel(true));
2437 <        checkCompletedWithWrappedCancellationException(g);
2438 <
2439 <        f = new CompletableFuture<>();
2440 <        assertTrue(f.cancel(true));
2441 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2442 <        checkCompletedWithWrappedCancellationException(g);
2443 <    }
2444 <
2445 <    // async with explicit executors
2446 <
2447 <    /**
2448 <     * thenRunAsync result completes normally after normal completion of source
2449 <     */
2450 <    public void testThenRunAsyncE() {
2451 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2452 <        Noop r = new Noop();
2453 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2454 <        f.complete(null);
2455 <        checkCompletedNormally(g, null);
2456 <
2457 <        // reordered version
2458 <        f = new CompletableFuture<>();
2459 <        f.complete(null);
2460 <        r = new Noop();
2461 <        g = f.thenRunAsync(r, new ThreadExecutor());
2462 <        checkCompletedNormally(g, null);
2463 <    }
2464 <
2465 <    /**
2466 <     * thenRunAsync result completes exceptionally after exceptional
2467 <     * completion of source
2468 <     */
2469 <    public void testThenRunAsync2E() {
2470 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2471 <        Noop r = new Noop();
2472 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2473 <        f.completeExceptionally(new CFException());
2474 <        try {
2475 <            g.join();
2476 <            shouldThrow();
2477 <        } catch (CompletionException success) {}
2478 <        checkCompletedWithWrappedCFException(g);
2479 <    }
2480 <
2481 <    /**
2482 <     * thenRunAsync result completes exceptionally if action does
2483 <     */
2484 <    public void testThenRunAsync3E() {
2485 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2486 <        FailingNoop r = new FailingNoop();
2487 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2488 <        f.complete(null);
2489 <        checkCompletedWithWrappedCFException(g);
2490 <    }
2491 <
2492 <    /**
2493 <     * thenRunAsync result completes exceptionally if source cancelled
2494 <     */
2495 <    public void testThenRunAsync4E() {
2496 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2497 <        Noop r = new Noop();
2498 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2499 <        assertTrue(f.cancel(true));
2500 <        checkCompletedWithWrappedCancellationException(g);
2501 <    }
2502 <
2503 <    /**
2504 <     * thenApplyAsync result completes normally after normal completion of source
2505 <     */
2506 <    public void testThenApplyAsyncE() {
2507 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2508 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2509 <        f.complete(one);
2510 <        checkCompletedNormally(g, two);
2511 <    }
2512 <
2513 <    /**
2514 <     * thenApplyAsync result completes exceptionally after exceptional
2515 <     * completion of source
2516 <     */
2517 <    public void testThenApplyAsync2E() {
2518 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2519 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2520 <        f.completeExceptionally(new CFException());
2521 <        checkCompletedWithWrappedCFException(g);
2522 <    }
2523 <
2524 <    /**
2525 <     * thenApplyAsync result completes exceptionally if action does
2526 <     */
2527 <    public void testThenApplyAsync3E() {
2528 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2529 <        FailingFunction r = new FailingFunction();
2530 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2531 <        f.complete(null);
2532 <        checkCompletedWithWrappedCFException(g);
2533 <    }
2534 <
2535 <    /**
2536 <     * thenApplyAsync result completes exceptionally if source cancelled
2537 <     */
2538 <    public void testThenApplyAsync4E() {
2539 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2540 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2541 <        assertTrue(f.cancel(true));
2542 <        checkCompletedWithWrappedCancellationException(g);
2543 <    }
2544 <
2545 <    /**
2546 <     * thenAcceptAsync result completes normally after normal
2547 <     * completion of source
2548 <     */
2549 <    public void testThenAcceptAsyncE() {
2550 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2551 <        IncAction r = new IncAction();
2552 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2553 <        f.complete(one);
2554 <        checkCompletedNormally(g, null);
2555 <        assertEquals(r.value, 2);
2556 <    }
2557 <
2558 <    /**
2559 <     * thenAcceptAsync result completes exceptionally after exceptional
2560 <     * completion of source
2561 <     */
2562 <    public void testThenAcceptAsync2E() {
2563 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2564 <        IncAction r = new IncAction();
2565 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2566 <        f.completeExceptionally(new CFException());
2567 <        checkCompletedWithWrappedCFException(g);
2568 <    }
2569 <
2570 <    /**
2571 <     * thenAcceptAsync result completes exceptionally if action does
2572 <     */
2573 <    public void testThenAcceptAsync3E() {
2574 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2575 <        FailingConsumer r = new FailingConsumer();
2576 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2577 <        f.complete(null);
2578 <        checkCompletedWithWrappedCFException(g);
2579 <    }
2580 <
2581 <    /**
2582 <     * thenAcceptAsync result completes exceptionally if source cancelled
2583 <     */
2584 <    public void testThenAcceptAsync4E() {
2585 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2586 <        IncAction r = new IncAction();
2587 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2588 <        assertTrue(f.cancel(true));
2589 <        checkCompletedWithWrappedCancellationException(g);
2590 <    }
2591 <
2592 <    /**
2593 <     * applyToEitherAsync result completes normally after normal
2594 <     * completion of sources
2595 <     */
2596 <    public void testApplyToEitherAsyncE() {
2597 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2598 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2599 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2600 <        f.complete(one);
2601 <        checkCompletedNormally(g, two);
2602 <
2603 <        f = new CompletableFuture<>();
2604 <        f.complete(one);
2605 <        f2 = new CompletableFuture<>();
2606 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2607 <        checkCompletedNormally(g, two);
2608 <    }
2609 <
2610 <    /**
2611 <     * applyToEitherAsync result completes exceptionally after exceptional
2612 <     * completion of source
2613 <     */
2614 <    public void testApplyToEitherAsync2E() {
2615 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2616 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2617 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2618 <        f.completeExceptionally(new CFException());
2619 <        checkCompletedWithWrappedCFException(g);
2620 <
2621 <        f = new CompletableFuture<>();
2622 <        f2 = new CompletableFuture<>();
2623 <        f2.completeExceptionally(new CFException());
2624 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2625 <        f.complete(one);
2626 <        checkCompletedWithWrappedCFException(g);
2627 <    }
2628 <
2629 <    /**
2630 <     * applyToEitherAsync result completes exceptionally if action does
2631 <     */
2632 <    public void testApplyToEitherAsync3E() {
2633 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2634 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2635 <        FailingFunction r = new FailingFunction();
2636 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2637 <        f.complete(one);
2638 <        checkCompletedWithWrappedCFException(g);
2639 <    }
2640 <
2641 <    /**
2642 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2643 <     */
2644 <    public void testApplyToEitherAsync4E() {
2645 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2646 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2647 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2648 <        assertTrue(f.cancel(true));
2649 <        checkCompletedWithWrappedCancellationException(g);
2650 <
2651 <        f = new CompletableFuture<>();
2652 <        f2 = new CompletableFuture<>();
2653 <        assertTrue(f2.cancel(true));
2654 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2655 <        checkCompletedWithWrappedCancellationException(g);
2656 <    }
2657 <
2658 <    /**
2659 <     * acceptEitherAsync result completes normally after normal
2660 <     * completion of sources
2661 <     */
2662 <    public void testAcceptEitherAsyncE() {
2663 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2664 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2665 <        IncAction r = new IncAction();
2666 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2667 <        f.complete(one);
2668 <        checkCompletedNormally(g, null);
2669 <        assertEquals(r.value, 2);
2670 <
2671 <        r = new IncAction();
2672 <        f = new CompletableFuture<>();
2673 <        f.complete(one);
2674 <        f2 = new CompletableFuture<>();
2675 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2676 <        checkCompletedNormally(g, null);
2677 <        assertEquals(r.value, 2);
2678 <    }
2679 <
2680 <    /**
2681 <     * acceptEitherAsync result completes exceptionally after exceptional
2682 <     * completion of source
2683 <     */
2684 <    public void testAcceptEitherAsync2E() {
2685 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2686 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2687 <        IncAction r = new IncAction();
2688 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2689 <        f.completeExceptionally(new CFException());
2690 <        checkCompletedWithWrappedCFException(g);
2691 <
2692 <        r = new IncAction();
2693 <        f = new CompletableFuture<>();
2694 <        f2 = new CompletableFuture<>();
2695 <        f2.completeExceptionally(new CFException());
2696 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2697 <        f.complete(one);
2698 <        checkCompletedWithWrappedCFException(g);
2699 <    }
2700 <
2701 <    /**
2702 <     * acceptEitherAsync result completes exceptionally if action does
2703 <     */
2704 <    public void testAcceptEitherAsync3E() {
2705 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2706 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2707 <        FailingConsumer r = new FailingConsumer();
2708 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2709 <        f.complete(one);
2710 <        checkCompletedWithWrappedCFException(g);
2711 <    }
2712 <
2713 <    /**
2714 <     * acceptEitherAsync result completes exceptionally if either
2715 <     * source cancelled
2716 <     */
2717 <    public void testAcceptEitherAsync4E() {
2718 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2719 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2720 <        IncAction r = new IncAction();
2721 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2722 <        assertTrue(f.cancel(true));
2723 <        checkCompletedWithWrappedCancellationException(g);
2724 <
2725 <        r = new IncAction();
2726 <        f = new CompletableFuture<>();
2727 <        f2 = new CompletableFuture<>();
2728 <        assertTrue(f2.cancel(true));
2729 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2730 <        checkCompletedWithWrappedCancellationException(g);
2731 <    }
2732 <
2733 <    /**
2734 <     * runAfterEitherAsync result completes normally after normal
2735 <     * completion of sources
2736 <     */
2737 <    public void testRunAfterEitherAsyncE() {
2738 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2739 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2740 <        Noop r = new Noop();
2741 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2742 <        f.complete(one);
2743 <        checkCompletedNormally(g, null);
2744 <        assertTrue(r.ran);
2745 <
2746 <        r = new Noop();
2747 <        f = new CompletableFuture<>();
2748 <        f.complete(one);
2749 <        f2 = new CompletableFuture<>();
2750 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2751 <        checkCompletedNormally(g, null);
2752 <        assertTrue(r.ran);
2753 <    }
2754 <
2755 <    /**
2756 <     * runAfterEitherAsync result completes exceptionally after exceptional
2757 <     * completion of source
2758 <     */
2759 <    public void testRunAfterEitherAsync2E() {
2760 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2761 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2762 <        Noop r = new Noop();
2763 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2764 <        f.completeExceptionally(new CFException());
2765 <        checkCompletedWithWrappedCFException(g);
2766 <
2767 <        r = new Noop();
2768 <        f = new CompletableFuture<>();
2769 <        f2 = new CompletableFuture<>();
2770 <        f2.completeExceptionally(new CFException());
2771 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2772 <        f.complete(one);
2773 <        checkCompletedWithWrappedCFException(g);
2774 <    }
2775 <
2776 <    /**
2777 <     * runAfterEitherAsync result completes exceptionally if action does
2778 <     */
2779 <    public void testRunAfterEitherAsync3E() {
2780 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2781 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2782 <        FailingNoop r = new FailingNoop();
2783 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2784 <        f.complete(one);
2785 <        checkCompletedWithWrappedCFException(g);
2786 <    }
2787 <
2788 <    /**
2789 <     * runAfterEitherAsync result completes exceptionally if either
2790 <     * source cancelled
2791 <     */
2792 <    public void testRunAfterEitherAsync4E() {
2793 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2794 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2795 <        Noop r = new Noop();
2796 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2797 <        assertTrue(f.cancel(true));
2798 <        checkCompletedWithWrappedCancellationException(g);
2951 >    public void testThenCompose_sourceCancelled() {
2952 >        for (ExecutionMode m : ExecutionMode.values())
2953 >        for (boolean createIncomplete : new boolean[] { true, false })
2954 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2955 >    {
2956 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2957 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2958 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2959 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2960 >        if (createIncomplete) {
2961 >            checkIncomplete(g);
2962 >            assertTrue(f.cancel(mayInterruptIfRunning));
2963 >        }
2964  
2800        r = new Noop();
2801        f = new CompletableFuture<>();
2802        f2 = new CompletableFuture<>();
2803        assertTrue(f2.cancel(true));
2804        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2965          checkCompletedWithWrappedCancellationException(g);
2966 <    }
2967 <
2808 <    /**
2809 <     * thenComposeAsync result completes normally after normal
2810 <     * completion of source
2811 <     */
2812 <    public void testThenComposeAsyncE() {
2813 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2814 <        CompletableFutureInc r = new CompletableFutureInc();
2815 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2816 <        f.complete(one);
2817 <        checkCompletedNormally(g, two);
2818 <    }
2819 <
2820 <    /**
2821 <     * thenComposeAsync result completes exceptionally after
2822 <     * exceptional completion of source
2823 <     */
2824 <    public void testThenComposeAsync2E() {
2825 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2826 <        CompletableFutureInc r = new CompletableFutureInc();
2827 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2828 <        f.completeExceptionally(new CFException());
2829 <        checkCompletedWithWrappedCFException(g);
2830 <    }
2966 >        checkCancelled(f);
2967 >    }}
2968  
2969      /**
2970 <     * thenComposeAsync result completes exceptionally if action does
2970 >     * thenCompose result completes exceptionally if the result of the action does
2971       */
2972 <    public void testThenComposeAsync3E() {
2973 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2974 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2975 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2976 <        f.complete(one);
2977 <        checkCompletedWithWrappedCFException(g);
2978 <    }
2972 >    public void testThenCompose_actionReturnsFailingFuture() {
2973 >        for (ExecutionMode m : ExecutionMode.values())
2974 >        for (int order = 0; order < 6; order++)
2975 >        for (Integer v1 : new Integer[] { 1, null })
2976 >    {
2977 >        final CFException ex = new CFException();
2978 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2979 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2980 >        final CompletableFuture<Integer> h;
2981 >        // Test all permutations of orders
2982 >        switch (order) {
2983 >        case 0:
2984 >            assertTrue(f.complete(v1));
2985 >            assertTrue(g.completeExceptionally(ex));
2986 >            h = m.thenCompose(f, (x -> g));
2987 >            break;
2988 >        case 1:
2989 >            assertTrue(f.complete(v1));
2990 >            h = m.thenCompose(f, (x -> g));
2991 >            assertTrue(g.completeExceptionally(ex));
2992 >            break;
2993 >        case 2:
2994 >            assertTrue(g.completeExceptionally(ex));
2995 >            assertTrue(f.complete(v1));
2996 >            h = m.thenCompose(f, (x -> g));
2997 >            break;
2998 >        case 3:
2999 >            assertTrue(g.completeExceptionally(ex));
3000 >            h = m.thenCompose(f, (x -> g));
3001 >            assertTrue(f.complete(v1));
3002 >            break;
3003 >        case 4:
3004 >            h = m.thenCompose(f, (x -> g));
3005 >            assertTrue(f.complete(v1));
3006 >            assertTrue(g.completeExceptionally(ex));
3007 >            break;
3008 >        case 5:
3009 >            h = m.thenCompose(f, (x -> g));
3010 >            assertTrue(f.complete(v1));
3011 >            assertTrue(g.completeExceptionally(ex));
3012 >            break;
3013 >        default: throw new AssertionError();
3014 >        }
3015  
3016 <    /**
3017 <     * thenComposeAsync result completes exceptionally if source cancelled
3018 <     */
3019 <    public void testThenComposeAsync4E() {
2847 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2848 <        CompletableFutureInc r = new CompletableFutureInc();
2849 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2850 <        assertTrue(f.cancel(true));
2851 <        checkCompletedWithWrappedCancellationException(g);
2852 <    }
3016 >        checkCompletedExceptionally(g, ex);
3017 >        checkCompletedWithWrappedException(h, ex);
3018 >        checkCompletedNormally(f, v1);
3019 >    }}
3020  
3021      // other static methods
3022  
# Line 2867 | Line 3034 | public class CompletableFutureTest exten
3034       * when all components complete normally
3035       */
3036      public void testAllOf_normal() throws Exception {
3037 <        for (int k = 1; k < 20; ++k) {
3038 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3039 <            for (int i = 0; i < k; ++i)
3037 >        for (int k = 1; k < 10; k++) {
3038 >            CompletableFuture<Integer>[] fs
3039 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3040 >            for (int i = 0; i < k; i++)
3041                  fs[i] = new CompletableFuture<>();
3042              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3043 <            for (int i = 0; i < k; ++i) {
3043 >            for (int i = 0; i < k; i++) {
3044                  checkIncomplete(f);
3045                  checkIncomplete(CompletableFuture.allOf(fs));
3046                  fs[i].complete(one);
# Line 2882 | Line 3050 | public class CompletableFutureTest exten
3050          }
3051      }
3052  
3053 +    public void testAllOf_backwards() throws Exception {
3054 +        for (int k = 1; k < 10; k++) {
3055 +            CompletableFuture<Integer>[] fs
3056 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3057 +            for (int i = 0; i < k; i++)
3058 +                fs[i] = new CompletableFuture<>();
3059 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3060 +            for (int i = k - 1; i >= 0; i--) {
3061 +                checkIncomplete(f);
3062 +                checkIncomplete(CompletableFuture.allOf(fs));
3063 +                fs[i].complete(one);
3064 +            }
3065 +            checkCompletedNormally(f, null);
3066 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3067 +        }
3068 +    }
3069 +
3070 +    public void testAllOf_exceptional() throws Exception {
3071 +        for (int k = 1; k < 10; k++) {
3072 +            CompletableFuture<Integer>[] fs
3073 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3074 +            CFException ex = new CFException();
3075 +            for (int i = 0; i < k; i++)
3076 +                fs[i] = new CompletableFuture<>();
3077 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3078 +            for (int i = 0; i < k; i++) {
3079 +                checkIncomplete(f);
3080 +                checkIncomplete(CompletableFuture.allOf(fs));
3081 +                if (i != k / 2) {
3082 +                    fs[i].complete(i);
3083 +                    checkCompletedNormally(fs[i], i);
3084 +                } else {
3085 +                    fs[i].completeExceptionally(ex);
3086 +                    checkCompletedExceptionally(fs[i], ex);
3087 +                }
3088 +            }
3089 +            checkCompletedWithWrappedException(f, ex);
3090 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3091 +        }
3092 +    }
3093 +
3094      /**
3095       * anyOf(no component futures) returns an incomplete future
3096       */
3097      public void testAnyOf_empty() throws Exception {
3098 +        for (Integer v1 : new Integer[] { 1, null })
3099 +    {
3100          CompletableFuture<Object> f = CompletableFuture.anyOf();
3101          checkIncomplete(f);
3102 <    }
3102 >
3103 >        f.complete(v1);
3104 >        checkCompletedNormally(f, v1);
3105 >    }}
3106  
3107      /**
3108       * anyOf returns a future completed normally with a value when
3109       * a component future does
3110       */
3111      public void testAnyOf_normal() throws Exception {
3112 <        for (int k = 0; k < 10; ++k) {
3112 >        for (int k = 0; k < 10; k++) {
3113              CompletableFuture[] fs = new CompletableFuture[k];
3114 <            for (int i = 0; i < k; ++i)
3114 >            for (int i = 0; i < k; i++)
3115                  fs[i] = new CompletableFuture<>();
3116              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3117              checkIncomplete(f);
3118 <            for (int i = 0; i < k; ++i) {
3119 <                fs[i].complete(one);
3120 <                checkCompletedNormally(f, one);
3121 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3118 >            for (int i = 0; i < k; i++) {
3119 >                fs[i].complete(i);
3120 >                checkCompletedNormally(f, 0);
3121 >                int x = (int) CompletableFuture.anyOf(fs).join();
3122 >                assertTrue(0 <= x && x <= i);
3123 >            }
3124 >        }
3125 >    }
3126 >    public void testAnyOf_normal_backwards() throws Exception {
3127 >        for (int k = 0; k < 10; k++) {
3128 >            CompletableFuture[] fs = new CompletableFuture[k];
3129 >            for (int i = 0; i < k; i++)
3130 >                fs[i] = new CompletableFuture<>();
3131 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3132 >            checkIncomplete(f);
3133 >            for (int i = k - 1; i >= 0; i--) {
3134 >                fs[i].complete(i);
3135 >                checkCompletedNormally(f, k - 1);
3136 >                int x = (int) CompletableFuture.anyOf(fs).join();
3137 >                assertTrue(i <= x && x <= k - 1);
3138              }
3139          }
3140      }
# Line 2913 | Line 3143 | public class CompletableFutureTest exten
3143       * anyOf result completes exceptionally when any component does.
3144       */
3145      public void testAnyOf_exceptional() throws Exception {
3146 <        for (int k = 0; k < 10; ++k) {
3146 >        for (int k = 0; k < 10; k++) {
3147 >            CompletableFuture[] fs = new CompletableFuture[k];
3148 >            CFException[] exs = new CFException[k];
3149 >            for (int i = 0; i < k; i++) {
3150 >                fs[i] = new CompletableFuture<>();
3151 >                exs[i] = new CFException();
3152 >            }
3153 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3154 >            checkIncomplete(f);
3155 >            for (int i = 0; i < k; i++) {
3156 >                fs[i].completeExceptionally(exs[i]);
3157 >                checkCompletedWithWrappedException(f, exs[0]);
3158 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3159 >            }
3160 >        }
3161 >    }
3162 >
3163 >    public void testAnyOf_exceptional_backwards() throws Exception {
3164 >        for (int k = 0; k < 10; k++) {
3165              CompletableFuture[] fs = new CompletableFuture[k];
3166 <            for (int i = 0; i < k; ++i)
3166 >            CFException[] exs = new CFException[k];
3167 >            for (int i = 0; i < k; i++) {
3168                  fs[i] = new CompletableFuture<>();
3169 +                exs[i] = new CFException();
3170 +            }
3171              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3172              checkIncomplete(f);
3173 <            for (int i = 0; i < k; ++i) {
3174 <                fs[i].completeExceptionally(new CFException());
3175 <                checkCompletedWithWrappedCFException(f);
3173 >            for (int i = k - 1; i >= 0; i--) {
3174 >                fs[i].completeExceptionally(exs[i]);
3175 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3176                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3177              }
3178          }
# Line 2934 | Line 3185 | public class CompletableFutureTest exten
3185          CompletableFuture<Integer> f = new CompletableFuture<>();
3186          CompletableFuture<Integer> g = new CompletableFuture<>();
3187          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2937        CompletableFuture<?> h;
3188          ThreadExecutor exec = new ThreadExecutor();
3189  
3190          Runnable[] throwingActions = {
3191              () -> CompletableFuture.supplyAsync(null),
3192              () -> CompletableFuture.supplyAsync(null, exec),
3193 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3193 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3194  
3195              () -> CompletableFuture.runAsync(null),
3196              () -> CompletableFuture.runAsync(null, exec),
# Line 3013 | Line 3263 | public class CompletableFutureTest exten
3263  
3264              () -> f.thenCompose(null),
3265              () -> f.thenComposeAsync(null),
3266 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3266 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3267              () -> f.thenComposeAsync(null, exec),
3268  
3269              () -> f.exceptionally(null),
# Line 3031 | Line 3281 | public class CompletableFutureTest exten
3281              () -> CompletableFuture.anyOf(null, f),
3282  
3283              () -> f.obtrudeException(null),
3284 +
3285 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3286 +            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3287 +            () -> CompletableFuture.delayedExecutor(1L, null),
3288 +
3289 +            () -> f.orTimeout(1L, null),
3290 +            () -> f.completeOnTimeout(42, 1L, null),
3291 +
3292 +            () -> CompletableFuture.failedFuture(null),
3293 +            () -> CompletableFuture.failedStage(null),
3294          };
3295  
3296          assertThrows(NullPointerException.class, throwingActions);
# Line 3045 | Line 3305 | public class CompletableFutureTest exten
3305          assertSame(f, f.toCompletableFuture());
3306      }
3307  
3308 +    // jdk9
3309 +
3310      /**
3311 <     * whenComplete action executes on normal completion, propagating
3050 <     * source result.
3311 >     * newIncompleteFuture returns an incomplete CompletableFuture
3312       */
3313 <    public void testWhenComplete1() {
3314 <        final AtomicInteger a = new AtomicInteger();
3313 >    public void testNewIncompleteFuture() {
3314 >        for (Integer v1 : new Integer[] { 1, null })
3315 >    {
3316          CompletableFuture<Integer> f = new CompletableFuture<>();
3317 <        CompletableFuture<Integer> g =
3318 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3319 <        f.complete(three);
3320 <        checkCompletedNormally(f, three);
3321 <        checkCompletedNormally(g, three);
3322 <        assertEquals(a.get(), 1);
3317 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3318 >        checkIncomplete(f);
3319 >        checkIncomplete(g);
3320 >        f.complete(v1);
3321 >        checkCompletedNormally(f, v1);
3322 >        checkIncomplete(g);
3323 >        g.complete(v1);
3324 >        checkCompletedNormally(g, v1);
3325 >        assertSame(g.getClass(), CompletableFuture.class);
3326 >    }}
3327 >
3328 >    /**
3329 >     * completedStage returns a completed CompletionStage
3330 >     */
3331 >    public void testCompletedStage() {
3332 >        AtomicInteger x = new AtomicInteger(0);
3333 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3334 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3335 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3336 >        assertEquals(x.get(), 1);
3337 >        assertNull(r.get());
3338      }
3339  
3340      /**
3341 <     * whenComplete action executes on exceptional completion, propagating
3342 <     * source result.
3341 >     * defaultExecutor by default returns the commonPool if
3342 >     * it supports more than one thread.
3343       */
3344 <    public void testWhenComplete2() {
3068 <        final AtomicInteger a = new AtomicInteger();
3344 >    public void testDefaultExecutor() {
3345          CompletableFuture<Integer> f = new CompletableFuture<>();
3346 <        CompletableFuture<Integer> g =
3347 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3348 <        f.completeExceptionally(new CFException());
3349 <        assertTrue(f.isCompletedExceptionally());
3350 <        assertTrue(g.isCompletedExceptionally());
3351 <        assertEquals(a.get(), 1);
3346 >        Executor e = f.defaultExecutor();
3347 >        Executor c = ForkJoinPool.commonPool();
3348 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3349 >            assertSame(e, c);
3350 >        else
3351 >            assertNotSame(e, c);
3352      }
3353  
3354      /**
3355 <     * If a whenComplete action throws an exception when triggered by
3356 <     * a normal completion, it completes exceptionally
3355 >     * failedFuture returns a CompletableFuture completed
3356 >     * exceptionally with the given Exception
3357       */
3358 <    public void testWhenComplete3() {
3359 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3360 <        CompletableFuture<Integer> g =
3361 <            f.whenComplete((Integer x, Throwable t) ->
3086 <                           { throw new CFException(); } );
3087 <        f.complete(three);
3088 <        checkCompletedNormally(f, three);
3089 <        assertTrue(g.isCompletedExceptionally());
3090 <        checkCompletedWithWrappedCFException(g);
3358 >    public void testFailedFuture() {
3359 >        CFException ex = new CFException();
3360 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3361 >        checkCompletedExceptionally(f, ex);
3362      }
3363  
3364      /**
3365 <     * whenCompleteAsync action executes on normal completion, propagating
3095 <     * source result.
3365 >     * failedFuture(null) throws NPE
3366       */
3367 <    public void testWhenCompleteAsync1() {
3368 <        final AtomicInteger a = new AtomicInteger();
3369 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3370 <        CompletableFuture<Integer> g =
3371 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3102 <        f.complete(three);
3103 <        checkCompletedNormally(f, three);
3104 <        checkCompletedNormally(g, three);
3105 <        assertEquals(a.get(), 1);
3367 >    public void testFailedFuture_null() {
3368 >        try {
3369 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3370 >            shouldThrow();
3371 >        } catch (NullPointerException success) {}
3372      }
3373  
3374      /**
3375 <     * whenCompleteAsync action executes on exceptional completion, propagating
3376 <     * source result.
3375 >     * copy returns a CompletableFuture that is completed normally,
3376 >     * with the same value, when source is.
3377       */
3378 <    public void testWhenCompleteAsync2() {
3113 <        final AtomicInteger a = new AtomicInteger();
3378 >    public void testCopy() {
3379          CompletableFuture<Integer> f = new CompletableFuture<>();
3380 <        CompletableFuture<Integer> g =
3381 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3382 <        f.completeExceptionally(new CFException());
3383 <        checkCompletedWithWrappedCFException(f);
3384 <        checkCompletedWithWrappedCFException(g);
3380 >        CompletableFuture<Integer> g = f.copy();
3381 >        checkIncomplete(f);
3382 >        checkIncomplete(g);
3383 >        f.complete(1);
3384 >        checkCompletedNormally(f, 1);
3385 >        checkCompletedNormally(g, 1);
3386      }
3387  
3388      /**
3389 <     * If a whenCompleteAsync action throws an exception when
3390 <     * triggered by a normal completion, it completes exceptionally
3389 >     * copy returns a CompletableFuture that is completed exceptionally
3390 >     * when source is.
3391       */
3392 <    public void testWhenCompleteAsync3() {
3392 >    public void testCopy2() {
3393          CompletableFuture<Integer> f = new CompletableFuture<>();
3394 <        CompletableFuture<Integer> g =
3395 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3396 <                           { throw new CFException(); } );
3397 <        f.complete(three);
3398 <        checkCompletedNormally(f, three);
3399 <        checkCompletedWithWrappedCFException(g);
3394 >        CompletableFuture<Integer> g = f.copy();
3395 >        checkIncomplete(f);
3396 >        checkIncomplete(g);
3397 >        CFException ex = new CFException();
3398 >        f.completeExceptionally(ex);
3399 >        checkCompletedExceptionally(f, ex);
3400 >        checkCompletedWithWrappedException(g, ex);
3401      }
3402  
3403      /**
3404 <     * whenCompleteAsync action executes on normal completion, propagating
3405 <     * source result.
3404 >     * minimalCompletionStage returns a CompletableFuture that is
3405 >     * completed normally, with the same value, when source is.
3406       */
3407 <    public void testWhenCompleteAsync1e() {
3141 <        final AtomicInteger a = new AtomicInteger();
3142 <        ThreadExecutor exec = new ThreadExecutor();
3407 >    public void testMinimalCompletionStage() {
3408          CompletableFuture<Integer> f = new CompletableFuture<>();
3409 <        CompletableFuture<Integer> g =
3410 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3411 <                                exec);
3412 <        f.complete(three);
3413 <        checkCompletedNormally(f, three);
3414 <        checkCompletedNormally(g, three);
3415 <        assertEquals(a.get(), 1);
3409 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3410 >        AtomicInteger x = new AtomicInteger(0);
3411 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3412 >        checkIncomplete(f);
3413 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3414 >        f.complete(1);
3415 >        checkCompletedNormally(f, 1);
3416 >        assertEquals(x.get(), 1);
3417 >        assertNull(r.get());
3418      }
3419  
3420      /**
3421 <     * whenCompleteAsync action executes on exceptional completion, propagating
3422 <     * source result.
3421 >     * minimalCompletionStage returns a CompletableFuture that is
3422 >     * completed exceptionally when source is.
3423       */
3424 <    public void testWhenCompleteAsync2e() {
3158 <        final AtomicInteger a = new AtomicInteger();
3159 <        ThreadExecutor exec = new ThreadExecutor();
3424 >    public void testMinimalCompletionStage2() {
3425          CompletableFuture<Integer> f = new CompletableFuture<>();
3426 <        CompletableFuture<Integer> g =
3427 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3428 <                                exec);
3429 <        f.completeExceptionally(new CFException());
3430 <        checkCompletedWithWrappedCFException(f);
3431 <        checkCompletedWithWrappedCFException(g);
3426 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3427 >        AtomicInteger x = new AtomicInteger(0);
3428 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3429 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3430 >        checkIncomplete(f);
3431 >        CFException ex = new CFException();
3432 >        f.completeExceptionally(ex);
3433 >        checkCompletedExceptionally(f, ex);
3434 >        assertEquals(x.get(), 0);
3435 >        assertEquals(r.get().getCause(), ex);
3436      }
3437  
3438      /**
3439 <     * If a whenCompleteAsync action throws an exception when triggered
3440 <     * by a normal completion, it completes exceptionally
3439 >     * failedStage returns a CompletionStage completed
3440 >     * exceptionally with the given Exception
3441       */
3442 <    public void testWhenCompleteAsync3e() {
3443 <        ThreadExecutor exec = new ThreadExecutor();
3442 >    public void testFailedStage() {
3443 >        CFException ex = new CFException();
3444 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3445 >        AtomicInteger x = new AtomicInteger(0);
3446 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3447 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3448 >        assertEquals(x.get(), 0);
3449 >        assertEquals(r.get(), ex);
3450 >    }
3451 >
3452 >    /**
3453 >     * completeAsync completes with value of given supplier
3454 >     */
3455 >    public void testCompleteAsync() {
3456 >        for (Integer v1 : new Integer[] { 1, null })
3457 >    {
3458          CompletableFuture<Integer> f = new CompletableFuture<>();
3459 <        CompletableFuture<Integer> g =
3460 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3461 <                                { throw new CFException(); },
3462 <                                exec);
3463 <        f.complete(three);
3464 <        checkCompletedNormally(f, three);
3465 <        checkCompletedWithWrappedCFException(g);
3459 >        f.completeAsync(() -> v1);
3460 >        f.join();
3461 >        checkCompletedNormally(f, v1);
3462 >    }}
3463 >
3464 >    /**
3465 >     * completeAsync completes exceptionally if given supplier throws
3466 >     */
3467 >    public void testCompleteAsync2() {
3468 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3469 >        CFException ex = new CFException();
3470 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3471 >        try {
3472 >            f.join();
3473 >            shouldThrow();
3474 >        } catch (CompletionException success) {}
3475 >        checkCompletedWithWrappedException(f, ex);
3476      }
3477  
3478      /**
3479 <     * handleAsync action completes normally with function value on
3187 <     * either normal or exceptional completion of source
3479 >     * completeAsync with given executor completes with value of given supplier
3480       */
3481 <    public void testHandleAsync() {
3482 <        CompletableFuture<Integer> f, g;
3483 <        IntegerHandler r;
3481 >    public void testCompleteAsync3() {
3482 >        for (Integer v1 : new Integer[] { 1, null })
3483 >    {
3484 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3485 >        ThreadExecutor executor = new ThreadExecutor();
3486 >        f.completeAsync(() -> v1, executor);
3487 >        assertSame(v1, f.join());
3488 >        checkCompletedNormally(f, v1);
3489 >        assertEquals(1, executor.count.get());
3490 >    }}
3491  
3492 <        f = new CompletableFuture<>();
3493 <        g = f.handleAsync(r = new IntegerHandler());
3494 <        assertFalse(r.ran);
3495 <        f.completeExceptionally(new CFException());
3496 <        checkCompletedWithWrappedCFException(f);
3497 <        checkCompletedNormally(g, three);
3498 <        assertTrue(r.ran);
3492 >    /**
3493 >     * completeAsync with given executor completes exceptionally if
3494 >     * given supplier throws
3495 >     */
3496 >    public void testCompleteAsync4() {
3497 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3498 >        CFException ex = new CFException();
3499 >        ThreadExecutor executor = new ThreadExecutor();
3500 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3501 >        try {
3502 >            f.join();
3503 >            shouldThrow();
3504 >        } catch (CompletionException success) {}
3505 >        checkCompletedWithWrappedException(f, ex);
3506 >        assertEquals(1, executor.count.get());
3507 >    }
3508  
3509 <        f = new CompletableFuture<>();
3510 <        g = f.handleAsync(r = new IntegerHandler());
3511 <        assertFalse(r.ran);
3512 <        f.completeExceptionally(new CFException());
3513 <        checkCompletedWithWrappedCFException(f);
3514 <        checkCompletedNormally(g, three);
3515 <        assertTrue(r.ran);
3509 >    /**
3510 >     * orTimeout completes with TimeoutException if not complete
3511 >     */
3512 >    public void testOrTimeout_timesOut() {
3513 >        long timeoutMillis = timeoutMillis();
3514 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3515 >        long startTime = System.nanoTime();
3516 >        f.orTimeout(timeoutMillis, MILLISECONDS);
3517 >        checkCompletedWithTimeoutException(f);
3518 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3519 >    }
3520  
3521 <        f = new CompletableFuture<>();
3522 <        g = f.handleAsync(r = new IntegerHandler());
3523 <        assertFalse(r.ran);
3524 <        f.complete(one);
3525 <        checkCompletedNormally(f, one);
3526 <        checkCompletedNormally(g, two);
3527 <        assertTrue(r.ran);
3521 >    /**
3522 >     * orTimeout completes normally if completed before timeout
3523 >     */
3524 >    public void testOrTimeout_completed() {
3525 >        for (Integer v1 : new Integer[] { 1, null })
3526 >    {
3527 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3528 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3529 >        long startTime = System.nanoTime();
3530 >        f.complete(v1);
3531 >        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3532 >        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3533 >        g.complete(v1);
3534 >        checkCompletedNormally(f, v1);
3535 >        checkCompletedNormally(g, v1);
3536 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3537 >    }}
3538  
3539 <        f = new CompletableFuture<>();
3540 <        g = f.handleAsync(r = new IntegerHandler());
3541 <        assertFalse(r.ran);
3542 <        f.complete(one);
3543 <        checkCompletedNormally(f, one);
3544 <        checkCompletedNormally(g, two);
3545 <        assertTrue(r.ran);
3539 >    /**
3540 >     * completeOnTimeout completes with given value if not complete
3541 >     */
3542 >    public void testCompleteOnTimeout_timesOut() {
3543 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3544 >                       () -> testCompleteOnTimeout_timesOut(null));
3545 >    }
3546 >
3547 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3548 >        long timeoutMillis = timeoutMillis();
3549 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3550 >        long startTime = System.nanoTime();
3551 >        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3552 >        assertSame(v, f.join());
3553 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3554 >        f.complete(99);         // should have no effect
3555 >        checkCompletedNormally(f, v);
3556      }
3557  
3558      /**
3559 <     * handleAsync action with Executor completes normally with
3228 <     * function value on either normal or exceptional completion of
3229 <     * source
3559 >     * completeOnTimeout has no effect if completed within timeout
3560       */
3561 <    public void testHandleAsync2() {
3562 <        CompletableFuture<Integer> f, g;
3563 <        ThreadExecutor exec = new ThreadExecutor();
3564 <        IntegerHandler r;
3561 >    public void testCompleteOnTimeout_completed() {
3562 >        for (Integer v1 : new Integer[] { 1, null })
3563 >    {
3564 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3565 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3566 >        long startTime = System.nanoTime();
3567 >        f.complete(v1);
3568 >        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3569 >        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3570 >        g.complete(v1);
3571 >        checkCompletedNormally(f, v1);
3572 >        checkCompletedNormally(g, v1);
3573 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3574 >    }}
3575  
3576 <        f = new CompletableFuture<>();
3577 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3578 <        assertFalse(r.ran);
3579 <        f.completeExceptionally(new CFException());
3580 <        checkCompletedWithWrappedCFException(f);
3581 <        checkCompletedNormally(g, three);
3582 <        assertTrue(r.ran);
3576 >    /**
3577 >     * delayedExecutor returns an executor that delays submission
3578 >     */
3579 >    public void testDelayedExecutor() {
3580 >        testInParallel(() -> testDelayedExecutor(null, null),
3581 >                       () -> testDelayedExecutor(null, 1),
3582 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3583 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3584 >    }
3585 >
3586 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3587 >        long timeoutMillis = timeoutMillis();
3588 >        // Use an "unreasonably long" long timeout to catch lingering threads
3589 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3590 >        final Executor delayer, longDelayer;
3591 >        if (executor == null) {
3592 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3593 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3594 >        } else {
3595 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3596 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3597 >        }
3598 >        long startTime = System.nanoTime();
3599 >        CompletableFuture<Integer> f =
3600 >            CompletableFuture.supplyAsync(() -> v, delayer);
3601 >        CompletableFuture<Integer> g =
3602 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3603  
3604 <        f = new CompletableFuture<>();
3245 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3246 <        assertFalse(r.ran);
3247 <        f.completeExceptionally(new CFException());
3248 <        checkCompletedWithWrappedCFException(f);
3249 <        checkCompletedNormally(g, three);
3250 <        assertTrue(r.ran);
3604 >        assertNull(g.getNow(null));
3605  
3606 <        f = new CompletableFuture<>();
3607 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3608 <        assertFalse(r.ran);
3609 <        f.complete(one);
3256 <        checkCompletedNormally(f, one);
3257 <        checkCompletedNormally(g, two);
3258 <        assertTrue(r.ran);
3606 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3607 >        long millisElapsed = millisElapsedSince(startTime);
3608 >        assertTrue(millisElapsed >= timeoutMillis);
3609 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3610  
3611 <        f = new CompletableFuture<>();
3612 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3613 <        assertFalse(r.ran);
3614 <        f.complete(one);
3615 <        checkCompletedNormally(f, one);
3616 <        checkCompletedNormally(g, two);
3617 <        assertTrue(r.ran);
3611 >        checkCompletedNormally(f, v);
3612 >
3613 >        checkIncomplete(g);
3614 >        assertTrue(g.cancel(true));
3615 >    }
3616 >
3617 >    //--- tests of implementation details; not part of official tck ---
3618 >
3619 >    Object resultOf(CompletableFuture<?> f) {
3620 >        try {
3621 >            java.lang.reflect.Field resultField
3622 >                = CompletableFuture.class.getDeclaredField("result");
3623 >            resultField.setAccessible(true);
3624 >            return resultField.get(f);
3625 >        } catch (Throwable t) { throw new AssertionError(t); }
3626 >    }
3627 >
3628 >    public void testExceptionPropagationReusesResultObject() {
3629 >        if (!testImplementationDetails) return;
3630 >        for (ExecutionMode m : ExecutionMode.values())
3631 >    {
3632 >        final CFException ex = new CFException();
3633 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3634 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3635 >
3636 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3637 >            = new ArrayList<>();
3638 >
3639 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3640 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3641 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3642 >
3643 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3644 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3645 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3646 >
3647 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3648 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3649 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3650 >
3651 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3652 >
3653 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3654 >
3655 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3656 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3657 >
3658 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3659 >                 fun : funs) {
3660 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3661 >            f.completeExceptionally(ex);
3662 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3663 >            checkCompletedWithWrappedException(src, ex);
3664 >            CompletableFuture<?> dep = fun.apply(src);
3665 >            checkCompletedWithWrappedException(dep, ex);
3666 >            assertSame(resultOf(src), resultOf(dep));
3667 >        }
3668 >
3669 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3670 >                 fun : funs) {
3671 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3672 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3673 >            CompletableFuture<?> dep = fun.apply(src);
3674 >            f.completeExceptionally(ex);
3675 >            checkCompletedWithWrappedException(src, ex);
3676 >            checkCompletedWithWrappedException(dep, ex);
3677 >            assertSame(resultOf(src), resultOf(dep));
3678 >        }
3679 >
3680 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3681 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3682 >                 fun : funs) {
3683 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3684 >            f.cancel(mayInterruptIfRunning);
3685 >            checkCancelled(f);
3686 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3687 >            checkCompletedWithWrappedCancellationException(src);
3688 >            CompletableFuture<?> dep = fun.apply(src);
3689 >            checkCompletedWithWrappedCancellationException(dep);
3690 >            assertSame(resultOf(src), resultOf(dep));
3691 >        }
3692 >
3693 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3694 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3695 >                 fun : funs) {
3696 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3697 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3698 >            CompletableFuture<?> dep = fun.apply(src);
3699 >            f.cancel(mayInterruptIfRunning);
3700 >            checkCancelled(f);
3701 >            checkCompletedWithWrappedCancellationException(src);
3702 >            checkCompletedWithWrappedCancellationException(dep);
3703 >            assertSame(resultOf(src), resultOf(dep));
3704 >        }
3705 >    }}
3706 >
3707 >    /**
3708 >     * Minimal completion stages throw UOE for all non-CompletionStage methods
3709 >     */
3710 >    public void testMinimalCompletionStage_minimality() {
3711 >        if (!testImplementationDetails) return;
3712 >        Function<Method, String> toSignature =
3713 >            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3714 >        Predicate<Method> isNotStatic =
3715 >            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3716 >        List<Method> minimalMethods =
3717 >            Stream.of(Object.class, CompletionStage.class)
3718 >            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3719 >            .filter(isNotStatic)
3720 >            .collect(Collectors.toList());
3721 >        // Methods from CompletableFuture permitted NOT to throw UOE
3722 >        String[] signatureWhitelist = {
3723 >            "newIncompleteFuture[]",
3724 >            "defaultExecutor[]",
3725 >            "minimalCompletionStage[]",
3726 >            "copy[]",
3727 >        };
3728 >        Set<String> permittedMethodSignatures =
3729 >            Stream.concat(minimalMethods.stream().map(toSignature),
3730 >                          Stream.of(signatureWhitelist))
3731 >            .collect(Collectors.toSet());
3732 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3733 >            .filter(isNotStatic)
3734 >            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3735 >            .collect(Collectors.toList());
3736 >
3737 >        CompletionStage<Integer> minimalStage =
3738 >            new CompletableFuture<Integer>().minimalCompletionStage();
3739 >
3740 >        List<Method> bugs = new ArrayList<>();
3741 >        for (Method method : allMethods) {
3742 >            Class<?>[] parameterTypes = method.getParameterTypes();
3743 >            Object[] args = new Object[parameterTypes.length];
3744 >            // Manufacture boxed primitives for primitive params
3745 >            for (int i = 0; i < args.length; i++) {
3746 >                Class<?> type = parameterTypes[i];
3747 >                if (parameterTypes[i] == boolean.class)
3748 >                    args[i] = false;
3749 >                else if (parameterTypes[i] == int.class)
3750 >                    args[i] = 0;
3751 >                else if (parameterTypes[i] == long.class)
3752 >                    args[i] = 0L;
3753 >            }
3754 >            try {
3755 >                method.invoke(minimalStage, args);
3756 >                bugs.add(method);
3757 >            }
3758 >            catch (java.lang.reflect.InvocationTargetException expected) {
3759 >                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3760 >                    bugs.add(method);
3761 >                    // expected.getCause().printStackTrace();
3762 >                }
3763 >            }
3764 >            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3765 >        }
3766 >        if (!bugs.isEmpty())
3767 >            throw new Error("Methods did not throw UOE: " + bugs.toString());
3768      }
3769  
3770 +    static class Monad {
3771 +        static class ZeroException extends RuntimeException {
3772 +            public ZeroException() { super("monadic zero"); }
3773 +        }
3774 +        // "return", "unit"
3775 +        static <T> CompletableFuture<T> unit(T value) {
3776 +            return completedFuture(value);
3777 +        }
3778 +        // monadic zero ?
3779 +        static <T> CompletableFuture<T> zero() {
3780 +            return failedFuture(new ZeroException());
3781 +        }
3782 +        // >=>
3783 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
3784 +            (Function<T, CompletableFuture<U>> f,
3785 +             Function<U, CompletableFuture<V>> g) {
3786 +            return (x) -> f.apply(x).thenCompose(g);
3787 +        }
3788 +
3789 +        static void assertZero(CompletableFuture<?> f) {
3790 +            try {
3791 +                f.getNow(null);
3792 +                throw new AssertionFailedError("should throw");
3793 +            } catch (CompletionException success) {
3794 +                assertTrue(success.getCause() instanceof ZeroException);
3795 +            }
3796 +        }
3797 +
3798 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
3799 +                                           CompletableFuture<T> g) {
3800 +            T fval = null, gval = null;
3801 +            Throwable fex = null, gex = null;
3802 +
3803 +            try { fval = f.get(); }
3804 +            catch (ExecutionException ex) { fex = ex.getCause(); }
3805 +            catch (Throwable ex) { fex = ex; }
3806 +
3807 +            try { gval = g.get(); }
3808 +            catch (ExecutionException ex) { gex = ex.getCause(); }
3809 +            catch (Throwable ex) { gex = ex; }
3810 +
3811 +            if (fex != null || gex != null)
3812 +                assertSame(fex.getClass(), gex.getClass());
3813 +            else
3814 +                assertEquals(fval, gval);
3815 +        }
3816 +
3817 +        static class PlusFuture<T> extends CompletableFuture<T> {
3818 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
3819 +        }
3820 +
3821 +        // Monadic "plus"
3822 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
3823 +                                             CompletableFuture<? extends T> g) {
3824 +            PlusFuture<T> plus = new PlusFuture<T>();
3825 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
3826 +                if (ex == null) {
3827 +                    if (plus.complete(result))
3828 +                        if (plus.firstFailure.get() != null)
3829 +                            plus.firstFailure.set(null);
3830 +                }
3831 +                else if (plus.firstFailure.compareAndSet(null, ex)) {
3832 +                    if (plus.isDone())
3833 +                        plus.firstFailure.set(null);
3834 +                }
3835 +                else {
3836 +                    // first failure has precedence
3837 +                    Throwable first = plus.firstFailure.getAndSet(null);
3838 +
3839 +                    // may fail with "Self-suppression not permitted"
3840 +                    try { first.addSuppressed(ex); }
3841 +                    catch (Exception ignored) {}
3842 +
3843 +                    plus.completeExceptionally(first);
3844 +                }
3845 +            };
3846 +            f.whenComplete(action);
3847 +            g.whenComplete(action);
3848 +            return plus;
3849 +        }
3850 +    }
3851 +
3852 +    /**
3853 +     * CompletableFuture is an additive monad - sort of.
3854 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
3855 +     */
3856 +    public void testAdditiveMonad() throws Throwable {
3857 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
3858 +        CompletableFuture<Long> zero = Monad.zero();
3859 +
3860 +        // Some mutually non-commutative functions
3861 +        Function<Long, CompletableFuture<Long>> triple
3862 +            = (x) -> Monad.unit(3 * x);
3863 +        Function<Long, CompletableFuture<Long>> inc
3864 +            = (x) -> Monad.unit(x + 1);
3865 +
3866 +        // unit is a right identity: m >>= unit === m
3867 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
3868 +                                 inc.apply(5L));
3869 +        // unit is a left identity: (unit x) >>= f === f x
3870 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
3871 +                                 inc.apply(5L));
3872 +
3873 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
3874 +        Monad.assertFutureEquals(
3875 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
3876 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
3877 +
3878 +        // The case for CompletableFuture as an additive monad is weaker...
3879 +
3880 +        // zero is a monadic zero
3881 +        Monad.assertZero(zero);
3882 +
3883 +        // left zero: zero >>= f === zero
3884 +        Monad.assertZero(zero.thenCompose(inc));
3885 +        // right zero: f >>= (\x -> zero) === zero
3886 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
3887 +
3888 +        // f plus zero === f
3889 +        Monad.assertFutureEquals(Monad.unit(5L),
3890 +                                 Monad.plus(Monad.unit(5L), zero));
3891 +        // zero plus f === f
3892 +        Monad.assertFutureEquals(Monad.unit(5L),
3893 +                                 Monad.plus(zero, Monad.unit(5L)));
3894 +        // zero plus zero === zero
3895 +        Monad.assertZero(Monad.plus(zero, zero));
3896 +        {
3897 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
3898 +                                                   Monad.unit(8L));
3899 +            // non-determinism
3900 +            assertTrue(f.get() == 5L || f.get() == 8L);
3901 +        }
3902 +
3903 +        CompletableFuture<Long> godot = new CompletableFuture<>();
3904 +        // f plus godot === f (doesn't wait for godot)
3905 +        Monad.assertFutureEquals(Monad.unit(5L),
3906 +                                 Monad.plus(Monad.unit(5L), godot));
3907 +        // godot plus f === f (doesn't wait for godot)
3908 +        Monad.assertFutureEquals(Monad.unit(5L),
3909 +                                 Monad.plus(godot, Monad.unit(5L)));
3910 +    }
3911 +
3912 + //     static <U> U join(CompletionStage<U> stage) {
3913 + //         CompletableFuture<U> f = new CompletableFuture<>();
3914 + //         stage.whenComplete((v, ex) -> {
3915 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3916 + //         });
3917 + //         return f.join();
3918 + //     }
3919 +
3920 + //     static <U> boolean isDone(CompletionStage<U> stage) {
3921 + //         CompletableFuture<U> f = new CompletableFuture<>();
3922 + //         stage.whenComplete((v, ex) -> {
3923 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3924 + //         });
3925 + //         return f.isDone();
3926 + //     }
3927 +
3928 + //     static <U> U join2(CompletionStage<U> stage) {
3929 + //         return stage.toCompletableFuture().copy().join();
3930 + //     }
3931 +
3932 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
3933 + //         return stage.toCompletableFuture().copy().isDone();
3934 + //     }
3935 +
3936   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines