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.43 by jsr166, Mon Jun 2 04:13:54 2014 UTC vs.
Revision 1.225 by jsr166, Wed Jan 27 01:57:24 2021 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines