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.34 by jsr166, Sun Jun 1 21:17:05 2014 UTC vs.
Revision 1.170 by jsr166, Mon Jul 18 19:30:49 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines