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.121 by jsr166, Sun Sep 6 21:14:12 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines