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.68 by jsr166, Fri Jun 6 19:35:54 2014 UTC vs.
Revision 1.224 by dl, Tue Jan 26 13:33:05 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;
25 < import static java.util.concurrent.TimeUnit.SECONDS;
26 < import java.util.*;
27 < import java.util.function.Supplier;
28 < import java.util.function.Consumer;
36 > import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
30 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 44 | 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); }
66 <        try {
67 <            assertEquals(value, f.getNow(null));
68 <        } 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 {
86 <            f.join();
87 <            shouldThrow();
88 <        } catch (CompletionException success) {
89 <            assertTrue(success.getCause() instanceof CFException);
90 <        }
91 <        try {
92 <            f.getNow(null);
93 <            shouldThrow();
94 <        } catch (CompletionException success) {
95 <            assertTrue(success.getCause() instanceof CFException);
96 <        }
97 <        try {
98 <            f.get();
99 <            shouldThrow();
100 <        } catch (ExecutionException success) {
101 <            assertTrue(success.getCause() instanceof CFException);
102 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
103 <        assertTrue(f.isDone());
104 <        assertFalse(f.isCancelled());
105 <        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 155 | Line 194 | public class CompletableFutureTest exten
194              shouldThrow();
195          } catch (CancellationException success) {
196          } catch (Throwable fail) { threadUnexpectedException(fail); }
158        assertTrue(f.isDone());
159        assertTrue(f.isCompletedExceptionally());
160        assertTrue(f.isCancelled());
161        assertTrue(f.toString().contains("[Completed exceptionally]"));
162    }
197  
198 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
199 <        try {
166 <            f.get(LONG_DELAY_MS, MILLISECONDS);
167 <            shouldThrow();
168 <        } catch (ExecutionException success) {
169 <            assertTrue(success.getCause() instanceof CancellationException);
170 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
171 <        try {
172 <            f.join();
173 <            shouldThrow();
174 <        } catch (CompletionException success) {
175 <            assertTrue(success.getCause() instanceof CancellationException);
176 <        }
177 <        try {
178 <            f.getNow(null);
179 <            shouldThrow();
180 <        } catch (CompletionException success) {
181 <            assertTrue(success.getCause() instanceof CancellationException);
182 <        }
183 <        try {
184 <            f.get();
185 <            shouldThrow();
186 <        } catch (ExecutionException success) {
187 <            assertTrue(success.getCause() instanceof CancellationException);
188 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
198 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
199 >
200          assertTrue(f.isDone());
190        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 197 | 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 206 | 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 228 | 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 261 | 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());
288 <        checkCompletedWithWrappedCFException(f);
283 >        for (Item v1 : new Item[] { one, null })
284 >    {
285 >        CFException ex;
286 >        CompletableFuture<Item> f;
287 >
288 >        f = new CompletableFuture<>();
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 <        f.obtrudeException(new CFException());
297 <        checkCompletedWithWrappedCFException(f);
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(0, f.getNumberOfDependents());
319 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
320 <        assertEquals(1, f.getNumberOfDependents());
321 <        assertEquals(0, g.getNumberOfDependents());
322 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
323 <        assertEquals(2, f.getNumberOfDependents());
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(0, f.getNumberOfDependents());
331 <        assertEquals(0, g.getNumberOfDependents());
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 320 | Line 381 | public class CompletableFutureTest exten
381          checkCompletedNormally(f, "test");
382      }
383  
384 <    abstract class CheckedAction {
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 <            assertEquals(0, invocationCount++);
390 >            mustEqual(0, invocationCount++);
391          }
392 <        void assertNotInvoked() { assertEquals(0, invocationCount); }
393 <        void assertInvoked() { assertEquals(1, invocationCount); }
392 >        void assertNotInvoked() { mustEqual(0, invocationCount); }
393 >        void assertInvoked() { mustEqual(1, invocationCount); }
394      }
395  
396 <    abstract class CheckedIntegerAction extends CheckedAction {
397 <        Integer value;
398 <        CheckedIntegerAction(ExecutionMode m) { super(m); }
399 <        void assertValue(Integer expected) {
396 >    abstract static class CheckedItemAction extends CheckedAction {
397 >        Item value;
398 >        CheckedItemAction(ExecutionMode m) { super(m); }
399 >        void assertValue(Item expected) {
400              assertInvoked();
401 <            assertEquals(expected, value);
401 >            mustEqual(expected, value);
402          }
403      }
404  
405 <    class IntegerSupplier extends CheckedAction
406 <        implements Supplier<Integer>
405 >    static class ItemSupplier extends CheckedAction
406 >        implements Supplier<Item>
407      {
408 <        final Integer value;
409 <        IntegerSupplier(ExecutionMode m, Integer value) {
408 >        final Item value;
409 >        ItemSupplier(ExecutionMode m, Item value) {
410              super(m);
411              this.value = value;
412          }
413 <        public Integer get() {
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 <    class NoopConsumer extends CheckedIntegerAction
425 <        implements Consumer<Integer>
424 >    static class NoopConsumer extends CheckedItemAction
425 >        implements Consumer<Item>
426      {
427          NoopConsumer(ExecutionMode m) { super(m); }
428 <        public void accept(Integer x) {
428 >        public void accept(Item x) {
429              invoked();
430              value = x;
431          }
432      }
433  
434 <    class IncFunction extends CheckedIntegerAction
435 <        implements Function<Integer,Integer>
434 >    static class IncFunction extends CheckedItemAction
435 >        implements Function<Item,Item>
436      {
437          IncFunction(ExecutionMode m) { super(m); }
438 <        public Integer apply(Integer x) {
438 >        public Item apply(Item x) {
439              invoked();
440              return value = inc(x);
441          }
# Line 382 | Line 443 | public class CompletableFutureTest exten
443  
444      // Choose non-commutative actions for better coverage
445      // A non-commutative function that handles and produces null values as well.
446 <    static Integer subtract(Integer x, Integer y) {
446 >    static Item subtract(Item x, Item y) {
447          return (x == null && y == null) ? null :
448 <            ((x == null) ? 42 : x.intValue())
449 <            - ((y == null) ? 99 : y.intValue());
448 >            new Item(((x == null) ? 42 : x.value)
449 >                    - ((y == null) ? 99 : y.value));
450      }
451  
452 <    class SubtractAction extends CheckedIntegerAction
453 <        implements BiConsumer<Integer, Integer>
452 >    static class SubtractAction extends CheckedItemAction
453 >        implements BiConsumer<Item, Item>
454      {
455          SubtractAction(ExecutionMode m) { super(m); }
456 <        public void accept(Integer x, Integer y) {
456 >        public void accept(Item x, Item y) {
457              invoked();
458              value = subtract(x, y);
459          }
460      }
461  
462 <    class SubtractFunction extends CheckedIntegerAction
463 <        implements BiFunction<Integer, Integer, Integer>
462 >    static class SubtractFunction extends CheckedItemAction
463 >        implements BiFunction<Item, Item, Item>
464      {
465          SubtractFunction(ExecutionMode m) { super(m); }
466 <        public Integer apply(Integer x, Integer y) {
466 >        public Item apply(Item x, Item y) {
467              invoked();
468              return value = subtract(x, y);
469          }
470      }
471  
472 <    class Noop extends CheckedAction implements Runnable {
472 >    static class Noop extends CheckedAction implements Runnable {
473          Noop(ExecutionMode m) { super(m); }
474          public void run() {
475              invoked();
476          }
477      }
478  
479 <    class FailingSupplier extends CheckedAction
480 <        implements Supplier<Integer>
479 >    static class FailingSupplier extends CheckedAction
480 >        implements Supplier<Item>
481      {
482 <        FailingSupplier(ExecutionMode m) { super(m); }
483 <        public Integer get() {
482 >        final CFException ex;
483 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
484 >        public Item get() {
485              invoked();
486 <            throw new CFException();
486 >            throw ex;
487          }
488      }
489  
490 <    class FailingConsumer extends CheckedIntegerAction
491 <        implements Consumer<Integer>
490 >    static class FailingConsumer extends CheckedItemAction
491 >        implements Consumer<Item>
492      {
493 <        FailingConsumer(ExecutionMode m) { super(m); }
494 <        public void accept(Integer x) {
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 new CFException();
498 >            throw ex;
499          }
500      }
501  
502 <    class FailingBiConsumer extends CheckedIntegerAction
503 <        implements BiConsumer<Integer, Integer>
502 >    static class FailingBiConsumer extends CheckedItemAction
503 >        implements BiConsumer<Item, Item>
504      {
505 <        FailingBiConsumer(ExecutionMode m) { super(m); }
506 <        public void accept(Integer x, Integer y) {
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 new CFException();
510 >            throw ex;
511          }
512      }
513  
514 <    class FailingFunction extends CheckedIntegerAction
515 <        implements Function<Integer, Integer>
514 >    static class FailingFunction extends CheckedItemAction
515 >        implements Function<Item, Item>
516      {
517 <        FailingFunction(ExecutionMode m) { super(m); }
518 <        public Integer apply(Integer x) {
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 new CFException();
522 >            throw ex;
523          }
524      }
525  
526 <    class FailingBiFunction extends CheckedIntegerAction
527 <        implements BiFunction<Integer, Integer, Integer>
526 >    static class FailingBiFunction extends CheckedItemAction
527 >        implements BiFunction<Item, Item, Item>
528      {
529 <        FailingBiFunction(ExecutionMode m) { super(m); }
530 <        public Integer apply(Integer x, Integer y) {
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 new CFException();
534 >            throw ex;
535          }
536      }
537  
538 <    class FailingRunnable extends CheckedAction implements Runnable {
539 <        FailingRunnable(ExecutionMode m) { super(m); }
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 new CFException();
543 >            throw ex;
544          }
545      }
546  
547 <
548 <    class CompletableFutureInc extends CheckedIntegerAction
482 <        implements Function<Integer, CompletableFuture<Integer>>
547 >    static class CompletableFutureInc extends CheckedItemAction
548 >        implements Function<Item, CompletableFuture<Item>>
549      {
550          CompletableFutureInc(ExecutionMode m) { super(m); }
551 <        public CompletableFuture<Integer> apply(Integer x) {
551 >        public CompletableFuture<Item> apply(Item x) {
552              invoked();
553              value = x;
554 <            CompletableFuture<Integer> f = new CompletableFuture<>();
555 <            f.complete(inc(x));
556 <            return f;
554 >            return CompletableFuture.completedFuture(inc(x));
555 >        }
556 >    }
557 >
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 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
570 <        implements Function<Integer, CompletableFuture<Integer>>
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 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
583 <        public CompletableFuture<Integer> apply(Integer x) {
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 new CFException();
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 >            throw ex;
597          }
598      }
599  
# Line 516 | Line 611 | public class CompletableFutureTest exten
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 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());
# Line 593 | Line 691 | public class CompletableFutureTest exten
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          },
597
704          ASYNC {
705              public void checkExecutionMode() {
706 <                assertSame(ForkJoinPool.commonPool(),
707 <                           ForkJoinTask.getPool());
706 >                mustEqual(defaultExecutorIsCommonPool,
707 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
708              }
709              public CompletableFuture<Void> runAsync(Runnable a) {
710                  return CompletableFuture.runAsync(a);
# Line 667 | Line 773 | public class CompletableFutureTest exten
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 {
# Line 740 | Line 857 | public class CompletableFutureTest exten
857                   Function<? super T,U> a) {
858                  return f.applyToEitherAsync(g, a, new ThreadExecutor());
859              }
860 +            public <T> CompletableFuture<T> exceptionally
861 +                (CompletableFuture<T> f,
862 +                 Function<Throwable, ? extends T> fn) {
863 +                return f.exceptionallyAsync(fn, new ThreadExecutor());
864 +            }
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();
# Line 782 | Line 909 | public class CompletableFutureTest exten
909              (CompletableFuture<T> f,
910               CompletionStage<? extends T> g,
911               Function<? super T,U> a);
912 +        public abstract <T> CompletableFuture<T> exceptionally
913 +            (CompletableFuture<T> f,
914 +             Function<Throwable, ? extends T> fn);
915 +        public abstract <T> CompletableFuture<T> exceptionallyCompose
916 +            (CompletableFuture<T> f,
917 +             Function<Throwable, ? extends CompletionStage<T>> fn);
918      }
919  
920      /**
# Line 789 | Line 922 | public class CompletableFutureTest exten
922       * normally, and source result is propagated
923       */
924      public void testExceptionally_normalCompletion() {
925 +        for (ExecutionMode m : ExecutionMode.values())
926          for (boolean createIncomplete : new boolean[] { true, false })
927 <        for (Integer v1 : new Integer[] { 1, null })
927 >        for (Item v1 : new Item[] { one, null })
928      {
929 <        final AtomicInteger a = new AtomicInteger(0);
930 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
931 <        if (!createIncomplete) f.complete(v1);
932 <        final CompletableFuture<Integer> g = f.exceptionally
933 <            ((Throwable t) -> {
934 <                // Should not be called
935 <                a.getAndIncrement();
802 <                throw new AssertionError();
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) f.complete(v1);
937 >        if (createIncomplete) assertTrue(f.complete(v1));
938  
939          checkCompletedNormally(g, v1);
940          checkCompletedNormally(f, v1);
941 <        assertEquals(0, a.get());
941 >        mustEqual(0, ran.get());
942      }}
943  
811
944      /**
945       * exceptionally action completes with function value on source
946       * exception
947       */
948      public void testExceptionally_exceptionalCompletion() {
949 +        for (ExecutionMode m : ExecutionMode.values())
950          for (boolean createIncomplete : new boolean[] { true, false })
951 <        for (Integer v1 : new Integer[] { 1, null })
951 >        for (Item v1 : new Item[] { one, null })
952      {
953 <        final AtomicInteger a = new AtomicInteger(0);
953 >        final AtomicInteger ran = new AtomicInteger(0);
954          final CFException ex = new CFException();
955 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
955 >        final CompletableFuture<Item> f = new CompletableFuture<>();
956          if (!createIncomplete) f.completeExceptionally(ex);
957 <        final CompletableFuture<Integer> g = f.exceptionally
958 <            ((Throwable t) -> {
959 <                ExecutionMode.DEFAULT.checkExecutionMode();
960 <                threadAssertSame(t, ex);
961 <                a.getAndIncrement();
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          checkCompletedNormally(g, v1);
967 <        assertEquals(1, a.get());
967 >        mustEqual(1, ran.get());
968      }}
969  
970 +    /**
971 +     * If an "exceptionally action" throws an exception, it completes
972 +     * exceptionally with that exception
973 +     */
974      public void testExceptionally_exceptionalCompletionActionFailed() {
975 +        for (ExecutionMode m : ExecutionMode.values())
976          for (boolean createIncomplete : new boolean[] { true, false })
839        for (Integer v1 : new Integer[] { 1, null })
977      {
978 <        final AtomicInteger a = new AtomicInteger(0);
978 >        final AtomicInteger ran = new AtomicInteger(0);
979          final CFException ex1 = new CFException();
980          final CFException ex2 = new CFException();
981 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
981 >        final CompletableFuture<Item> f = new CompletableFuture<>();
982          if (!createIncomplete) f.completeExceptionally(ex1);
983 <        final CompletableFuture<Integer> g = f.exceptionally
984 <            ((Throwable t) -> {
985 <                ExecutionMode.DEFAULT.checkExecutionMode();
986 <                threadAssertSame(t, ex1);
987 <                a.getAndIncrement();
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 <        checkCompletedWithWrappedCFException(g, ex2);
993 <        assertEquals(1, a.get());
992 >        checkCompletedWithWrappedException(g, ex2);
993 >        checkCompletedExceptionally(f, ex1);
994 >        mustEqual(1, ran.get());
995 >    }}
996 >
997 >    /**
998 >     * whenComplete action executes on normal completion, propagating
999 >     * source result.
1000 >     */
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 >     * whenComplete action executes on exceptional completion, propagating
1026 >     * source result.
1027 >     */
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 >     * whenComplete action executes on cancelled source, propagating
1053 >     * CancellationException.
1054 >     */
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 >     * If a whenComplete action throws an exception when triggered by
1080 >     * a normal completion, it completes exceptionally
1081 >     */
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 >        checkCompletedWithWrappedException(g, ex);
1103 >        checkCompletedNormally(f, v1);
1104 >        mustEqual(1, ran.get());
1105 >    }}
1106 >
1107 >    /**
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 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 >        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 >        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      /**
# Line 863 | Line 1146 | public class CompletableFutureTest exten
1146      public void testHandle_normalCompletion() {
1147          for (ExecutionMode m : ExecutionMode.values())
1148          for (boolean createIncomplete : new boolean[] { true, false })
1149 <        for (Integer v1 : new Integer[] { 1, null })
1149 >        for (Item v1 : new Item[] { one, null })
1150      {
1151 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1152 <        final AtomicInteger a = new AtomicInteger(0);
1153 <        if (!createIncomplete) f.complete(v1);
1154 <        final CompletableFuture<Integer> g = m.handle
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 <             (Integer x, Throwable t) -> {
1156 >             (Item result, Throwable t) -> {
1157                  m.checkExecutionMode();
1158 <                threadAssertSame(x, v1);
1159 <                threadAssertNull(t);
1160 <                a.getAndIncrement();
1158 >                assertSame(result, v1);
1159 >                assertNull(t);
1160 >                ran.getAndIncrement();
1161                  return inc(v1);
1162              });
1163 <        if (createIncomplete) f.complete(v1);
1163 >        if (createIncomplete) assertTrue(f.complete(v1));
1164  
1165          checkCompletedNormally(g, inc(v1));
1166          checkCompletedNormally(f, v1);
1167 <        assertEquals(1, a.get());
1167 >        mustEqual(1, ran.get());
1168      }}
1169  
1170      /**
# Line 891 | Line 1174 | public class CompletableFutureTest exten
1174      public void testHandle_exceptionalCompletion() {
1175          for (ExecutionMode m : ExecutionMode.values())
1176          for (boolean createIncomplete : new boolean[] { true, false })
1177 <        for (Integer v1 : new Integer[] { 1, null })
1177 >        for (Item v1 : new Item[] { one, null })
1178      {
1179 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1180 <        final AtomicInteger a = new AtomicInteger(0);
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<Integer> g = m.handle
1183 >        final CompletableFuture<Item> g = m.handle
1184              (f,
1185 <             (Integer x, Throwable t) -> {
1185 >             (Item result, Throwable t) -> {
1186                  m.checkExecutionMode();
1187 <                threadAssertNull(x);
1188 <                threadAssertSame(t, ex);
1189 <                a.getAndIncrement();
1187 >                assertNull(result);
1188 >                assertSame(t, ex);
1189 >                ran.getAndIncrement();
1190                  return v1;
1191              });
1192          if (createIncomplete) f.completeExceptionally(ex);
1193  
1194          checkCompletedNormally(g, v1);
1195 <        checkCompletedWithWrappedCFException(f, ex);
1196 <        assertEquals(1, a.get());
1195 >        checkCompletedExceptionally(f, ex);
1196 >        mustEqual(1, ran.get());
1197      }}
1198  
1199      /**
# Line 921 | Line 1204 | public class CompletableFutureTest exten
1204          for (ExecutionMode m : ExecutionMode.values())
1205          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1206          for (boolean createIncomplete : new boolean[] { true, false })
1207 <        for (Integer v1 : new Integer[] { 1, null })
1207 >        for (Item v1 : new Item[] { one, null })
1208      {
1209 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1210 <        final AtomicInteger a = new AtomicInteger(0);
1209 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1210 >        final AtomicInteger ran = new AtomicInteger(0);
1211          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1212 <        final CompletableFuture<Integer> g = m.handle
1212 >        final CompletableFuture<Item> g = m.handle
1213              (f,
1214 <             (Integer x, Throwable t) -> {
1214 >             (Item result, Throwable t) -> {
1215                  m.checkExecutionMode();
1216 <                threadAssertNull(x);
1217 <                threadAssertTrue(t instanceof CancellationException);
1218 <                a.getAndIncrement();
1216 >                assertNull(result);
1217 >                assertTrue(t instanceof CancellationException);
1218 >                ran.getAndIncrement();
1219                  return v1;
1220              });
1221          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1222  
1223          checkCompletedNormally(g, v1);
1224          checkCancelled(f);
1225 <        assertEquals(1, a.get());
1225 >        mustEqual(1, ran.get());
1226      }}
1227  
1228      /**
1229 <     * handle result completes exceptionally if action does
1229 >     * If a "handle action" throws an exception when triggered by
1230 >     * a normal completion, it completes exceptionally
1231       */
1232 <    public void testHandle_sourceFailedActionFailed() {
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<Integer> f = new CompletableFuture<>();
1238 <        final AtomicInteger a = new AtomicInteger(0);
1239 <        final CFException ex1 = new CFException();
1240 <        final CFException ex2 = new CFException();
1241 <        if (!createIncomplete) f.completeExceptionally(ex1);
957 <        final CompletableFuture<Integer> g = m.handle
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 <             (Integer x, Throwable t) -> {
1243 >             (Item result, Throwable t) -> {
1244                  m.checkExecutionMode();
1245 <                threadAssertNull(x);
1246 <                threadAssertSame(ex1, t);
1247 <                a.getAndIncrement();
1248 <                throw ex2;
1245 >                assertSame(result, v1);
1246 >                assertNull(t);
1247 >                ran.getAndIncrement();
1248 >                throw ex;
1249              });
1250 <        if (createIncomplete) f.completeExceptionally(ex1);
1250 >        if (createIncomplete) assertTrue(f.complete(v1));
1251  
1252 <        checkCompletedWithWrappedCFException(g, ex2);
1253 <        checkCompletedWithWrappedCFException(f, ex1);
1254 <        assertEquals(1, a.get());
1252 >        checkCompletedWithWrappedException(g, ex);
1253 >        checkCompletedNormally(f, v1);
1254 >        mustEqual(1, ran.get());
1255      }}
1256  
1257 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1258 <        for (ExecutionMode m : ExecutionMode.values())
1257 >    /**
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 testHandle_sourceFailedActionFailed() {
1263          for (boolean createIncomplete : new boolean[] { true, false })
1264 <        for (Integer v1 : new Integer[] { 1, null })
1264 >        for (ExecutionMode m : ExecutionMode.values())
1265      {
1266 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1267 <        final AtomicInteger a = new AtomicInteger(0);
1268 <        final CFException ex = new CFException();
1269 <        if (!createIncomplete) f.complete(v1);
1270 <        final CompletableFuture<Integer> g = m.handle
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 >        if (!createIncomplete) f.completeExceptionally(ex1);
1272 >        final CompletableFuture<Item> g = m.handle
1273              (f,
1274 <             (Integer x, Throwable t) -> {
1274 >             (Item result, Throwable t) -> {
1275                  m.checkExecutionMode();
1276 <                threadAssertSame(x, v1);
1277 <                threadAssertNull(t);
1278 <                a.getAndIncrement();
1279 <                throw ex;
1276 >                assertNull(result);
1277 >                assertSame(ex1, t);
1278 >                ran.getAndIncrement();
1279 >                throw ex2;
1280              });
1281 <        if (createIncomplete) f.complete(v1);
1281 >        if (createIncomplete) f.completeExceptionally(ex1);
1282  
1283 <        checkCompletedWithWrappedCFException(g, ex);
1284 <        checkCompletedNormally(f, v1);
1285 <        assertEquals(1, a.get());
1283 >        checkCompletedWithWrappedException(g, ex2);
1284 >        checkCompletedExceptionally(f, ex1);
1285 >        mustEqual(1, ran.get());
1286      }}
1287  
1288      /**
# Line 1024 | Line 1314 | public class CompletableFutureTest exten
1314      {
1315          final FailingRunnable r = new FailingRunnable(m);
1316          final CompletableFuture<Void> f = m.runAsync(r);
1317 <        checkCompletedWithWrappedCFException(f);
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       * supplyAsync completes with result of supplier
1336       */
# Line 1037 | Line 1340 | public class CompletableFutureTest exten
1340              ExecutionMode.EXECUTOR,
1341          };
1342          for (ExecutionMode m : executionModes)
1343 <        for (Integer v1 : new Integer[] { 1, null })
1343 >        for (Item v1 : new Item[] { one, null })
1344      {
1345 <        final IntegerSupplier r = new IntegerSupplier(m, v1);
1346 <        final CompletableFuture<Integer> f = m.supplyAsync(r);
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();
# Line 1057 | Line 1360 | public class CompletableFutureTest exten
1360          for (ExecutionMode m : executionModes)
1361      {
1362          FailingSupplier r = new FailingSupplier(m);
1363 <        CompletableFuture<Integer> f = m.supplyAsync(r);
1364 <        checkCompletedWithWrappedCFException(f);
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      /**
# Line 1069 | Line 1385 | public class CompletableFutureTest exten
1385       */
1386      public void testThenRun_normalCompletion() {
1387          for (ExecutionMode m : ExecutionMode.values())
1388 <        for (boolean createIncomplete : new boolean[] { true, false })
1073 <        for (Integer v1 : new Integer[] { 1, null })
1388 >        for (Item v1 : new Item[] { one, null })
1389      {
1390 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1391 <        final Noop r = new Noop(m);
1392 <        if (!createIncomplete) f.complete(v1);
1078 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1079 <        if (createIncomplete) {
1080 <            checkIncomplete(g);
1081 <            f.complete(v1);
1082 <        }
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 <        checkCompletedNormally(g, null);
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 <        r.assertInvoked();
1412 >        for (Noop r : rs) r.assertInvoked();
1413      }}
1414  
1415      /**
# Line 1092 | Line 1418 | public class CompletableFutureTest exten
1418       */
1419      public void testThenRun_exceptionalCompletion() {
1420          for (ExecutionMode m : ExecutionMode.values())
1095        for (boolean createIncomplete : new boolean[] { true, false })
1421      {
1422          final CFException ex = new CFException();
1423 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1424 <        final Noop r = new Noop(m);
1425 <        if (!createIncomplete) f.completeExceptionally(ex);
1101 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1102 <        if (createIncomplete) {
1103 <            checkIncomplete(g);
1104 <            f.completeExceptionally(ex);
1105 <        }
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 <        checkCompletedWithWrappedCFException(g, ex);
1428 <        checkCompletedWithWrappedCFException(f, ex);
1429 <        r.assertNotInvoked();
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      /**
# Line 1114 | Line 1450 | public class CompletableFutureTest exten
1450       */
1451      public void testThenRun_sourceCancelled() {
1452          for (ExecutionMode m : ExecutionMode.values())
1117        for (boolean createIncomplete : new boolean[] { true, false })
1453          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1454      {
1455 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1456 <        final Noop r = new Noop(m);
1457 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1124 <        if (createIncomplete) {
1125 <            checkIncomplete(g);
1126 <            assertTrue(f.cancel(mayInterruptIfRunning));
1127 <        }
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 <        checkCompletedWithWrappedCancellationException(g);
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 <        r.assertNotInvoked();
1477 >        for (Noop r : rs) r.assertNotInvoked();
1478      }}
1479  
1480      /**
# Line 1136 | Line 1482 | public class CompletableFutureTest exten
1482       */
1483      public void testThenRun_actionFailed() {
1484          for (ExecutionMode m : ExecutionMode.values())
1485 <        for (boolean createIncomplete : new boolean[] { true, false })
1140 <        for (Integer v1 : new Integer[] { 1, null })
1485 >        for (Item v1 : new Item[] { one, null })
1486      {
1487 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1488 <        final FailingRunnable r = new FailingRunnable(m);
1489 <        if (!createIncomplete) f.complete(v1);
1145 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1146 <        if (createIncomplete) {
1147 <            checkIncomplete(g);
1148 <            f.complete(v1);
1149 <        }
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 <        checkCompletedWithWrappedCFException(g);
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      }}
1507  
# Line 1157 | Line 1510 | public class CompletableFutureTest exten
1510       */
1511      public void testThenApply_normalCompletion() {
1512          for (ExecutionMode m : ExecutionMode.values())
1513 <        for (boolean createIncomplete : new boolean[] { true, false })
1161 <        for (Integer v1 : new Integer[] { 1, null })
1513 >        for (Item v1 : new Item[] { one, null })
1514      {
1515 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 <        final IncFunction r = new IncFunction(m);
1517 <        if (!createIncomplete) f.complete(v1);
1166 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1167 <        if (createIncomplete) {
1168 <            checkIncomplete(g);
1169 <            f.complete(v1);
1170 <        }
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 <        checkCompletedNormally(g, inc(v1));
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 <        r.assertInvoked();
1532 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1533      }}
1534  
1535      /**
# Line 1180 | Line 1538 | public class CompletableFutureTest exten
1538       */
1539      public void testThenApply_exceptionalCompletion() {
1540          for (ExecutionMode m : ExecutionMode.values())
1183        for (boolean createIncomplete : new boolean[] { true, false })
1541      {
1542          final CFException ex = new CFException();
1543 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1544 <        final IncFunction r = new IncFunction(m);
1545 <        if (!createIncomplete) f.completeExceptionally(ex);
1189 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1190 <        if (createIncomplete) {
1191 <            checkIncomplete(g);
1192 <            f.completeExceptionally(ex);
1193 <        }
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 <        checkCompletedWithWrappedCFException(g, ex);
1548 <        checkCompletedWithWrappedCFException(f, ex);
1549 <        r.assertNotInvoked();
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      /**
# Line 1202 | Line 1563 | public class CompletableFutureTest exten
1563       */
1564      public void testThenApply_sourceCancelled() {
1565          for (ExecutionMode m : ExecutionMode.values())
1205        for (boolean createIncomplete : new boolean[] { true, false })
1566          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1567      {
1568 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final IncFunction r = new IncFunction(m);
1570 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212 <        if (createIncomplete) {
1213 <            checkIncomplete(g);
1214 <            assertTrue(f.cancel(mayInterruptIfRunning));
1215 <        }
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 <        checkCompletedWithWrappedCancellationException(g);
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 >        final CompletableFuture<Item> h2 = m.thenApply(f, rs[2]);
1576 >        final CompletableFuture<Item> h3 = m.applyToEither(f, f, rs[3]);
1577 >
1578 >        checkCompletedWithWrappedCancellationException(h0);
1579 >        checkCompletedWithWrappedCancellationException(h1);
1580 >        checkCompletedWithWrappedCancellationException(h2);
1581 >        checkCompletedWithWrappedCancellationException(h3);
1582          checkCancelled(f);
1583 <        r.assertNotInvoked();
1583 >        for (IncFunction r : rs) r.assertNotInvoked();
1584      }}
1585  
1586      /**
# Line 1224 | Line 1588 | public class CompletableFutureTest exten
1588       */
1589      public void testThenApply_actionFailed() {
1590          for (ExecutionMode m : ExecutionMode.values())
1591 <        for (boolean createIncomplete : new boolean[] { true, false })
1228 <        for (Integer v1 : new Integer[] { 1, null })
1591 >        for (Item v1 : new Item[] { one, null })
1592      {
1593 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        final FailingFunction r = new FailingFunction(m);
1595 <        if (!createIncomplete) f.complete(v1);
1233 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234 <        if (createIncomplete) {
1235 <            checkIncomplete(g);
1236 <            f.complete(v1);
1237 <        }
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 <        checkCompletedWithWrappedCFException(g);
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      }}
1609  
# Line 1245 | Line 1612 | public class CompletableFutureTest exten
1612       */
1613      public void testThenAccept_normalCompletion() {
1614          for (ExecutionMode m : ExecutionMode.values())
1615 <        for (boolean createIncomplete : new boolean[] { true, false })
1249 <        for (Integer v1 : new Integer[] { 1, null })
1615 >        for (Item v1 : new Item[] { one, null })
1616      {
1617 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1618 <        final NoopConsumer r = new NoopConsumer(m);
1619 <        if (!createIncomplete) f.complete(v1);
1254 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 <        if (createIncomplete) {
1256 <            checkIncomplete(g);
1257 <            f.complete(v1);
1258 <        }
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 <        checkCompletedNormally(g, null);
1622 <        r.assertValue(v1);
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 +        for (NoopConsumer r : rs) r.assertValue(v1);
1635      }}
1636  
1637      /**
# Line 1268 | Line 1640 | public class CompletableFutureTest exten
1640       */
1641      public void testThenAccept_exceptionalCompletion() {
1642          for (ExecutionMode m : ExecutionMode.values())
1271        for (boolean createIncomplete : new boolean[] { true, false })
1643      {
1644          final CFException ex = new CFException();
1645 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1646 <        final NoopConsumer r = new NoopConsumer(m);
1647 <        if (!createIncomplete) f.completeExceptionally(ex);
1277 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1278 <        if (createIncomplete) {
1279 <            checkIncomplete(g);
1280 <            f.completeExceptionally(ex);
1281 <        }
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 <        checkCompletedWithWrappedCFException(g, ex);
1650 <        checkCompletedWithWrappedCFException(f, ex);
1651 <        r.assertNotInvoked();
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      /**
# Line 1290 | Line 1665 | public class CompletableFutureTest exten
1665       */
1666      public void testThenAccept_sourceCancelled() {
1667          for (ExecutionMode m : ExecutionMode.values())
1293        for (boolean createIncomplete : new boolean[] { true, false })
1668          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1669      {
1670 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1671 <        final NoopConsumer r = new NoopConsumer(m);
1672 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1300 <        if (createIncomplete) {
1301 <            checkIncomplete(g);
1302 <            assertTrue(f.cancel(mayInterruptIfRunning));
1303 <        }
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 <        checkCompletedWithWrappedCancellationException(g);
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 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1678 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1679 >
1680 >        checkCompletedWithWrappedCancellationException(h0);
1681 >        checkCompletedWithWrappedCancellationException(h1);
1682 >        checkCompletedWithWrappedCancellationException(h2);
1683 >        checkCompletedWithWrappedCancellationException(h3);
1684          checkCancelled(f);
1685 <        r.assertNotInvoked();
1685 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1686      }}
1687  
1688      /**
# Line 1312 | Line 1690 | public class CompletableFutureTest exten
1690       */
1691      public void testThenAccept_actionFailed() {
1692          for (ExecutionMode m : ExecutionMode.values())
1693 <        for (boolean createIncomplete : new boolean[] { true, false })
1316 <        for (Integer v1 : new Integer[] { 1, null })
1693 >        for (Item v1 : new Item[] { one, null })
1694      {
1695 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1696 <        final FailingConsumer r = new FailingConsumer(m);
1697 <        if (!createIncomplete) f.complete(v1);
1321 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1322 <        if (createIncomplete) {
1323 <            checkIncomplete(g);
1324 <            f.complete(v1);
1325 <        }
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 <        checkCompletedWithWrappedCFException(g);
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      }}
1711  
# Line 1334 | Line 1715 | public class CompletableFutureTest exten
1715       */
1716      public void testThenCombine_normalCompletion() {
1717          for (ExecutionMode m : ExecutionMode.values())
1337        for (boolean createIncomplete : new boolean[] { true, false })
1718          for (boolean fFirst : new boolean[] { true, false })
1719 <        for (Integer v1 : new Integer[] { 1, null })
1720 <        for (Integer v2 : new Integer[] { 2, null })
1719 >        for (Item v1 : new Item[] { one, null })
1720 >        for (Item v2 : new Item[] { two, null })
1721      {
1722 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1723 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1724 <        final SubtractFunction r = new SubtractFunction(m);
1725 <
1726 <        if (fFirst) f.complete(v1); else g.complete(v2);
1727 <        if (!createIncomplete)
1728 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1729 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1730 <        if (createIncomplete) {
1731 <            checkIncomplete(h);
1732 <            r.assertNotInvoked();
1733 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1734 <        }
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  
1356        checkCompletedNormally(h, subtract(v1, v2));
1753          checkCompletedNormally(f, v1);
1754          checkCompletedNormally(g, v2);
1359        r.assertInvoked();
1755      }}
1756  
1757      /**
1758       * thenCombine result completes exceptionally after exceptional
1759       * completion of either source
1760       */
1761 <    public void testThenCombine_exceptionalCompletion() {
1761 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1762          for (ExecutionMode m : ExecutionMode.values())
1368        for (boolean createIncomplete : new boolean[] { true, false })
1763          for (boolean fFirst : new boolean[] { true, false })
1764 <        for (Integer v1 : new Integer[] { 1, null })
1764 >        for (boolean failFirst : new boolean[] { true, false })
1765 >        for (Item v1 : new Item[] { one, null })
1766      {
1767 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1768 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1767 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1768 >        final CompletableFuture<Item> g = new CompletableFuture<>();
1769          final CFException ex = new CFException();
1770 <        final SubtractFunction r = new SubtractFunction(m);
1771 <
1772 <        (fFirst ? f : g).complete(v1);
1773 <        if (!createIncomplete)
1774 <            (!fFirst ? f : g).completeExceptionally(ex);
1775 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1776 <        if (createIncomplete) {
1777 <            checkIncomplete(h);
1778 <            (!fFirst ? f : g).completeExceptionally(ex);
1779 <        }
1780 <
1781 <        checkCompletedWithWrappedCFException(h, ex);
1782 <        r.assertNotInvoked();
1783 <        checkCompletedNormally(fFirst ? f : g, v1);
1784 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
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      /**
1802       * thenCombine result completes exceptionally if either source cancelled
1803       */
1804 <    public void testThenCombine_sourceCancelled() {
1804 >    public void testThenCombine_sourceCancelled() throws Throwable {
1805          for (ExecutionMode m : ExecutionMode.values())
1806          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398        for (boolean createIncomplete : new boolean[] { true, false })
1807          for (boolean fFirst : new boolean[] { true, false })
1808 <        for (Integer v1 : new Integer[] { 1, null })
1808 >        for (boolean failFirst : new boolean[] { true, false })
1809 >        for (Item v1 : new Item[] { one, null })
1810      {
1811 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1812 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1813 <        final SubtractFunction r = new SubtractFunction(m);
1814 <
1815 <        (fFirst ? f : g).complete(v1);
1816 <        if (!createIncomplete)
1817 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1818 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1819 <        if (createIncomplete) {
1820 <            checkIncomplete(h);
1821 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1822 <        }
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(h);
1835 <        checkCancelled(!fFirst ? f : g);
1836 <        r.assertNotInvoked();
1837 <        checkCompletedNormally(fFirst ? f : g, v1);
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      /**
# Line 1424 | Line 1847 | public class CompletableFutureTest exten
1847      public void testThenCombine_actionFailed() {
1848          for (ExecutionMode m : ExecutionMode.values())
1849          for (boolean fFirst : new boolean[] { true, false })
1850 <        for (Integer v1 : new Integer[] { 1, null })
1851 <        for (Integer v2 : new Integer[] { 2, null })
1850 >        for (Item v1 : new Item[] { one, null })
1851 >        for (Item v2 : new Item[] { two, null })
1852      {
1853 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1854 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1855 <        final FailingBiFunction r = new FailingBiFunction(m);
1856 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1857 <
1858 <        if (fFirst) {
1859 <            f.complete(v1);
1860 <            g.complete(v2);
1861 <        } else {
1862 <            g.complete(v2);
1863 <            f.complete(v1);
1864 <        }
1865 <
1866 <        checkCompletedWithWrappedCFException(h);
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      }}
# Line 1451 | Line 1883 | public class CompletableFutureTest exten
1883       */
1884      public void testThenAcceptBoth_normalCompletion() {
1885          for (ExecutionMode m : ExecutionMode.values())
1454        for (boolean createIncomplete : new boolean[] { true, false })
1886          for (boolean fFirst : new boolean[] { true, false })
1887 <        for (Integer v1 : new Integer[] { 1, null })
1888 <        for (Integer v2 : new Integer[] { 2, null })
1887 >        for (Item v1 : new Item[] { one, null })
1888 >        for (Item v2 : new Item[] { two, null })
1889      {
1890 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1891 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1892 <        final SubtractAction r = new SubtractAction(m);
1893 <
1894 <        if (fFirst) f.complete(v1); else g.complete(v2);
1895 <        if (!createIncomplete)
1896 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1897 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1898 <        if (createIncomplete) {
1899 <            checkIncomplete(h);
1900 <            r.assertNotInvoked();
1901 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1902 <        }
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(h, null);
1912 <        r.assertValue(subtract(v1, v2));
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      }}
# Line 1480 | Line 1922 | public class CompletableFutureTest exten
1922       * thenAcceptBoth result completes exceptionally after exceptional
1923       * completion of either source
1924       */
1925 <    public void testThenAcceptBoth_exceptionalCompletion() {
1925 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1926          for (ExecutionMode m : ExecutionMode.values())
1485        for (boolean createIncomplete : new boolean[] { true, false })
1927          for (boolean fFirst : new boolean[] { true, false })
1928 <        for (Integer v1 : new Integer[] { 1, null })
1928 >        for (boolean failFirst : new boolean[] { true, false })
1929 >        for (Item v1 : new Item[] { one, null })
1930      {
1931 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1932 >        final CompletableFuture<Item> g = new CompletableFuture<>();
1933          final CFException ex = new CFException();
1934 <        final SubtractAction r = new SubtractAction(m);
1935 <
1936 <        (fFirst ? f : g).complete(v1);
1937 <        if (!createIncomplete)
1938 <            (!fFirst ? f : g).completeExceptionally(ex);
1939 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1940 <        if (createIncomplete) {
1941 <            checkIncomplete(h);
1942 <            (!fFirst ? f : g).completeExceptionally(ex);
1943 <        }
1944 <
1945 <        checkCompletedWithWrappedCFException(h, ex);
1946 <        r.assertNotInvoked();
1947 <        checkCompletedNormally(fFirst ? f : g, v1);
1948 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
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      /**
1966       * thenAcceptBoth result completes exceptionally if either source cancelled
1967       */
1968 <    public void testThenAcceptBoth_sourceCancelled() {
1968 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1969          for (ExecutionMode m : ExecutionMode.values())
1970          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515        for (boolean createIncomplete : new boolean[] { true, false })
1971          for (boolean fFirst : new boolean[] { true, false })
1972 <        for (Integer v1 : new Integer[] { 1, null })
1972 >        for (boolean failFirst : new boolean[] { true, false })
1973 >        for (Item v1 : new Item[] { one, null })
1974      {
1975 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1976 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1977 <        final SubtractAction r = new SubtractAction(m);
1978 <
1979 <        (fFirst ? f : g).complete(v1);
1980 <        if (!createIncomplete)
1981 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1982 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1983 <        if (createIncomplete) {
1984 <            checkIncomplete(h);
1985 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1986 <        }
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(h);
1999 <        checkCancelled(!fFirst ? f : g);
2000 <        r.assertNotInvoked();
2001 <        checkCompletedNormally(fFirst ? f : g, v1);
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      /**
# Line 1541 | Line 2011 | public class CompletableFutureTest exten
2011      public void testThenAcceptBoth_actionFailed() {
2012          for (ExecutionMode m : ExecutionMode.values())
2013          for (boolean fFirst : new boolean[] { true, false })
2014 <        for (Integer v1 : new Integer[] { 1, null })
2015 <        for (Integer v2 : new Integer[] { 2, null })
2014 >        for (Item v1 : new Item[] { one, null })
2015 >        for (Item v2 : new Item[] { two, null })
2016      {
2017 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2018 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2019 <        final FailingBiConsumer r = new FailingBiConsumer(m);
2020 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2021 <
2022 <        if (fFirst) {
2023 <            f.complete(v1);
2024 <            g.complete(v2);
2025 <        } else {
2026 <            g.complete(v2);
2027 <            f.complete(v1);
2028 <        }
2029 <
2030 <        checkCompletedWithWrappedCFException(h);
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          checkCompletedNormally(g, v2);
2042      }}
# Line 1568 | Line 2047 | public class CompletableFutureTest exten
2047       */
2048      public void testRunAfterBoth_normalCompletion() {
2049          for (ExecutionMode m : ExecutionMode.values())
1571        for (boolean createIncomplete : new boolean[] { true, false })
2050          for (boolean fFirst : new boolean[] { true, false })
2051 <        for (Integer v1 : new Integer[] { 1, null })
2052 <        for (Integer v2 : new Integer[] { 2, null })
2051 >        for (Item v1 : new Item[] { one, null })
2052 >        for (Item v2 : new Item[] { two, null })
2053      {
2054 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2055 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2056 <        final Noop r = new Noop(m);
2057 <
2058 <        if (fFirst) f.complete(v1); else g.complete(v2);
2059 <        if (!createIncomplete)
2060 <            if (!fFirst) f.complete(v1); else g.complete(v2);
2061 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2062 <        if (createIncomplete) {
2063 <            checkIncomplete(h);
2064 <            r.assertNotInvoked();
2065 <            if (!fFirst) f.complete(v1); else g.complete(v2);
2066 <        }
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(h, null);
2076 <        r.assertInvoked();
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      }}
# Line 1597 | Line 2086 | public class CompletableFutureTest exten
2086       * runAfterBoth result completes exceptionally after exceptional
2087       * completion of either source
2088       */
2089 <    public void testRunAfterBoth_exceptionalCompletion() {
2089 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2090          for (ExecutionMode m : ExecutionMode.values())
1602        for (boolean createIncomplete : new boolean[] { true, false })
2091          for (boolean fFirst : new boolean[] { true, false })
2092 <        for (Integer v1 : new Integer[] { 1, null })
2092 >        for (boolean failFirst : new boolean[] { true, false })
2093 >        for (Item v1 : new Item[] { one, null })
2094      {
2095 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2096 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2095 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2096 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2097          final CFException ex = new CFException();
2098 <        final Noop r = new Noop(m);
2099 <
2100 <        (fFirst ? f : g).complete(v1);
2101 <        if (!createIncomplete)
2102 <            (!fFirst ? f : g).completeExceptionally(ex);
2103 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2104 <        if (createIncomplete) {
2105 <            checkIncomplete(h);
2106 <            (!fFirst ? f : g).completeExceptionally(ex);
2107 <        }
2108 <
2109 <        checkCompletedWithWrappedCFException(h, ex);
2110 <        r.assertNotInvoked();
2111 <        checkCompletedNormally(fFirst ? f : g, v1);
2112 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
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_sourceCancelled() {
2132 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2133          for (ExecutionMode m : ExecutionMode.values())
2134          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632        for (boolean createIncomplete : new boolean[] { true, false })
2135          for (boolean fFirst : new boolean[] { true, false })
2136 <        for (Integer v1 : new Integer[] { 1, null })
2136 >        for (boolean failFirst : new boolean[] { true, false })
2137 >        for (Item v1 : new Item[] { one, null })
2138      {
2139 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2140 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2141 <        final Noop r = new Noop(m);
2142 <
2143 <
2144 <        (fFirst ? f : g).complete(v1);
2145 <        if (!createIncomplete)
2146 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2147 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2148 <        if (createIncomplete) {
2149 <            checkIncomplete(h);
2150 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2151 <        }
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(h);
2163 <        checkCancelled(!fFirst ? f : g);
2164 <        r.assertNotInvoked();
2165 <        checkCompletedNormally(fFirst ? f : g, v1);
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      /**
# Line 1659 | Line 2175 | public class CompletableFutureTest exten
2175      public void testRunAfterBoth_actionFailed() {
2176          for (ExecutionMode m : ExecutionMode.values())
2177          for (boolean fFirst : new boolean[] { true, false })
2178 <        for (Integer v1 : new Integer[] { 1, null })
2179 <        for (Integer v2 : new Integer[] { 2, null })
2178 >        for (Item v1 : new Item[] { one, null })
2179 >        for (Item v2 : new Item[] { two, null })
2180      {
2181 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2182 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2188 <        if (fFirst) {
2189 <            f.complete(v1);
2190 <            g.complete(v2);
2191 <        } else {
2192 <            g.complete(v2);
2193 <            f.complete(v1);
2194 <        }
2195 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2196 <
2197 <        checkCompletedWithWrappedCFException(h1);
2198 <        checkCompletedWithWrappedCFException(h2);
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          checkCompletedNormally(g, v2);
2206      }}
# Line 1689 | Line 2211 | public class CompletableFutureTest exten
2211       */
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 })
2214 >        for (Item v1 : new Item[] { one, null })
2215 >        for (Item v2 : new Item[] { two, null })
2216      {
2217 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2218 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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<Integer> h0 = m.applyToEither(f, g, rs[0]);
2223 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
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();
# Line 1706 | Line 2228 | public class CompletableFutureTest exten
2228          f.complete(v1);
2229          checkCompletedNormally(h0, inc(v1));
2230          checkCompletedNormally(h1, inc(v1));
2231 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2232 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
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          // unspecified behavior - both source completions available
2238 <        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2239 <        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
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()) ||
# Line 1737 | Line 2259 | public class CompletableFutureTest exten
2259       */
2260      public void testApplyToEither_exceptionalCompletion() {
2261          for (ExecutionMode m : ExecutionMode.values())
2262 <        for (Integer v1 : new Integer[] { 1, null })
2262 >        for (Item v1 : new Item[] { one, null })
2263      {
2264 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2265 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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<Integer> h0 = m.applyToEither(f, g, rs[0]);
2271 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
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(h0, ex);
2278 <        checkCompletedWithWrappedCFException(h1, ex);
2279 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2280 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2281 <        checkCompletedWithWrappedCFException(h2, ex);
2282 <        checkCompletedWithWrappedCFException(h3, 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          // unspecified behavior - both source completions available
2286 <        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2287 <        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
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 <            assertEquals(inc(v1), h4.join());
2289 >            mustEqual(inc(v1), h4.join());
2290              rs[4].assertValue(inc(v1));
2291          } catch (CompletionException ok) {
2292 <            checkCompletedWithWrappedCFException(h4, ex);
2292 >            checkCompletedWithWrappedException(h4, ex);
2293              rs[4].assertNotInvoked();
2294          }
2295          try {
2296 <            assertEquals(inc(v1), h5.join());
2296 >            mustEqual(inc(v1), h5.join());
2297              rs[5].assertValue(inc(v1));
2298          } catch (CompletionException ok) {
2299 <            checkCompletedWithWrappedCFException(h5, ex);
2299 >            checkCompletedWithWrappedException(h5, ex);
2300              rs[5].assertNotInvoked();
2301          }
2302  
2303 <        checkCompletedWithWrappedCFException(f, ex);
2303 >        checkCompletedExceptionally(f, ex);
2304          checkCompletedNormally(g, v1);
2305 <        checkCompletedWithWrappedCFException(h0, ex);
2306 <        checkCompletedWithWrappedCFException(h1, ex);
2307 <        checkCompletedWithWrappedCFException(h2, ex);
2308 <        checkCompletedWithWrappedCFException(h3, ex);
2309 <        checkCompletedWithWrappedCFException(h4, ex);
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_exceptionalCompletion2() {
2314          for (ExecutionMode m : ExecutionMode.values())
2315          for (boolean fFirst : new boolean[] { true, false })
2316 <        for (Integer v1 : new Integer[] { 1, null })
2316 >        for (Item v1 : new Item[] { one, null })
2317      {
2318 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2319 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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 <        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2325 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2326 <        if (fFirst) {
2327 <            f.complete(v1);
2328 <            g.completeExceptionally(ex);
2329 <        } else {
1808 <            g.completeExceptionally(ex);
1809 <            f.complete(v1);
1810 <        }
1811 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1812 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
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 - both source completions available
2332          try {
2333 <            assertEquals(inc(v1), h0.join());
2333 >            mustEqual(inc(v1), h0.join());
2334              rs[0].assertValue(inc(v1));
2335          } catch (CompletionException ok) {
2336 <            checkCompletedWithWrappedCFException(h0, ex);
2336 >            checkCompletedWithWrappedException(h0, ex);
2337              rs[0].assertNotInvoked();
2338          }
2339          try {
2340 <            assertEquals(inc(v1), h1.join());
2340 >            mustEqual(inc(v1), h1.join());
2341              rs[1].assertValue(inc(v1));
2342          } catch (CompletionException ok) {
2343 <            checkCompletedWithWrappedCFException(h1, ex);
2343 >            checkCompletedWithWrappedException(h1, ex);
2344              rs[1].assertNotInvoked();
2345          }
2346          try {
2347 <            assertEquals(inc(v1), h2.join());
2347 >            mustEqual(inc(v1), h2.join());
2348              rs[2].assertValue(inc(v1));
2349          } catch (CompletionException ok) {
2350 <            checkCompletedWithWrappedCFException(h2, ex);
2350 >            checkCompletedWithWrappedException(h2, ex);
2351              rs[2].assertNotInvoked();
2352          }
2353          try {
2354 <            assertEquals(inc(v1), h3.join());
2354 >            mustEqual(inc(v1), h3.join());
2355              rs[3].assertValue(inc(v1));
2356          } catch (CompletionException ok) {
2357 <            checkCompletedWithWrappedCFException(h3, ex);
2357 >            checkCompletedWithWrappedException(h3, ex);
2358              rs[3].assertNotInvoked();
2359          }
2360  
2361          checkCompletedNormally(f, v1);
2362 <        checkCompletedWithWrappedCFException(g, ex);
2362 >        checkCompletedExceptionally(g, ex);
2363      }}
2364  
2365      /**
# Line 1851 | Line 2368 | public class CompletableFutureTest exten
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 })
2371 >        for (Item v1 : new Item[] { one, null })
2372      {
2373 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2374 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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<Integer> h0 = m.applyToEither(f, g, rs[0]);
2379 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
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();
# Line 1867 | Line 2384 | public class CompletableFutureTest exten
2384          f.cancel(mayInterruptIfRunning);
2385          checkCompletedWithWrappedCancellationException(h0);
2386          checkCompletedWithWrappedCancellationException(h1);
2387 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2388 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
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<Integer> h4 = m.applyToEither(f, g, rs[4]);
2395 <        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
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 <            assertEquals(inc(v1), h4.join());
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 <            assertEquals(inc(v1), h5.join());
2404 >            mustEqual(inc(v1), h5.join());
2405              rs[5].assertValue(inc(v1));
2406          } catch (CompletionException ok) {
2407              checkCompletedWithWrappedCancellationException(h5);
# Line 1904 | Line 2421 | public class CompletableFutureTest exten
2421          for (ExecutionMode m : ExecutionMode.values())
2422          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2423          for (boolean fFirst : new boolean[] { true, false })
2424 <        for (Integer v1 : new Integer[] { 1, null })
2424 >        for (Item v1 : new Item[] { one, null })
2425      {
2426 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2427 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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<Integer> h0 = m.applyToEither(f, g, rs[0]);
2432 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2433 <        if (fFirst) {
2434 <            f.complete(v1);
2435 <            g.cancel(mayInterruptIfRunning);
2436 <        } else {
1920 <            g.cancel(mayInterruptIfRunning);
1921 <            f.complete(v1);
1922 <        }
1923 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1924 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
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          // unspecified behavior - both source completions available
2439          try {
2440 <            assertEquals(inc(v1), h0.join());
2440 >            mustEqual(inc(v1), h0.join());
2441              rs[0].assertValue(inc(v1));
2442          } catch (CompletionException ok) {
2443              checkCompletedWithWrappedCancellationException(h0);
2444              rs[0].assertNotInvoked();
2445          }
2446          try {
2447 <            assertEquals(inc(v1), h1.join());
2447 >            mustEqual(inc(v1), h1.join());
2448              rs[1].assertValue(inc(v1));
2449          } catch (CompletionException ok) {
2450              checkCompletedWithWrappedCancellationException(h1);
2451              rs[1].assertNotInvoked();
2452          }
2453          try {
2454 <            assertEquals(inc(v1), h2.join());
2454 >            mustEqual(inc(v1), h2.join());
2455              rs[2].assertValue(inc(v1));
2456          } catch (CompletionException ok) {
2457              checkCompletedWithWrappedCancellationException(h2);
2458              rs[2].assertNotInvoked();
2459          }
2460          try {
2461 <            assertEquals(inc(v1), h3.join());
2461 >            mustEqual(inc(v1), h3.join());
2462              rs[3].assertValue(inc(v1));
2463          } catch (CompletionException ok) {
2464              checkCompletedWithWrappedCancellationException(h3);
# Line 1962 | Line 2474 | public class CompletableFutureTest exten
2474       */
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 })
2477 >        for (Item v1 : new Item[] { one, null })
2478 >        for (Item v2 : new Item[] { two, null })
2479      {
2480 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2481 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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<Integer> h0 = m.applyToEither(f, g, rs[0]);
2486 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
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<Integer> h2 = m.applyToEither(f, g, rs[2]);
2489 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2490 <        checkCompletedWithWrappedCFException(h0);
2491 <        checkCompletedWithWrappedCFException(h1);
2492 <        checkCompletedWithWrappedCFException(h2);
2493 <        checkCompletedWithWrappedCFException(h3);
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  
2496          g.complete(v2);
2497  
2498          // unspecified behavior - both source completions available
2499 <        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2500 <        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2499 >        final CompletableFuture<Item> h4 = m.applyToEither(f, g, rs[4]);
2500 >        final CompletableFuture<Item> h5 = m.applyToEither(g, f, rs[5]);
2501  
2502 <        checkCompletedWithWrappedCFException(h4);
2502 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2503          assertTrue(Objects.equals(v1, rs[4].value) ||
2504                     Objects.equals(v2, rs[4].value));
2505 <        checkCompletedWithWrappedCFException(h5);
2505 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2506          assertTrue(Objects.equals(v1, rs[5].value) ||
2507                     Objects.equals(v2, rs[5].value));
2508  
# Line 2004 | Line 2516 | public class CompletableFutureTest exten
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 })
2519 >        for (Item v1 : new Item[] { one, null })
2520 >        for (Item v2 : new Item[] { two, null })
2521      {
2522 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2523 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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  
# Line 2056 | Line 2568 | public class CompletableFutureTest exten
2568       */
2569      public void testAcceptEither_exceptionalCompletion() {
2570          for (ExecutionMode m : ExecutionMode.values())
2571 <        for (Integer v1 : new Integer[] { 1, null })
2571 >        for (Item v1 : new Item[] { one, null })
2572      {
2573 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2574 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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);
# Line 2071 | Line 2583 | public class CompletableFutureTest exten
2583          rs[0].assertNotInvoked();
2584          rs[1].assertNotInvoked();
2585          f.completeExceptionally(ex);
2586 <        checkCompletedWithWrappedCFException(h0, ex);
2587 <        checkCompletedWithWrappedCFException(h1, ex);
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 <        checkCompletedWithWrappedCFException(h2, ex);
2591 <        checkCompletedWithWrappedCFException(h3, ex);
2590 >        checkCompletedWithWrappedException(h2, ex);
2591 >        checkCompletedWithWrappedException(h3, ex);
2592  
2593          g.complete(v1);
2594  
# Line 2087 | Line 2599 | public class CompletableFutureTest exten
2599              assertNull(h4.join());
2600              rs[4].assertValue(v1);
2601          } catch (CompletionException ok) {
2602 <            checkCompletedWithWrappedCFException(h4, ex);
2602 >            checkCompletedWithWrappedException(h4, ex);
2603              rs[4].assertNotInvoked();
2604          }
2605          try {
2606              assertNull(h5.join());
2607              rs[5].assertValue(v1);
2608          } catch (CompletionException ok) {
2609 <            checkCompletedWithWrappedCFException(h5, ex);
2609 >            checkCompletedWithWrappedException(h5, ex);
2610              rs[5].assertNotInvoked();
2611          }
2612  
2613 <        checkCompletedWithWrappedCFException(f, ex);
2613 >        checkCompletedExceptionally(f, ex);
2614          checkCompletedNormally(g, v1);
2615 <        checkCompletedWithWrappedCFException(h0, ex);
2616 <        checkCompletedWithWrappedCFException(h1, ex);
2617 <        checkCompletedWithWrappedCFException(h2, ex);
2618 <        checkCompletedWithWrappedCFException(h3, ex);
2619 <        checkCompletedWithWrappedCFException(h4, ex);
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_exceptionalCompletion2() {
2624          for (ExecutionMode m : ExecutionMode.values())
2625          for (boolean fFirst : new boolean[] { true, false })
2626 <        for (Integer v1 : new Integer[] { 1, null })
2626 >        for (Item v1 : new Item[] { one, null })
2627      {
2628 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2629 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2635          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2636 <        if (fFirst) {
2637 <            f.complete(v1);
2126 <            g.completeExceptionally(ex);
2127 <        } else {
2128 <            g.completeExceptionally(ex);
2129 <            f.complete(v1);
2130 <        }
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 - both source completions available
2642          try {
2643 <            assertEquals(null, h0.join());
2643 >            assertNull(h0.join());
2644              rs[0].assertValue(v1);
2645          } catch (CompletionException ok) {
2646 <            checkCompletedWithWrappedCFException(h0, ex);
2646 >            checkCompletedWithWrappedException(h0, ex);
2647              rs[0].assertNotInvoked();
2648          }
2649          try {
2650 <            assertEquals(null, h1.join());
2650 >            assertNull(h1.join());
2651              rs[1].assertValue(v1);
2652          } catch (CompletionException ok) {
2653 <            checkCompletedWithWrappedCFException(h1, ex);
2653 >            checkCompletedWithWrappedException(h1, ex);
2654              rs[1].assertNotInvoked();
2655          }
2656          try {
2657 <            assertEquals(null, h2.join());
2657 >            assertNull(h2.join());
2658              rs[2].assertValue(v1);
2659          } catch (CompletionException ok) {
2660 <            checkCompletedWithWrappedCFException(h2, ex);
2660 >            checkCompletedWithWrappedException(h2, ex);
2661              rs[2].assertNotInvoked();
2662          }
2663          try {
2664 <            assertEquals(null, h3.join());
2664 >            assertNull(h3.join());
2665              rs[3].assertValue(v1);
2666          } catch (CompletionException ok) {
2667 <            checkCompletedWithWrappedCFException(h3, ex);
2667 >            checkCompletedWithWrappedException(h3, ex);
2668              rs[3].assertNotInvoked();
2669          }
2670  
2671          checkCompletedNormally(f, v1);
2672 <        checkCompletedWithWrappedCFException(g, ex);
2672 >        checkCompletedExceptionally(g, ex);
2673      }}
2674  
2675      /**
# Line 2171 | Line 2678 | public class CompletableFutureTest exten
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 })
2681 >        for (Item v1 : new Item[] { one, null })
2682      {
2683 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2684 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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  
# Line 2226 | Line 2733 | public class CompletableFutureTest exten
2733       */
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<Integer> f = new CompletableFuture<>();
2740 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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  
# Line 2239 | Line 2746 | public class CompletableFutureTest exten
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 <        checkCompletedWithWrappedCFException(h0);
2750 <        checkCompletedWithWrappedCFException(h1);
2751 <        checkCompletedWithWrappedCFException(h2);
2752 <        checkCompletedWithWrappedCFException(h3);
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  
2755          g.complete(v2);
# Line 2251 | Line 2758 | public class CompletableFutureTest exten
2758          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2759          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2760  
2761 <        checkCompletedWithWrappedCFException(h4);
2761 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2762          assertTrue(Objects.equals(v1, rs[4].value) ||
2763                     Objects.equals(v2, rs[4].value));
2764 <        checkCompletedWithWrappedCFException(h5);
2764 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2765          assertTrue(Objects.equals(v1, rs[5].value) ||
2766                     Objects.equals(v2, rs[5].value));
2767  
# Line 2268 | Line 2775 | public class CompletableFutureTest exten
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 })
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<Integer> f = new CompletableFuture<>();
2783 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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  
# Line 2282 | Line 2790 | public class CompletableFutureTest exten
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);
# Line 2316 | Line 2828 | public class CompletableFutureTest exten
2828       */
2829      public void testRunAfterEither_exceptionalCompletion() {
2830          for (ExecutionMode m : ExecutionMode.values())
2831 <        for (Integer v1 : new Integer[] { 1, null })
2831 >        for (Item v1 : new Item[] { one, null })
2832      {
2833 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2834 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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);
# Line 2330 | Line 2842 | public class CompletableFutureTest exten
2842          checkIncomplete(h1);
2843          rs[0].assertNotInvoked();
2844          rs[1].assertNotInvoked();
2845 <        f.completeExceptionally(ex);
2846 <        checkCompletedWithWrappedCFException(h0, ex);
2847 <        checkCompletedWithWrappedCFException(h1, ex);
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 <        checkCompletedWithWrappedCFException(h2, ex);
2851 <        checkCompletedWithWrappedCFException(h3, ex);
2850 >        checkCompletedWithWrappedException(h2, ex);
2851 >        checkCompletedWithWrappedException(h3, ex);
2852  
2853 <        g.complete(v1);
2853 >        assertTrue(g.complete(v1));
2854  
2855          // unspecified behavior - both source completions available
2856          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2347 | Line 2859 | public class CompletableFutureTest exten
2859              assertNull(h4.join());
2860              rs[4].assertInvoked();
2861          } catch (CompletionException ok) {
2862 <            checkCompletedWithWrappedCFException(h4, ex);
2862 >            checkCompletedWithWrappedException(h4, ex);
2863              rs[4].assertNotInvoked();
2864          }
2865          try {
2866              assertNull(h5.join());
2867              rs[5].assertInvoked();
2868          } catch (CompletionException ok) {
2869 <            checkCompletedWithWrappedCFException(h5, ex);
2869 >            checkCompletedWithWrappedException(h5, ex);
2870              rs[5].assertNotInvoked();
2871          }
2872  
2873 <        checkCompletedWithWrappedCFException(f, ex);
2873 >        checkCompletedExceptionally(f, ex);
2874          checkCompletedNormally(g, v1);
2875 <        checkCompletedWithWrappedCFException(h0, ex);
2876 <        checkCompletedWithWrappedCFException(h1, ex);
2877 <        checkCompletedWithWrappedCFException(h2, ex);
2878 <        checkCompletedWithWrappedCFException(h3, ex);
2879 <        checkCompletedWithWrappedCFException(h4, ex);
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 (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 +        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 - both source completions available
2902 +        try {
2903 +            assertNull(h0.join());
2904 +            rs[0].assertInvoked();
2905 +        } catch (CompletionException ok) {
2906 +            checkCompletedWithWrappedException(h0, ex);
2907 +            rs[0].assertNotInvoked();
2908 +        }
2909 +        try {
2910 +            assertNull(h1.join());
2911 +            rs[1].assertInvoked();
2912 +        } catch (CompletionException ok) {
2913 +            checkCompletedWithWrappedException(h1, ex);
2914 +            rs[1].assertNotInvoked();
2915 +        }
2916 +        try {
2917 +            assertNull(h2.join());
2918 +            rs[2].assertInvoked();
2919 +        } catch (CompletionException ok) {
2920 +            checkCompletedWithWrappedException(h2, ex);
2921 +            rs[2].assertNotInvoked();
2922 +        }
2923 +        try {
2924 +            assertNull(h3.join());
2925 +            rs[3].assertInvoked();
2926 +        } catch (CompletionException ok) {
2927 +            checkCompletedWithWrappedException(h3, ex);
2928 +            rs[3].assertNotInvoked();
2929 +        }
2930 +
2931 +        checkCompletedNormally(f, v1);
2932 +        checkCompletedExceptionally(g, ex);
2933 +    }}
2934 +
2935      /**
2936       * runAfterEither result completes exceptionally if either source cancelled
2937       */
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 })
2941 >        for (Item v1 : new Item[] { one, null })
2942      {
2943 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2944 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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  
# Line 2395 | Line 2959 | public class CompletableFutureTest exten
2959          checkCompletedWithWrappedCancellationException(h2);
2960          checkCompletedWithWrappedCancellationException(h3);
2961  
2962 <        g.complete(v1);
2962 >        assertTrue(g.complete(v1));
2963  
2964          // unspecified behavior - both source completions available
2965          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2429 | Line 2993 | public class CompletableFutureTest exten
2993       */
2994      public void testRunAfterEither_actionFailed() {
2995          for (ExecutionMode m : ExecutionMode.values())
2996 <        for (Integer v1 : new Integer[] { 1, null })
2997 <        for (Integer v2 : new Integer[] { 2, null })
2996 >        for (Item v1 : new Item[] { one, null })
2997 >        for (Item v2 : new Item[] { two, null })
2998      {
2999 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3000 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
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 <        f.complete(v1);
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 <        checkCompletedWithWrappedCFException(h0);
3010 <        checkCompletedWithWrappedCFException(h1);
3011 <        checkCompletedWithWrappedCFException(h2);
3012 <        checkCompletedWithWrappedCFException(h3);
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 <        g.complete(v2);
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 <        checkCompletedWithWrappedCFException(h4);
3018 <        checkCompletedWithWrappedCFException(h5);
3017 >        checkCompletedWithWrappedException(h4, rs[4].ex);
3018 >        checkCompletedWithWrappedException(h5, rs[5].ex);
3019  
3020          checkCompletedNormally(f, v1);
3021          checkCompletedNormally(g, v2);
# Line 2464 | Line 3028 | public class CompletableFutureTest exten
3028      public void testThenCompose_normalCompletion() {
3029          for (ExecutionMode m : ExecutionMode.values())
3030          for (boolean createIncomplete : new boolean[] { true, false })
3031 <        for (Integer v1 : new Integer[] { 1, null })
3031 >        for (Item v1 : new Item[] { one, null })
3032      {
3033 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3033 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3034          final CompletableFutureInc r = new CompletableFutureInc(m);
3035 <        if (!createIncomplete) f.complete(v1);
3036 <        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3037 <        if (createIncomplete) f.complete(v1);
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          checkCompletedNormally(g, inc(v1));
3040          checkCompletedNormally(f, v1);
3041 <        r.assertInvoked();
3041 >        r.assertValue(v1);
3042      }}
3043  
3044      /**
# Line 2487 | Line 3051 | public class CompletableFutureTest exten
3051      {
3052          final CFException ex = new CFException();
3053          final CompletableFutureInc r = new CompletableFutureInc(m);
3054 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3054 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3055          if (!createIncomplete) f.completeExceptionally(ex);
3056 <        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3056 >        final CompletableFuture<Item> g = m.thenCompose(f, r);
3057          if (createIncomplete) f.completeExceptionally(ex);
3058  
3059 <        checkCompletedWithWrappedCFException(g, ex);
3060 <        checkCompletedWithWrappedCFException(f, ex);
3059 >        checkCompletedWithWrappedException(g, ex);
3060 >        checkCompletedExceptionally(f, ex);
3061          r.assertNotInvoked();
3062      }}
3063  
# Line 2503 | Line 3067 | public class CompletableFutureTest exten
3067      public void testThenCompose_actionFailed() {
3068          for (ExecutionMode m : ExecutionMode.values())
3069          for (boolean createIncomplete : new boolean[] { true, false })
3070 <        for (Integer v1 : new Integer[] { 1, null })
3070 >        for (Item v1 : new Item[] { one, null })
3071      {
3072 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3072 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3073          final FailingCompletableFutureFunction r
3074              = new FailingCompletableFutureFunction(m);
3075 <        if (!createIncomplete) f.complete(v1);
3076 <        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3077 <        if (createIncomplete) f.complete(v1);
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 <        checkCompletedWithWrappedCFException(g);
3079 >        checkCompletedWithWrappedException(g, r.ex);
3080          checkCompletedNormally(f, v1);
3081      }}
3082  
# Line 2524 | Line 3088 | public class CompletableFutureTest exten
3088          for (boolean createIncomplete : new boolean[] { true, false })
3089          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3090      {
3091 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3091 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3092          final CompletableFutureInc r = new CompletableFutureInc(m);
3093          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3094 <        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3094 >        final CompletableFuture<Item> g = m.thenCompose(f, r);
3095          if (createIncomplete) {
3096              checkIncomplete(g);
3097              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2537 | Line 3101 | public class CompletableFutureTest exten
3101          checkCancelled(f);
3102      }}
3103  
3104 +    /**
3105 +     * thenCompose result completes exceptionally if the result of the action does
3106 +     */
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 +        checkCompletedExceptionally(g, ex);
3152 +        checkCompletedWithWrappedException(h, ex);
3153 +        checkCompletedNormally(f, v1);
3154 +    }}
3155 +
3156 +    /**
3157 +     * exceptionallyCompose result completes normally after normal
3158 +     * completion of source
3159 +     */
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 +        checkCompletedNormally(f, v1);
3173 +        checkCompletedNormally(g, v1);
3174 +        r.assertNotInvoked();
3175 +    }}
3176 +
3177 +    /**
3178 +     * exceptionallyCompose result completes normally after exceptional
3179 +     * completion of source
3180 +     */
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 +        checkCompletedExceptionally(f, ex);
3194 +        checkCompletedNormally(g, r.value);
3195 +        r.assertInvoked();
3196 +    }}
3197 +
3198 +    /**
3199 +     * exceptionallyCompose completes exceptionally on exception if action does
3200 +     */
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  
3273      /**
# Line 2553 | 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
3289 <                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3290 <            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 2569 | Line 3301 | public class CompletableFutureTest exten
3301          }
3302      }
3303  
3304 <    public void testAllOf_backwards() throws Exception {
3305 <        for (int k = 1; k < 20; ++k) {
3306 <            CompletableFuture<Integer>[] fs
3307 <                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3308 <            for (int i = 0; i < k; ++i)
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--) {
# Line 2586 | Line 3319 | public class CompletableFutureTest exten
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 2617 | 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 2634 | 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;
2641 <        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(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3458 >            () -> CompletableFuture.supplyAsync(new ItemSupplier(ExecutionMode.SYNC, fortytwo), null),
3459  
3460              () -> CompletableFuture.runAsync(null),
3461              () -> CompletableFuture.runAsync(null, exec),
# Line 2654 | 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 2694 | 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 2735 | Line 3546 | public class CompletableFutureTest exten
3546              () -> CompletableFuture.anyOf(null, f),
3547  
3548              () -> f.obtrudeException(null),
2738        };
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
2754 <     * source result.
3713 >     * newIncompleteFuture returns an incomplete CompletableFuture
3714       */
3715 <    public void testWhenComplete_normalCompletion1() {
3716 <        for (ExecutionMode m : ExecutionMode.values())
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 (Integer v1 : new Integer[] { 1, null })
3772 >        for (Item v1 : new Item[] { one, null })
3773      {
3774 <        final AtomicInteger a = new AtomicInteger(0);
3775 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3776 <        if (!createIncomplete) f.complete(v1);
3777 <        final CompletableFuture<Integer> g = m.whenComplete
3778 <            (f,
3779 <             (Integer x, Throwable t) -> {
3780 <                threadAssertSame(x, v1);
3781 <                threadAssertNull(t);
3782 <                a.getAndIncrement();
3783 <            });
3784 <        if (createIncomplete) f.complete(v1);
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 >    }}
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 >     * minimalCompletionStage returns a CompletableFuture that is
3821 >     * completed normally, with the same value, when source is.
3822 >     */
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 >    /**
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 >        checkCompletedExceptionally(f, ex);
3850 >        mustEqual(x.get(), 0);
3851 >        mustEqual(r.get().getCause(), ex);
3852 >    }
3853 >
3854 >    /**
3855 >     * failedStage returns a CompletionStage completed
3856 >     * exceptionally with the given Exception
3857 >     */
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 >    /**
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          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 +     * completeOnTimeout completes with given value if not complete
3965 +     */
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 <        assertEquals(1, a.get());
3991 >        checkCompletedNormally(g, v1);
3992 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3993      }}
3994  
3995      /**
3996 <     * whenComplete action executes on exceptional completion, propagating
2780 <     * source result.
3996 >     * delayedExecutor returns an executor that delays submission
3997       */
3998 <    public void testWhenComplete_exceptionalCompletion() {
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())
2784        for (boolean createIncomplete : new boolean[] { true, false })
2785        for (Integer v1 : new Integer[] { 1, null })
4063      {
2787        final AtomicInteger a = new AtomicInteger(0);
4064          final CFException ex = new CFException();
4065 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4065 >        final CompletableFuture<Item> v42 = CompletableFuture.completedFuture(fortytwo);
4066 >        final CompletableFuture<Item> incomplete = new CompletableFuture<>();
4067 >
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 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4219 >     * is completed normally, with the same value, when source is.
4220 >     */
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 >    /**
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 <        final CompletableFuture<Integer> g = m.whenComplete
4250 <            (f,
4251 <             (Integer x, Throwable t) -> {
4252 <                threadAssertNull(x);
4253 <                threadAssertSame(t, ex);
4254 <                a.getAndIncrement();
4255 <            });
4256 <        if (createIncomplete) f.completeExceptionally(ex);
2799 <        checkCompletedWithWrappedCFException(f, ex);
2800 <        checkCompletedWithWrappedCFException(g, ex);
2801 <        assertEquals(1, a.get());
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 <     * whenComplete action executes on cancelled source, propagating
2806 <     * CancellationException.
4260 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4261       */
4262 <    public void testWhenComplete_sourceCancelled() {
4263 <        for (ExecutionMode m : ExecutionMode.values())
4264 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 >    /**
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 <        final AtomicInteger a = new AtomicInteger(0);
4282 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4283 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
4284 <        final CompletableFuture<Integer> g = m.whenComplete
4285 <            (f,
4286 <             (Integer x, Throwable t) -> {
4287 <                threadAssertNull(x);
4288 <                threadAssertTrue(t instanceof CancellationException);
4289 <                a.getAndIncrement();
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(g.toCompletableFuture(), one);
4305 >    }
4306 >
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 >     * 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 >    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 >        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<Item>(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.cancel(mayInterruptIfRunning));
4845 >        if (createIncomplete) assertTrue(f.complete(v1));
4846  
4847 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
4848 <        checkCompletedWithWrappedCancellationException(g);
4849 <        checkCancelled(f);
2828 <        assertEquals(1, a.get());
4847 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4848 >        checkCompletedNormally(f, v1);
4849 >        mustEqual(0, ran.get());
4850      }}
4851  
4852      /**
4853 <     * If a whenComplete action throws an exception when triggered by
4854 <     * a normal completion, it completes exceptionally
4853 >     * default-implemented exceptionallyAsync action completes with
4854 >     * function value on source exception
4855       */
4856 <    public void testWhenComplete_actionFailed() {
4856 >    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4857          for (boolean createIncomplete : new boolean[] { true, false })
4858 <        for (ExecutionMode m : ExecutionMode.values())
2838 <        for (Integer v1 : new Integer[] { 1, null })
4858 >        for (Item v1 : new Item[] { one, null })
4859      {
4860 <        final AtomicInteger a = new AtomicInteger(0);
4860 >        final AtomicInteger ran = new AtomicInteger(0);
4861          final CFException ex = new CFException();
4862 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4863 <        if (!createIncomplete) f.complete(v1);
4864 <        final CompletableFuture<Integer> g = m.whenComplete
4865 <            (f,
4866 <             (Integer x, Throwable t) -> {
4867 <                threadAssertSame(x, v1);
4868 <                threadAssertNull(t);
4869 <                a.getAndIncrement();
4870 <                throw ex;
4862 >        final CompletableFuture<Item> f = new CompletableFuture<>();
4863 >        final DelegatedCompletionStage<Item> d =
4864 >            new DelegatedCompletionStage<Item>(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.complete(v1);
4873 <        checkCompletedNormally(f, v1);
4874 <        checkCompletedWithWrappedCFException(g, ex);
4875 <        assertEquals(1, a.get());
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 <     * If a whenComplete action throws an exception when triggered by
4881 <     * a source completion that also throws an exception, the source
4882 <     * exception takes precedence.
4880 >     * Under default implementation, if an "exceptionally action"
4881 >     * throws an exception, it completes exceptionally with that
4882 >     * exception
4883       */
4884 <    public void testWhenComplete_actionFailedSourceFailed() {
4884 >    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4885          for (boolean createIncomplete : new boolean[] { true, false })
2865        for (ExecutionMode m : ExecutionMode.values())
2866        for (Integer v1 : new Integer[] { 1, null })
4886      {
4887 <        final AtomicInteger a = new AtomicInteger(0);
4887 >        final AtomicInteger ran = new AtomicInteger(0);
4888          final CFException ex1 = new CFException();
4889          final CFException ex2 = new CFException();
4890 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4891 <
4890 >        final CompletableFuture<Item> f = new CompletableFuture<>();
4891 >        final DelegatedCompletionStage<Item> d =
4892 >            new DelegatedCompletionStage<Item>(f);
4893          if (!createIncomplete) f.completeExceptionally(ex1);
4894 <        final CompletableFuture<Integer> g = m.whenComplete
4895 <            (f,
4896 <             (Integer x, Throwable t) -> {
4897 <                threadAssertSame(t, ex1);
2878 <                threadAssertNull(x);
2879 <                a.getAndIncrement();
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 <        checkCompletedWithWrappedCFException(f, ex1);
4903 <        checkCompletedWithWrappedCFException(g, ex1);
4904 <        assertEquals(1, a.get());
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<Item>(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<Item>(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<Item>(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<Item>(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<Item>(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<Item>(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<Item>(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<Item>(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<Item>(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