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.75 by jsr166, Sat Jun 7 21:14:42 2014 UTC vs.
Revision 1.197 by jsr166, Sun Jul 22 22:08:49 2018 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 >        assertEquals(expectedValue, f.join());
81 >        assertEquals(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 +        assertEquals(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 <    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
106 <                                                      Throwable 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  
135        assertTrue(f.isDone());
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 <    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
152 <                                                Throwable ex) {
153 <        checkCompletedExceptionallyWithRootCause(f, ex);
143 <        try {
144 <            CompletableFuture<Throwable> spy = f.handle
145 <                ((U u, Throwable t) -> t);
146 <            assertTrue(spy.join() instanceof CompletionException);
147 <            assertSame(ex, spy.join().getCause());
148 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
151 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
152 >        checkCompletedExceptionally(f, true,
153 >            t -> assertTrue(t instanceof CFException));
154      }
155  
156 <    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
157 <        checkCompletedExceptionallyWithRootCause(f, ex);
158 <        try {
159 <            CompletableFuture<Throwable> spy = f.handle
160 <                ((U u, Throwable t) -> t);
161 <            assertSame(ex, spy.join());
162 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
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 176 | Line 194 | public class CompletableFutureTest exten
194              shouldThrow();
195          } catch (CancellationException success) {
196          } catch (Throwable fail) { threadUnexpectedException(fail); }
179        assertTrue(f.isDone());
180        assertTrue(f.isCompletedExceptionally());
181        assertTrue(f.isCancelled());
182        assertTrue(f.toString().contains("[Completed exceptionally]"));
183    }
197  
198 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
199 <        try {
187 <            f.get(LONG_DELAY_MS, MILLISECONDS);
188 <            shouldThrow();
189 <        } catch (ExecutionException success) {
190 <            assertTrue(success.getCause() instanceof CancellationException);
191 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
192 <        try {
193 <            f.join();
194 <            shouldThrow();
195 <        } catch (CompletionException success) {
196 <            assertTrue(success.getCause() instanceof CancellationException);
197 <        }
198 <        try {
199 <            f.getNow(null);
200 <            shouldThrow();
201 <        } catch (CompletionException success) {
202 <            assertTrue(success.getCause() instanceof CancellationException);
203 <        }
204 <        try {
205 <            f.get();
206 <            shouldThrow();
207 <        } catch (ExecutionException success) {
208 <            assertTrue(success.getCause() instanceof CancellationException);
209 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
198 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
199 >
200          assertTrue(f.isDone());
211        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 227 | Line 217 | public class CompletableFutureTest exten
217       * isCancelled, join, get, and getNow
218       */
219      public void testComplete() {
220 +        for (Integer v1 : new Integer[] { 1, null })
221 +    {
222          CompletableFuture<Integer> 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
# Line 250 | Line 243 | public class CompletableFutureTest exten
243       * methods isDone, isCancelled, join, get, and getNow
244       */
245      public void testCancel() {
246 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
247 +    {
248          CompletableFuture<Integer> 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
# Line 262 | Line 259 | public class CompletableFutureTest exten
259      public void testObtrudeValue() {
260          CompletableFuture<Integer> 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 289 | Line 286 | public class CompletableFutureTest exten
286          CompletableFuture<Integer> f;
287  
288          f = new CompletableFuture<>();
289 <        f.complete(v1);
289 >        assertTrue(f.complete(v1));
290          for (int i = 0; i < 2; i++) {
291              f.obtrudeException(ex = new CFException());
292              checkCompletedExceptionally(f, ex);
# Line 302 | Line 299 | public class CompletableFutureTest exten
299          }
300  
301          f = new CompletableFuture<>();
302 <        f.completeExceptionally(ex = new CFException());
302 >        f.completeExceptionally(new CFException());
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 <        f.complete(v1);
309 >        assertFalse(f.complete(v1));
310          checkCompletedExceptionally(f, ex);
311      }}
312  
# Line 317 | Line 314 | public class CompletableFutureTest exten
314       * getNumberOfDependents returns number of dependent tasks
315       */
316      public void testGetNumberOfDependents() {
317 +        for (ExecutionMode m : ExecutionMode.values())
318 +        for (Integer v1 : new Integer[] { 1, null })
319 +    {
320          CompletableFuture<Integer> f = new CompletableFuture<>();
321          assertEquals(0, f.getNumberOfDependents());
322 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
322 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
323          assertEquals(1, f.getNumberOfDependents());
324          assertEquals(0, g.getNumberOfDependents());
325 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
325 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
326          assertEquals(2, f.getNumberOfDependents());
327 <        f.complete(1);
327 >        assertEquals(0, h.getNumberOfDependents());
328 >        assertTrue(f.complete(v1));
329          checkCompletedNormally(g, null);
330 +        checkCompletedNormally(h, null);
331          assertEquals(0, f.getNumberOfDependents());
332          assertEquals(0, g.getNumberOfDependents());
333 <    }
333 >        assertEquals(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]"));
351 <
352 <        f = new CompletableFuture<String>();
353 <        f.cancel(true);
354 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
355 <
356 <        f = new CompletableFuture<String>();
357 <        f.cancel(false);
358 <        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 >            assertEquals(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 >            assertEquals(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 363 | 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; }
# Line 375 | Line 393 | public class CompletableFutureTest exten
393          void assertInvoked() { assertEquals(1, invocationCount); }
394      }
395  
396 <    abstract class CheckedIntegerAction extends CheckedAction {
396 >    abstract static class CheckedIntegerAction extends CheckedAction {
397          Integer value;
398          CheckedIntegerAction(ExecutionMode m) { super(m); }
399          void assertValue(Integer expected) {
# Line 384 | Line 402 | public class CompletableFutureTest exten
402          }
403      }
404  
405 <    class IntegerSupplier extends CheckedAction
405 >    static class IntegerSupplier extends CheckedAction
406          implements Supplier<Integer>
407      {
408          final Integer value;
# Line 403 | Line 421 | public class CompletableFutureTest exten
421          return (x == null) ? null : x + 1;
422      }
423  
424 <    class NoopConsumer extends CheckedIntegerAction
424 >    static class NoopConsumer extends CheckedIntegerAction
425          implements Consumer<Integer>
426      {
427          NoopConsumer(ExecutionMode m) { super(m); }
# Line 413 | Line 431 | public class CompletableFutureTest exten
431          }
432      }
433  
434 <    class IncFunction extends CheckedIntegerAction
434 >    static class IncFunction extends CheckedIntegerAction
435          implements Function<Integer,Integer>
436      {
437          IncFunction(ExecutionMode m) { super(m); }
# Line 431 | Line 449 | public class CompletableFutureTest exten
449              - ((y == null) ? 99 : y.intValue());
450      }
451  
452 <    class SubtractAction extends CheckedIntegerAction
452 >    static class SubtractAction extends CheckedIntegerAction
453          implements BiConsumer<Integer, Integer>
454      {
455          SubtractAction(ExecutionMode m) { super(m); }
# Line 441 | Line 459 | public class CompletableFutureTest exten
459          }
460      }
461  
462 <    class SubtractFunction extends CheckedIntegerAction
462 >    static class SubtractFunction extends CheckedIntegerAction
463          implements BiFunction<Integer, Integer, Integer>
464      {
465          SubtractFunction(ExecutionMode m) { super(m); }
# Line 451 | Line 469 | public class CompletableFutureTest exten
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
479 >    static class FailingSupplier extends CheckedAction
480          implements Supplier<Integer>
481      {
482 <        FailingSupplier(ExecutionMode m) { super(m); }
482 >        final CFException ex;
483 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
484          public Integer get() {
485              invoked();
486 <            throw new CFException();
486 >            throw ex;
487          }
488      }
489  
490 <    class FailingConsumer extends CheckedIntegerAction
490 >    static class FailingConsumer extends CheckedIntegerAction
491          implements Consumer<Integer>
492      {
493 <        FailingConsumer(ExecutionMode m) { super(m); }
493 >        final CFException ex;
494 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
495          public void accept(Integer x) {
496              invoked();
497              value = x;
498 <            throw new CFException();
498 >            throw ex;
499          }
500      }
501  
502 <    class FailingBiConsumer extends CheckedIntegerAction
502 >    static class FailingBiConsumer extends CheckedIntegerAction
503          implements BiConsumer<Integer, Integer>
504      {
505 <        FailingBiConsumer(ExecutionMode m) { super(m); }
505 >        final CFException ex;
506 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
507          public void accept(Integer x, Integer y) {
508              invoked();
509              value = subtract(x, y);
510 <            throw new CFException();
510 >            throw ex;
511          }
512      }
513  
514 <    class FailingFunction extends CheckedIntegerAction
514 >    static class FailingFunction extends CheckedIntegerAction
515          implements Function<Integer, Integer>
516      {
517 <        FailingFunction(ExecutionMode m) { super(m); }
517 >        final CFException ex;
518 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
519          public Integer apply(Integer x) {
520              invoked();
521              value = x;
522 <            throw new CFException();
522 >            throw ex;
523          }
524      }
525  
526 <    class FailingBiFunction extends CheckedIntegerAction
526 >    static class FailingBiFunction extends CheckedIntegerAction
527          implements BiFunction<Integer, Integer, Integer>
528      {
529 <        FailingBiFunction(ExecutionMode m) { super(m); }
529 >        final CFException ex;
530 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
531          public Integer apply(Integer x, Integer 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 <
524 <    class CompletableFutureInc extends CheckedIntegerAction
547 >    static class CompletableFutureInc extends CheckedIntegerAction
548          implements Function<Integer, CompletableFuture<Integer>>
549      {
550          CompletableFutureInc(ExecutionMode m) { super(m); }
# Line 529 | Line 552 | public class CompletableFutureTest exten
552              invoked();
553              value = x;
554              CompletableFuture<Integer> f = new CompletableFuture<>();
555 <            f.complete(inc(x));
555 >            assertTrue(f.complete(inc(x)));
556              return f;
557          }
558      }
559  
560 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
560 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
561          implements Function<Integer, CompletableFuture<Integer>>
562      {
563 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
563 >        final CFException ex;
564 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
565          public CompletableFuture<Integer> apply(Integer x) {
566              invoked();
567              value = x;
568 <            throw new CFException();
568 >            throw ex;
569 >        }
570 >    }
571 >
572 >    static class CountingRejectingExecutor implements Executor {
573 >        final RejectedExecutionException ex = new RejectedExecutionException();
574 >        final AtomicInteger count = new AtomicInteger(0);
575 >        public void execute(Runnable r) {
576 >            count.getAndIncrement();
577 >            throw ex;
578          }
579      }
580  
# Line 559 | Line 592 | public class CompletableFutureTest exten
592          }
593      }
594  
595 +    static final boolean defaultExecutorIsCommonPool
596 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
597 +
598      /**
599       * Permits the testing of parallel code for the 3 different
600       * execution modes without copy/pasting all the test methods.
601       */
602      enum ExecutionMode {
603 <        DEFAULT {
603 >        SYNC {
604              public void checkExecutionMode() {
605                  assertFalse(ThreadExecutor.startedCurrentThread());
606                  assertNull(ForkJoinTask.getPool());
# Line 640 | Line 676 | public class CompletableFutureTest exten
676  
677          ASYNC {
678              public void checkExecutionMode() {
679 <                assertSame(ForkJoinPool.commonPool(),
680 <                           ForkJoinTask.getPool());
679 >                assertEquals(defaultExecutorIsCommonPool,
680 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
681              }
682              public CompletableFuture<Void> runAsync(Runnable a) {
683                  return CompletableFuture.runAsync(a);
# Line 837 | Line 873 | public class CompletableFutureTest exten
873      {
874          final AtomicInteger a = new AtomicInteger(0);
875          final CompletableFuture<Integer> f = new CompletableFuture<>();
876 <        if (!createIncomplete) f.complete(v1);
876 >        if (!createIncomplete) assertTrue(f.complete(v1));
877          final CompletableFuture<Integer> g = f.exceptionally
878              ((Throwable t) -> {
843                // Should not be called
879                  a.getAndIncrement();
880 <                throw new AssertionError();
880 >                threadFail("should not be called");
881 >                return null;            // unreached
882              });
883 <        if (createIncomplete) f.complete(v1);
883 >        if (createIncomplete) assertTrue(f.complete(v1));
884  
885          checkCompletedNormally(g, v1);
886          checkCompletedNormally(f, v1);
# Line 865 | Line 901 | public class CompletableFutureTest exten
901          if (!createIncomplete) f.completeExceptionally(ex);
902          final CompletableFuture<Integer> g = f.exceptionally
903              ((Throwable t) -> {
904 <                ExecutionMode.DEFAULT.checkExecutionMode();
904 >                ExecutionMode.SYNC.checkExecutionMode();
905                  threadAssertSame(t, ex);
906                  a.getAndIncrement();
907                  return v1;
# Line 876 | Line 912 | public class CompletableFutureTest exten
912          assertEquals(1, a.get());
913      }}
914  
915 +    /**
916 +     * If an "exceptionally action" throws an exception, it completes
917 +     * exceptionally with that exception
918 +     */
919      public void testExceptionally_exceptionalCompletionActionFailed() {
920          for (boolean createIncomplete : new boolean[] { true, false })
881        for (Integer v1 : new Integer[] { 1, null })
921      {
922          final AtomicInteger a = new AtomicInteger(0);
923          final CFException ex1 = new CFException();
# Line 887 | Line 926 | public class CompletableFutureTest exten
926          if (!createIncomplete) f.completeExceptionally(ex1);
927          final CompletableFuture<Integer> g = f.exceptionally
928              ((Throwable t) -> {
929 <                ExecutionMode.DEFAULT.checkExecutionMode();
929 >                ExecutionMode.SYNC.checkExecutionMode();
930                  threadAssertSame(t, ex1);
931                  a.getAndIncrement();
932                  throw ex2;
# Line 895 | Line 934 | public class CompletableFutureTest exten
934          if (createIncomplete) f.completeExceptionally(ex1);
935  
936          checkCompletedWithWrappedException(g, ex2);
937 +        checkCompletedExceptionally(f, ex1);
938          assertEquals(1, a.get());
939      }}
940  
# Line 902 | Line 942 | public class CompletableFutureTest exten
942       * whenComplete action executes on normal completion, propagating
943       * source result.
944       */
945 <    public void testWhenComplete_normalCompletion1() {
945 >    public void testWhenComplete_normalCompletion() {
946          for (ExecutionMode m : ExecutionMode.values())
947          for (boolean createIncomplete : new boolean[] { true, false })
948          for (Integer v1 : new Integer[] { 1, null })
949      {
950          final AtomicInteger a = new AtomicInteger(0);
951          final CompletableFuture<Integer> f = new CompletableFuture<>();
952 <        if (!createIncomplete) f.complete(v1);
952 >        if (!createIncomplete) assertTrue(f.complete(v1));
953          final CompletableFuture<Integer> g = m.whenComplete
954              (f,
955 <             (Integer x, Throwable t) -> {
955 >             (Integer result, Throwable t) -> {
956                  m.checkExecutionMode();
957 <                threadAssertSame(x, v1);
957 >                threadAssertSame(result, v1);
958                  threadAssertNull(t);
959                  a.getAndIncrement();
960              });
961 <        if (createIncomplete) f.complete(v1);
961 >        if (createIncomplete) assertTrue(f.complete(v1));
962  
963          checkCompletedNormally(g, v1);
964          checkCompletedNormally(f, v1);
# Line 932 | Line 972 | public class CompletableFutureTest exten
972      public void testWhenComplete_exceptionalCompletion() {
973          for (ExecutionMode m : ExecutionMode.values())
974          for (boolean createIncomplete : new boolean[] { true, false })
935        for (Integer v1 : new Integer[] { 1, null })
975      {
976          final AtomicInteger a = new AtomicInteger(0);
977          final CFException ex = new CFException();
# Line 940 | Line 979 | public class CompletableFutureTest exten
979          if (!createIncomplete) f.completeExceptionally(ex);
980          final CompletableFuture<Integer> g = m.whenComplete
981              (f,
982 <             (Integer x, Throwable t) -> {
982 >             (Integer result, Throwable t) -> {
983                  m.checkExecutionMode();
984 <                threadAssertNull(x);
984 >                threadAssertNull(result);
985                  threadAssertSame(t, ex);
986                  a.getAndIncrement();
987              });
# Line 967 | Line 1006 | public class CompletableFutureTest exten
1006          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1007          final CompletableFuture<Integer> g = m.whenComplete
1008              (f,
1009 <             (Integer x, Throwable t) -> {
1009 >             (Integer result, Throwable t) -> {
1010                  m.checkExecutionMode();
1011 <                threadAssertNull(x);
1011 >                threadAssertNull(result);
1012                  threadAssertTrue(t instanceof CancellationException);
1013                  a.getAndIncrement();
1014              });
# Line 984 | Line 1023 | public class CompletableFutureTest exten
1023       * If a whenComplete action throws an exception when triggered by
1024       * a normal completion, it completes exceptionally
1025       */
1026 <    public void testWhenComplete_actionFailed() {
1026 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1027          for (boolean createIncomplete : new boolean[] { true, false })
1028          for (ExecutionMode m : ExecutionMode.values())
1029          for (Integer v1 : new Integer[] { 1, null })
# Line 992 | Line 1031 | public class CompletableFutureTest exten
1031          final AtomicInteger a = new AtomicInteger(0);
1032          final CFException ex = new CFException();
1033          final CompletableFuture<Integer> f = new CompletableFuture<>();
1034 <        if (!createIncomplete) f.complete(v1);
1034 >        if (!createIncomplete) assertTrue(f.complete(v1));
1035          final CompletableFuture<Integer> g = m.whenComplete
1036              (f,
1037 <             (Integer x, Throwable t) -> {
1037 >             (Integer result, Throwable t) -> {
1038                  m.checkExecutionMode();
1039 <                threadAssertSame(x, v1);
1039 >                threadAssertSame(result, v1);
1040                  threadAssertNull(t);
1041                  a.getAndIncrement();
1042                  throw ex;
1043              });
1044 <        if (createIncomplete) f.complete(v1);
1044 >        if (createIncomplete) assertTrue(f.complete(v1));
1045  
1046          checkCompletedWithWrappedException(g, ex);
1047          checkCompletedNormally(f, v1);
# Line 1012 | Line 1051 | public class CompletableFutureTest exten
1051      /**
1052       * If a whenComplete action throws an exception when triggered by
1053       * a source completion that also throws an exception, the source
1054 <     * exception takes precedence.
1054 >     * exception takes precedence (unlike handle)
1055       */
1056 <    public void testWhenComplete_actionFailedSourceFailed() {
1056 >    public void testWhenComplete_sourceFailedActionFailed() {
1057          for (boolean createIncomplete : new boolean[] { true, false })
1058          for (ExecutionMode m : ExecutionMode.values())
1020        for (Integer v1 : new Integer[] { 1, null })
1059      {
1060          final AtomicInteger a = new AtomicInteger(0);
1061          final CFException ex1 = new CFException();
# Line 1027 | Line 1065 | public class CompletableFutureTest exten
1065          if (!createIncomplete) f.completeExceptionally(ex1);
1066          final CompletableFuture<Integer> g = m.whenComplete
1067              (f,
1068 <             (Integer x, Throwable t) -> {
1068 >             (Integer result, Throwable t) -> {
1069                  m.checkExecutionMode();
1070                  threadAssertSame(t, ex1);
1071 <                threadAssertNull(x);
1071 >                threadAssertNull(result);
1072                  a.getAndIncrement();
1073                  throw ex2;
1074              });
# Line 1038 | Line 1076 | public class CompletableFutureTest exten
1076  
1077          checkCompletedWithWrappedException(g, ex1);
1078          checkCompletedExceptionally(f, ex1);
1079 +        if (testImplementationDetails) {
1080 +            assertEquals(1, ex1.getSuppressed().length);
1081 +            assertSame(ex2, ex1.getSuppressed()[0]);
1082 +        }
1083          assertEquals(1, a.get());
1084      }}
1085  
# Line 1052 | Line 1094 | public class CompletableFutureTest exten
1094      {
1095          final CompletableFuture<Integer> f = new CompletableFuture<>();
1096          final AtomicInteger a = new AtomicInteger(0);
1097 <        if (!createIncomplete) f.complete(v1);
1097 >        if (!createIncomplete) assertTrue(f.complete(v1));
1098          final CompletableFuture<Integer> g = m.handle
1099              (f,
1100 <             (Integer x, Throwable t) -> {
1100 >             (Integer result, Throwable t) -> {
1101                  m.checkExecutionMode();
1102 <                threadAssertSame(x, v1);
1102 >                threadAssertSame(result, v1);
1103                  threadAssertNull(t);
1104                  a.getAndIncrement();
1105                  return inc(v1);
1106              });
1107 <        if (createIncomplete) f.complete(v1);
1107 >        if (createIncomplete) assertTrue(f.complete(v1));
1108  
1109          checkCompletedNormally(g, inc(v1));
1110          checkCompletedNormally(f, v1);
# Line 1084 | Line 1126 | public class CompletableFutureTest exten
1126          if (!createIncomplete) f.completeExceptionally(ex);
1127          final CompletableFuture<Integer> g = m.handle
1128              (f,
1129 <             (Integer x, Throwable t) -> {
1129 >             (Integer result, Throwable t) -> {
1130                  m.checkExecutionMode();
1131 <                threadAssertNull(x);
1131 >                threadAssertNull(result);
1132                  threadAssertSame(t, ex);
1133                  a.getAndIncrement();
1134                  return v1;
# Line 1113 | Line 1155 | public class CompletableFutureTest exten
1155          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1156          final CompletableFuture<Integer> g = m.handle
1157              (f,
1158 <             (Integer x, Throwable t) -> {
1158 >             (Integer result, Throwable t) -> {
1159                  m.checkExecutionMode();
1160 <                threadAssertNull(x);
1160 >                threadAssertNull(result);
1161                  threadAssertTrue(t instanceof CancellationException);
1162                  a.getAndIncrement();
1163                  return v1;
# Line 1128 | Line 1170 | public class CompletableFutureTest exten
1170      }}
1171  
1172      /**
1173 <     * handle result completes exceptionally if action does
1173 >     * If a "handle action" throws an exception when triggered by
1174 >     * a normal completion, it completes exceptionally
1175       */
1176 <    public void testHandle_sourceFailedActionFailed() {
1176 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1177          for (ExecutionMode m : ExecutionMode.values())
1178          for (boolean createIncomplete : new boolean[] { true, false })
1179 +        for (Integer v1 : new Integer[] { 1, null })
1180      {
1181          final CompletableFuture<Integer> f = new CompletableFuture<>();
1182          final AtomicInteger a = new AtomicInteger(0);
1183 <        final CFException ex1 = new CFException();
1184 <        final CFException ex2 = new CFException();
1141 <        if (!createIncomplete) f.completeExceptionally(ex1);
1183 >        final CFException ex = new CFException();
1184 >        if (!createIncomplete) assertTrue(f.complete(v1));
1185          final CompletableFuture<Integer> g = m.handle
1186              (f,
1187 <             (Integer x, Throwable t) -> {
1187 >             (Integer result, Throwable t) -> {
1188                  m.checkExecutionMode();
1189 <                threadAssertNull(x);
1190 <                threadAssertSame(ex1, t);
1189 >                threadAssertSame(result, v1);
1190 >                threadAssertNull(t);
1191                  a.getAndIncrement();
1192 <                throw ex2;
1192 >                throw ex;
1193              });
1194 <        if (createIncomplete) f.completeExceptionally(ex1);
1194 >        if (createIncomplete) assertTrue(f.complete(v1));
1195  
1196 <        checkCompletedWithWrappedException(g, ex2);
1197 <        checkCompletedExceptionally(f, ex1);
1196 >        checkCompletedWithWrappedException(g, ex);
1197 >        checkCompletedNormally(f, v1);
1198          assertEquals(1, a.get());
1199      }}
1200  
1201 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1202 <        for (ExecutionMode m : ExecutionMode.values())
1201 >    /**
1202 >     * If a "handle action" throws an exception when triggered by
1203 >     * a source completion that also throws an exception, the action
1204 >     * exception takes precedence (unlike whenComplete)
1205 >     */
1206 >    public void testHandle_sourceFailedActionFailed() {
1207          for (boolean createIncomplete : new boolean[] { true, false })
1208 <        for (Integer v1 : new Integer[] { 1, null })
1208 >        for (ExecutionMode m : ExecutionMode.values())
1209      {
1163        final CompletableFuture<Integer> f = new CompletableFuture<>();
1210          final AtomicInteger a = new AtomicInteger(0);
1211 <        final CFException ex = new CFException();
1212 <        if (!createIncomplete) f.complete(v1);
1211 >        final CFException ex1 = new CFException();
1212 >        final CFException ex2 = new CFException();
1213 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1214 >
1215 >        if (!createIncomplete) f.completeExceptionally(ex1);
1216          final CompletableFuture<Integer> g = m.handle
1217              (f,
1218 <             (Integer x, Throwable t) -> {
1218 >             (Integer result, Throwable t) -> {
1219                  m.checkExecutionMode();
1220 <                threadAssertSame(x, v1);
1221 <                threadAssertNull(t);
1220 >                threadAssertNull(result);
1221 >                threadAssertSame(ex1, t);
1222                  a.getAndIncrement();
1223 <                throw ex;
1223 >                throw ex2;
1224              });
1225 <        if (createIncomplete) f.complete(v1);
1225 >        if (createIncomplete) f.completeExceptionally(ex1);
1226  
1227 <        checkCompletedWithWrappedException(g, ex);
1228 <        checkCompletedNormally(f, v1);
1227 >        checkCompletedWithWrappedException(g, ex2);
1228 >        checkCompletedExceptionally(f, ex1);
1229          assertEquals(1, a.get());
1230      }}
1231  
# Line 1209 | Line 1258 | public class CompletableFutureTest exten
1258      {
1259          final FailingRunnable r = new FailingRunnable(m);
1260          final CompletableFuture<Void> f = m.runAsync(r);
1261 <        checkCompletedWithWrappedCFException(f);
1261 >        checkCompletedWithWrappedException(f, r.ex);
1262          r.assertInvoked();
1263      }}
1264  
1265 +    @SuppressWarnings("FutureReturnValueIgnored")
1266 +    public void testRunAsync_rejectingExecutor() {
1267 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1268 +        try {
1269 +            CompletableFuture.runAsync(() -> {}, e);
1270 +            shouldThrow();
1271 +        } catch (Throwable t) {
1272 +            assertSame(e.ex, t);
1273 +        }
1274 +
1275 +        assertEquals(1, e.count.get());
1276 +    }
1277 +
1278      /**
1279       * supplyAsync completes with result of supplier
1280       */
# Line 1243 | Line 1305 | public class CompletableFutureTest exten
1305      {
1306          FailingSupplier r = new FailingSupplier(m);
1307          CompletableFuture<Integer> f = m.supplyAsync(r);
1308 <        checkCompletedWithWrappedCFException(f);
1308 >        checkCompletedWithWrappedException(f, r.ex);
1309          r.assertInvoked();
1310      }}
1311  
1312 +    @SuppressWarnings("FutureReturnValueIgnored")
1313 +    public void testSupplyAsync_rejectingExecutor() {
1314 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1315 +        try {
1316 +            CompletableFuture.supplyAsync(() -> null, e);
1317 +            shouldThrow();
1318 +        } catch (Throwable t) {
1319 +            assertSame(e.ex, t);
1320 +        }
1321 +
1322 +        assertEquals(1, e.count.get());
1323 +    }
1324 +
1325      // seq completion methods
1326  
1327      /**
# Line 1254 | Line 1329 | public class CompletableFutureTest exten
1329       */
1330      public void testThenRun_normalCompletion() {
1331          for (ExecutionMode m : ExecutionMode.values())
1257        for (boolean createIncomplete : new boolean[] { true, false })
1332          for (Integer v1 : new Integer[] { 1, null })
1333      {
1334          final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 <        final Noop r = new Noop(m);
1336 <        if (!createIncomplete) f.complete(v1);
1263 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1264 <        if (createIncomplete) {
1265 <            checkIncomplete(g);
1266 <            f.complete(v1);
1267 <        }
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337  
1338 <        checkCompletedNormally(g, null);
1338 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1339 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1340 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1341 >        checkIncomplete(h0);
1342 >        checkIncomplete(h1);
1343 >        checkIncomplete(h2);
1344 >        assertTrue(f.complete(v1));
1345 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1346 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1347 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1348 >
1349 >        checkCompletedNormally(h0, null);
1350 >        checkCompletedNormally(h1, null);
1351 >        checkCompletedNormally(h2, null);
1352 >        checkCompletedNormally(h3, null);
1353 >        checkCompletedNormally(h4, null);
1354 >        checkCompletedNormally(h5, null);
1355          checkCompletedNormally(f, v1);
1356 <        r.assertInvoked();
1356 >        for (Noop r : rs) r.assertInvoked();
1357      }}
1358  
1359      /**
# Line 1277 | Line 1362 | public class CompletableFutureTest exten
1362       */
1363      public void testThenRun_exceptionalCompletion() {
1364          for (ExecutionMode m : ExecutionMode.values())
1280        for (boolean createIncomplete : new boolean[] { true, false })
1365      {
1366          final CFException ex = new CFException();
1367          final CompletableFuture<Integer> f = new CompletableFuture<>();
1368 <        final Noop r = new Noop(m);
1369 <        if (!createIncomplete) f.completeExceptionally(ex);
1286 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1287 <        if (createIncomplete) {
1288 <            checkIncomplete(g);
1289 <            f.completeExceptionally(ex);
1290 <        }
1368 >        final Noop[] rs = new Noop[6];
1369 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1370  
1371 <        checkCompletedWithWrappedException(g, ex);
1371 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1372 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1373 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1374 >        checkIncomplete(h0);
1375 >        checkIncomplete(h1);
1376 >        checkIncomplete(h2);
1377 >        assertTrue(f.completeExceptionally(ex));
1378 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1379 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1380 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1381 >
1382 >        checkCompletedWithWrappedException(h0, ex);
1383 >        checkCompletedWithWrappedException(h1, ex);
1384 >        checkCompletedWithWrappedException(h2, ex);
1385 >        checkCompletedWithWrappedException(h3, ex);
1386 >        checkCompletedWithWrappedException(h4, ex);
1387 >        checkCompletedWithWrappedException(h5, ex);
1388          checkCompletedExceptionally(f, ex);
1389 <        r.assertNotInvoked();
1389 >        for (Noop r : rs) r.assertNotInvoked();
1390      }}
1391  
1392      /**
# Line 1299 | Line 1394 | public class CompletableFutureTest exten
1394       */
1395      public void testThenRun_sourceCancelled() {
1396          for (ExecutionMode m : ExecutionMode.values())
1302        for (boolean createIncomplete : new boolean[] { true, false })
1397          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398      {
1399          final CompletableFuture<Integer> f = new CompletableFuture<>();
1400 <        final Noop r = new Noop(m);
1401 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1308 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1309 <        if (createIncomplete) {
1310 <            checkIncomplete(g);
1311 <            assertTrue(f.cancel(mayInterruptIfRunning));
1312 <        }
1400 >        final Noop[] rs = new Noop[6];
1401 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1402  
1403 <        checkCompletedWithWrappedCancellationException(g);
1403 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1404 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1405 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1406 >        checkIncomplete(h0);
1407 >        checkIncomplete(h1);
1408 >        checkIncomplete(h2);
1409 >        assertTrue(f.cancel(mayInterruptIfRunning));
1410 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1411 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1412 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1413 >
1414 >        checkCompletedWithWrappedCancellationException(h0);
1415 >        checkCompletedWithWrappedCancellationException(h1);
1416 >        checkCompletedWithWrappedCancellationException(h2);
1417 >        checkCompletedWithWrappedCancellationException(h3);
1418 >        checkCompletedWithWrappedCancellationException(h4);
1419 >        checkCompletedWithWrappedCancellationException(h5);
1420          checkCancelled(f);
1421 <        r.assertNotInvoked();
1421 >        for (Noop r : rs) r.assertNotInvoked();
1422      }}
1423  
1424      /**
# Line 1321 | Line 1426 | public class CompletableFutureTest exten
1426       */
1427      public void testThenRun_actionFailed() {
1428          for (ExecutionMode m : ExecutionMode.values())
1324        for (boolean createIncomplete : new boolean[] { true, false })
1429          for (Integer v1 : new Integer[] { 1, null })
1430      {
1431          final CompletableFuture<Integer> f = new CompletableFuture<>();
1432 <        final FailingRunnable r = new FailingRunnable(m);
1433 <        if (!createIncomplete) f.complete(v1);
1330 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1331 <        if (createIncomplete) {
1332 <            checkIncomplete(g);
1333 <            f.complete(v1);
1334 <        }
1432 >        final FailingRunnable[] rs = new FailingRunnable[6];
1433 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1434  
1435 <        checkCompletedWithWrappedCFException(g);
1435 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1436 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1437 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1438 >        assertTrue(f.complete(v1));
1439 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1440 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1441 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1442 >
1443 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1444 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1445 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1446 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1447 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1448 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1449          checkCompletedNormally(f, v1);
1450      }}
1451  
# Line 1342 | Line 1454 | public class CompletableFutureTest exten
1454       */
1455      public void testThenApply_normalCompletion() {
1456          for (ExecutionMode m : ExecutionMode.values())
1345        for (boolean createIncomplete : new boolean[] { true, false })
1457          for (Integer v1 : new Integer[] { 1, null })
1458      {
1459          final CompletableFuture<Integer> f = new CompletableFuture<>();
1460 <        final IncFunction r = new IncFunction(m);
1461 <        if (!createIncomplete) f.complete(v1);
1351 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1352 <        if (createIncomplete) {
1353 <            checkIncomplete(g);
1354 <            f.complete(v1);
1355 <        }
1460 >        final IncFunction[] rs = new IncFunction[4];
1461 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1462  
1463 <        checkCompletedNormally(g, inc(v1));
1463 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1464 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1465 >        checkIncomplete(h0);
1466 >        checkIncomplete(h1);
1467 >        assertTrue(f.complete(v1));
1468 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1469 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1470 >
1471 >        checkCompletedNormally(h0, inc(v1));
1472 >        checkCompletedNormally(h1, inc(v1));
1473 >        checkCompletedNormally(h2, inc(v1));
1474 >        checkCompletedNormally(h3, inc(v1));
1475          checkCompletedNormally(f, v1);
1476 <        r.assertValue(inc(v1));
1476 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1477      }}
1478  
1479      /**
# Line 1365 | Line 1482 | public class CompletableFutureTest exten
1482       */
1483      public void testThenApply_exceptionalCompletion() {
1484          for (ExecutionMode m : ExecutionMode.values())
1368        for (boolean createIncomplete : new boolean[] { true, false })
1485      {
1486          final CFException ex = new CFException();
1487          final CompletableFuture<Integer> f = new CompletableFuture<>();
1488 <        final IncFunction r = new IncFunction(m);
1489 <        if (!createIncomplete) f.completeExceptionally(ex);
1374 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1375 <        if (createIncomplete) {
1376 <            checkIncomplete(g);
1377 <            f.completeExceptionally(ex);
1378 <        }
1488 >        final IncFunction[] rs = new IncFunction[4];
1489 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1490  
1491 <        checkCompletedWithWrappedException(g, ex);
1491 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1492 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1493 >        assertTrue(f.completeExceptionally(ex));
1494 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1495 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1496 >
1497 >        checkCompletedWithWrappedException(h0, ex);
1498 >        checkCompletedWithWrappedException(h1, ex);
1499 >        checkCompletedWithWrappedException(h2, ex);
1500 >        checkCompletedWithWrappedException(h3, ex);
1501          checkCompletedExceptionally(f, ex);
1502 <        r.assertNotInvoked();
1502 >        for (IncFunction r : rs) r.assertNotInvoked();
1503      }}
1504  
1505      /**
# Line 1387 | Line 1507 | public class CompletableFutureTest exten
1507       */
1508      public void testThenApply_sourceCancelled() {
1509          for (ExecutionMode m : ExecutionMode.values())
1390        for (boolean createIncomplete : new boolean[] { true, false })
1510          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1511      {
1512          final CompletableFuture<Integer> f = new CompletableFuture<>();
1513 <        final IncFunction r = new IncFunction(m);
1514 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1396 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1397 <        if (createIncomplete) {
1398 <            checkIncomplete(g);
1399 <            assertTrue(f.cancel(mayInterruptIfRunning));
1400 <        }
1513 >        final IncFunction[] rs = new IncFunction[4];
1514 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1515  
1516 <        checkCompletedWithWrappedCancellationException(g);
1516 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1517 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1518 >        assertTrue(f.cancel(mayInterruptIfRunning));
1519 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1520 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1521 >
1522 >        checkCompletedWithWrappedCancellationException(h0);
1523 >        checkCompletedWithWrappedCancellationException(h1);
1524 >        checkCompletedWithWrappedCancellationException(h2);
1525 >        checkCompletedWithWrappedCancellationException(h3);
1526          checkCancelled(f);
1527 <        r.assertNotInvoked();
1527 >        for (IncFunction r : rs) r.assertNotInvoked();
1528      }}
1529  
1530      /**
# Line 1409 | Line 1532 | public class CompletableFutureTest exten
1532       */
1533      public void testThenApply_actionFailed() {
1534          for (ExecutionMode m : ExecutionMode.values())
1412        for (boolean createIncomplete : new boolean[] { true, false })
1535          for (Integer v1 : new Integer[] { 1, null })
1536      {
1537          final CompletableFuture<Integer> f = new CompletableFuture<>();
1538 <        final FailingFunction r = new FailingFunction(m);
1539 <        if (!createIncomplete) f.complete(v1);
1418 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1419 <        if (createIncomplete) {
1420 <            checkIncomplete(g);
1421 <            f.complete(v1);
1422 <        }
1538 >        final FailingFunction[] rs = new FailingFunction[4];
1539 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1540  
1541 <        checkCompletedWithWrappedCFException(g);
1541 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1542 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1543 >        assertTrue(f.complete(v1));
1544 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1545 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1546 >
1547 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1548 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1549 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1550 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1551          checkCompletedNormally(f, v1);
1552      }}
1553  
# Line 1430 | Line 1556 | public class CompletableFutureTest exten
1556       */
1557      public void testThenAccept_normalCompletion() {
1558          for (ExecutionMode m : ExecutionMode.values())
1433        for (boolean createIncomplete : new boolean[] { true, false })
1559          for (Integer v1 : new Integer[] { 1, null })
1560      {
1561          final CompletableFuture<Integer> f = new CompletableFuture<>();
1562 <        final NoopConsumer r = new NoopConsumer(m);
1563 <        if (!createIncomplete) f.complete(v1);
1439 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1440 <        if (createIncomplete) {
1441 <            checkIncomplete(g);
1442 <            f.complete(v1);
1443 <        }
1562 >        final NoopConsumer[] rs = new NoopConsumer[4];
1563 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1564  
1565 <        checkCompletedNormally(g, null);
1566 <        r.assertValue(v1);
1565 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1566 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1567 >        checkIncomplete(h0);
1568 >        checkIncomplete(h1);
1569 >        assertTrue(f.complete(v1));
1570 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1571 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1572 >
1573 >        checkCompletedNormally(h0, null);
1574 >        checkCompletedNormally(h1, null);
1575 >        checkCompletedNormally(h2, null);
1576 >        checkCompletedNormally(h3, null);
1577          checkCompletedNormally(f, v1);
1578 +        for (NoopConsumer r : rs) r.assertValue(v1);
1579      }}
1580  
1581      /**
# Line 1453 | Line 1584 | public class CompletableFutureTest exten
1584       */
1585      public void testThenAccept_exceptionalCompletion() {
1586          for (ExecutionMode m : ExecutionMode.values())
1456        for (boolean createIncomplete : new boolean[] { true, false })
1587      {
1588          final CFException ex = new CFException();
1589          final CompletableFuture<Integer> f = new CompletableFuture<>();
1590 <        final NoopConsumer r = new NoopConsumer(m);
1591 <        if (!createIncomplete) f.completeExceptionally(ex);
1462 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1463 <        if (createIncomplete) {
1464 <            checkIncomplete(g);
1465 <            f.completeExceptionally(ex);
1466 <        }
1590 >        final NoopConsumer[] rs = new NoopConsumer[4];
1591 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1592  
1593 <        checkCompletedWithWrappedException(g, ex);
1593 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1594 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1595 >        assertTrue(f.completeExceptionally(ex));
1596 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1597 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1598 >
1599 >        checkCompletedWithWrappedException(h0, ex);
1600 >        checkCompletedWithWrappedException(h1, ex);
1601 >        checkCompletedWithWrappedException(h2, ex);
1602 >        checkCompletedWithWrappedException(h3, ex);
1603          checkCompletedExceptionally(f, ex);
1604 <        r.assertNotInvoked();
1604 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1605      }}
1606  
1607      /**
# Line 1475 | Line 1609 | public class CompletableFutureTest exten
1609       */
1610      public void testThenAccept_sourceCancelled() {
1611          for (ExecutionMode m : ExecutionMode.values())
1478        for (boolean createIncomplete : new boolean[] { true, false })
1612          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1613      {
1614          final CompletableFuture<Integer> f = new CompletableFuture<>();
1615 <        final NoopConsumer r = new NoopConsumer(m);
1616 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1484 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1485 <        if (createIncomplete) {
1486 <            checkIncomplete(g);
1487 <            assertTrue(f.cancel(mayInterruptIfRunning));
1488 <        }
1615 >        final NoopConsumer[] rs = new NoopConsumer[4];
1616 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1617  
1618 <        checkCompletedWithWrappedCancellationException(g);
1618 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1619 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1620 >        assertTrue(f.cancel(mayInterruptIfRunning));
1621 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1622 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1623 >
1624 >        checkCompletedWithWrappedCancellationException(h0);
1625 >        checkCompletedWithWrappedCancellationException(h1);
1626 >        checkCompletedWithWrappedCancellationException(h2);
1627 >        checkCompletedWithWrappedCancellationException(h3);
1628          checkCancelled(f);
1629 <        r.assertNotInvoked();
1629 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1630      }}
1631  
1632      /**
# Line 1497 | Line 1634 | public class CompletableFutureTest exten
1634       */
1635      public void testThenAccept_actionFailed() {
1636          for (ExecutionMode m : ExecutionMode.values())
1500        for (boolean createIncomplete : new boolean[] { true, false })
1637          for (Integer v1 : new Integer[] { 1, null })
1638      {
1639          final CompletableFuture<Integer> f = new CompletableFuture<>();
1640 <        final FailingConsumer r = new FailingConsumer(m);
1641 <        if (!createIncomplete) f.complete(v1);
1506 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1507 <        if (createIncomplete) {
1508 <            checkIncomplete(g);
1509 <            f.complete(v1);
1510 <        }
1640 >        final FailingConsumer[] rs = new FailingConsumer[4];
1641 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1642  
1643 <        checkCompletedWithWrappedCFException(g);
1643 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1644 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1645 >        assertTrue(f.complete(v1));
1646 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1647 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1648 >
1649 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1650 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1651 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1652 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1653          checkCompletedNormally(f, v1);
1654      }}
1655  
# Line 1519 | Line 1659 | public class CompletableFutureTest exten
1659       */
1660      public void testThenCombine_normalCompletion() {
1661          for (ExecutionMode m : ExecutionMode.values())
1522        for (boolean createIncomplete : new boolean[] { true, false })
1662          for (boolean fFirst : new boolean[] { true, false })
1663          for (Integer v1 : new Integer[] { 1, null })
1664          for (Integer v2 : new Integer[] { 2, null })
1665      {
1666          final CompletableFuture<Integer> f = new CompletableFuture<>();
1667          final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final SubtractFunction r = new SubtractFunction(m);
1668 >        final SubtractFunction[] rs = new SubtractFunction[6];
1669 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1670  
1671 <        if (fFirst) f.complete(v1); else g.complete(v2);
1672 <        if (!createIncomplete)
1673 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1674 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1675 <        if (createIncomplete) {
1676 <            checkIncomplete(h);
1677 <            r.assertNotInvoked();
1678 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1679 <        }
1671 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1672 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1673 >        final Integer w1 =  fFirst ? v1 : v2;
1674 >        final Integer w2 = !fFirst ? v1 : v2;
1675 >
1676 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1677 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1678 >        assertTrue(fst.complete(w1));
1679 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1680 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1681 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1682 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1683 >        checkCompletedNormally(h1, subtract(w1, w1));
1684 >        checkCompletedNormally(h3, subtract(w1, w1));
1685 >        rs[1].assertValue(subtract(w1, w1));
1686 >        rs[3].assertValue(subtract(w1, w1));
1687 >        assertTrue(snd.complete(w2));
1688 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1689 >
1690 >        checkCompletedNormally(h0, subtract(v1, v2));
1691 >        checkCompletedNormally(h2, subtract(v1, v2));
1692 >        checkCompletedNormally(h4, subtract(v1, v2));
1693 >        rs[0].assertValue(subtract(v1, v2));
1694 >        rs[2].assertValue(subtract(v1, v2));
1695 >        rs[4].assertValue(subtract(v1, v2));
1696  
1541        checkCompletedNormally(h, subtract(v1, v2));
1697          checkCompletedNormally(f, v1);
1698          checkCompletedNormally(g, v2);
1544        r.assertValue(subtract(v1, v2));
1699      }}
1700  
1701      /**
1702       * thenCombine result completes exceptionally after exceptional
1703       * completion of either source
1704       */
1705 <    public void testThenCombine_exceptionalCompletion() {
1705 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1706          for (ExecutionMode m : ExecutionMode.values())
1553        for (boolean createIncomplete : new boolean[] { true, false })
1707          for (boolean fFirst : new boolean[] { true, false })
1708 +        for (boolean failFirst : new boolean[] { true, false })
1709          for (Integer v1 : new Integer[] { 1, null })
1710      {
1711          final CompletableFuture<Integer> f = new CompletableFuture<>();
1712          final CompletableFuture<Integer> g = new CompletableFuture<>();
1713          final CFException ex = new CFException();
1714 <        final SubtractFunction r = new SubtractFunction(m);
1715 <
1716 <        (fFirst ? f : g).complete(v1);
1717 <        if (!createIncomplete)
1718 <            (!fFirst ? f : g).completeExceptionally(ex);
1719 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1720 <        if (createIncomplete) {
1721 <            checkIncomplete(h);
1722 <            (!fFirst ? f : g).completeExceptionally(ex);
1723 <        }
1714 >        final SubtractFunction r1 = new SubtractFunction(m);
1715 >        final SubtractFunction r2 = new SubtractFunction(m);
1716 >        final SubtractFunction r3 = new SubtractFunction(m);
1717 >
1718 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1719 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1720 >        final Callable<Boolean> complete1 = failFirst ?
1721 >            () -> fst.completeExceptionally(ex) :
1722 >            () -> fst.complete(v1);
1723 >        final Callable<Boolean> complete2 = failFirst ?
1724 >            () -> snd.complete(v1) :
1725 >            () -> snd.completeExceptionally(ex);
1726 >
1727 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1728 >        assertTrue(complete1.call());
1729 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1730 >        checkIncomplete(h1);
1731 >        checkIncomplete(h2);
1732 >        assertTrue(complete2.call());
1733 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1734  
1735 <        checkCompletedWithWrappedException(h, ex);
1736 <        r.assertNotInvoked();
1737 <        checkCompletedNormally(fFirst ? f : g, v1);
1738 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1735 >        checkCompletedWithWrappedException(h1, ex);
1736 >        checkCompletedWithWrappedException(h2, ex);
1737 >        checkCompletedWithWrappedException(h3, ex);
1738 >        r1.assertNotInvoked();
1739 >        r2.assertNotInvoked();
1740 >        r3.assertNotInvoked();
1741 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1742 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1743      }}
1744  
1745      /**
1746       * thenCombine result completes exceptionally if either source cancelled
1747       */
1748 <    public void testThenCombine_sourceCancelled() {
1748 >    public void testThenCombine_sourceCancelled() throws Throwable {
1749          for (ExecutionMode m : ExecutionMode.values())
1750          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1583        for (boolean createIncomplete : new boolean[] { true, false })
1751          for (boolean fFirst : new boolean[] { true, false })
1752 +        for (boolean failFirst : new boolean[] { true, false })
1753          for (Integer v1 : new Integer[] { 1, null })
1754      {
1755          final CompletableFuture<Integer> f = new CompletableFuture<>();
1756          final CompletableFuture<Integer> g = new CompletableFuture<>();
1757 <        final SubtractFunction r = new SubtractFunction(m);
1758 <
1759 <        (fFirst ? f : g).complete(v1);
1760 <        if (!createIncomplete)
1761 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1762 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1763 <        if (createIncomplete) {
1764 <            checkIncomplete(h);
1765 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1766 <        }
1757 >        final SubtractFunction r1 = new SubtractFunction(m);
1758 >        final SubtractFunction r2 = new SubtractFunction(m);
1759 >        final SubtractFunction r3 = new SubtractFunction(m);
1760 >
1761 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1762 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1763 >        final Callable<Boolean> complete1 = failFirst ?
1764 >            () -> fst.cancel(mayInterruptIfRunning) :
1765 >            () -> fst.complete(v1);
1766 >        final Callable<Boolean> complete2 = failFirst ?
1767 >            () -> snd.complete(v1) :
1768 >            () -> snd.cancel(mayInterruptIfRunning);
1769 >
1770 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1771 >        assertTrue(complete1.call());
1772 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1773 >        checkIncomplete(h1);
1774 >        checkIncomplete(h2);
1775 >        assertTrue(complete2.call());
1776 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1777  
1778 <        checkCompletedWithWrappedCancellationException(h);
1779 <        checkCancelled(!fFirst ? f : g);
1780 <        r.assertNotInvoked();
1781 <        checkCompletedNormally(fFirst ? f : g, v1);
1778 >        checkCompletedWithWrappedCancellationException(h1);
1779 >        checkCompletedWithWrappedCancellationException(h2);
1780 >        checkCompletedWithWrappedCancellationException(h3);
1781 >        r1.assertNotInvoked();
1782 >        r2.assertNotInvoked();
1783 >        r3.assertNotInvoked();
1784 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1785 >        checkCancelled(failFirst ? fst : snd);
1786      }}
1787  
1788      /**
# Line 1614 | Line 1796 | public class CompletableFutureTest exten
1796      {
1797          final CompletableFuture<Integer> f = new CompletableFuture<>();
1798          final CompletableFuture<Integer> g = new CompletableFuture<>();
1799 <        final FailingBiFunction r = new FailingBiFunction(m);
1800 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1801 <
1802 <        if (fFirst) {
1803 <            f.complete(v1);
1804 <            g.complete(v2);
1805 <        } else {
1806 <            g.complete(v2);
1807 <            f.complete(v1);
1808 <        }
1809 <
1810 <        checkCompletedWithWrappedCFException(h);
1799 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1800 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1801 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1802 >
1803 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1804 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1805 >        final Integer w1 =  fFirst ? v1 : v2;
1806 >        final Integer w2 = !fFirst ? v1 : v2;
1807 >
1808 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1809 >        assertTrue(fst.complete(w1));
1810 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1811 >        assertTrue(snd.complete(w2));
1812 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1813 >
1814 >        checkCompletedWithWrappedException(h1, r1.ex);
1815 >        checkCompletedWithWrappedException(h2, r2.ex);
1816 >        checkCompletedWithWrappedException(h3, r3.ex);
1817 >        r1.assertInvoked();
1818 >        r2.assertInvoked();
1819 >        r3.assertInvoked();
1820          checkCompletedNormally(f, v1);
1821          checkCompletedNormally(g, v2);
1822      }}
# Line 1636 | Line 1827 | public class CompletableFutureTest exten
1827       */
1828      public void testThenAcceptBoth_normalCompletion() {
1829          for (ExecutionMode m : ExecutionMode.values())
1639        for (boolean createIncomplete : new boolean[] { true, false })
1830          for (boolean fFirst : new boolean[] { true, false })
1831          for (Integer v1 : new Integer[] { 1, null })
1832          for (Integer v2 : new Integer[] { 2, null })
1833      {
1834          final CompletableFuture<Integer> f = new CompletableFuture<>();
1835          final CompletableFuture<Integer> g = new CompletableFuture<>();
1836 <        final SubtractAction r = new SubtractAction(m);
1837 <
1838 <        if (fFirst) f.complete(v1); else g.complete(v2);
1839 <        if (!createIncomplete)
1840 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1841 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1842 <        if (createIncomplete) {
1843 <            checkIncomplete(h);
1844 <            r.assertNotInvoked();
1845 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1846 <        }
1836 >        final SubtractAction r1 = new SubtractAction(m);
1837 >        final SubtractAction r2 = new SubtractAction(m);
1838 >        final SubtractAction r3 = new SubtractAction(m);
1839 >
1840 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1841 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1842 >        final Integer w1 =  fFirst ? v1 : v2;
1843 >        final Integer w2 = !fFirst ? v1 : v2;
1844 >
1845 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1846 >        assertTrue(fst.complete(w1));
1847 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1848 >        checkIncomplete(h1);
1849 >        checkIncomplete(h2);
1850 >        r1.assertNotInvoked();
1851 >        r2.assertNotInvoked();
1852 >        assertTrue(snd.complete(w2));
1853 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1854  
1855 <        checkCompletedNormally(h, null);
1856 <        r.assertValue(subtract(v1, v2));
1855 >        checkCompletedNormally(h1, null);
1856 >        checkCompletedNormally(h2, null);
1857 >        checkCompletedNormally(h3, null);
1858 >        r1.assertValue(subtract(v1, v2));
1859 >        r2.assertValue(subtract(v1, v2));
1860 >        r3.assertValue(subtract(v1, v2));
1861          checkCompletedNormally(f, v1);
1862          checkCompletedNormally(g, v2);
1863      }}
# Line 1665 | Line 1866 | public class CompletableFutureTest exten
1866       * thenAcceptBoth result completes exceptionally after exceptional
1867       * completion of either source
1868       */
1869 <    public void testThenAcceptBoth_exceptionalCompletion() {
1869 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1870          for (ExecutionMode m : ExecutionMode.values())
1670        for (boolean createIncomplete : new boolean[] { true, false })
1871          for (boolean fFirst : new boolean[] { true, false })
1872 +        for (boolean failFirst : new boolean[] { true, false })
1873          for (Integer v1 : new Integer[] { 1, null })
1874      {
1875          final CompletableFuture<Integer> f = new CompletableFuture<>();
1876          final CompletableFuture<Integer> g = new CompletableFuture<>();
1877          final CFException ex = new CFException();
1878 <        final SubtractAction r = new SubtractAction(m);
1879 <
1880 <        (fFirst ? f : g).complete(v1);
1881 <        if (!createIncomplete)
1882 <            (!fFirst ? f : g).completeExceptionally(ex);
1883 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1884 <        if (createIncomplete) {
1885 <            checkIncomplete(h);
1886 <            (!fFirst ? f : g).completeExceptionally(ex);
1887 <        }
1878 >        final SubtractAction r1 = new SubtractAction(m);
1879 >        final SubtractAction r2 = new SubtractAction(m);
1880 >        final SubtractAction r3 = new SubtractAction(m);
1881 >
1882 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1883 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1884 >        final Callable<Boolean> complete1 = failFirst ?
1885 >            () -> fst.completeExceptionally(ex) :
1886 >            () -> fst.complete(v1);
1887 >        final Callable<Boolean> complete2 = failFirst ?
1888 >            () -> snd.complete(v1) :
1889 >            () -> snd.completeExceptionally(ex);
1890 >
1891 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1892 >        assertTrue(complete1.call());
1893 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1894 >        checkIncomplete(h1);
1895 >        checkIncomplete(h2);
1896 >        assertTrue(complete2.call());
1897 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1898  
1899 <        checkCompletedWithWrappedException(h, ex);
1900 <        r.assertNotInvoked();
1901 <        checkCompletedNormally(fFirst ? f : g, v1);
1902 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1899 >        checkCompletedWithWrappedException(h1, ex);
1900 >        checkCompletedWithWrappedException(h2, ex);
1901 >        checkCompletedWithWrappedException(h3, ex);
1902 >        r1.assertNotInvoked();
1903 >        r2.assertNotInvoked();
1904 >        r3.assertNotInvoked();
1905 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1906 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1907      }}
1908  
1909      /**
1910       * thenAcceptBoth result completes exceptionally if either source cancelled
1911       */
1912 <    public void testThenAcceptBoth_sourceCancelled() {
1912 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1913          for (ExecutionMode m : ExecutionMode.values())
1914          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1700        for (boolean createIncomplete : new boolean[] { true, false })
1915          for (boolean fFirst : new boolean[] { true, false })
1916 +        for (boolean failFirst : new boolean[] { true, false })
1917          for (Integer v1 : new Integer[] { 1, null })
1918      {
1919          final CompletableFuture<Integer> f = new CompletableFuture<>();
1920          final CompletableFuture<Integer> g = new CompletableFuture<>();
1921 <        final SubtractAction r = new SubtractAction(m);
1922 <
1923 <        (fFirst ? f : g).complete(v1);
1924 <        if (!createIncomplete)
1925 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1926 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1927 <        if (createIncomplete) {
1928 <            checkIncomplete(h);
1929 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1930 <        }
1921 >        final SubtractAction r1 = new SubtractAction(m);
1922 >        final SubtractAction r2 = new SubtractAction(m);
1923 >        final SubtractAction r3 = new SubtractAction(m);
1924 >
1925 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1926 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1927 >        final Callable<Boolean> complete1 = failFirst ?
1928 >            () -> fst.cancel(mayInterruptIfRunning) :
1929 >            () -> fst.complete(v1);
1930 >        final Callable<Boolean> complete2 = failFirst ?
1931 >            () -> snd.complete(v1) :
1932 >            () -> snd.cancel(mayInterruptIfRunning);
1933 >
1934 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1935 >        assertTrue(complete1.call());
1936 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1937 >        checkIncomplete(h1);
1938 >        checkIncomplete(h2);
1939 >        assertTrue(complete2.call());
1940 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1941  
1942 <        checkCompletedWithWrappedCancellationException(h);
1943 <        checkCancelled(!fFirst ? f : g);
1944 <        r.assertNotInvoked();
1945 <        checkCompletedNormally(fFirst ? f : g, v1);
1942 >        checkCompletedWithWrappedCancellationException(h1);
1943 >        checkCompletedWithWrappedCancellationException(h2);
1944 >        checkCompletedWithWrappedCancellationException(h3);
1945 >        r1.assertNotInvoked();
1946 >        r2.assertNotInvoked();
1947 >        r3.assertNotInvoked();
1948 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1949 >        checkCancelled(failFirst ? fst : snd);
1950      }}
1951  
1952      /**
# Line 1731 | Line 1960 | public class CompletableFutureTest exten
1960      {
1961          final CompletableFuture<Integer> f = new CompletableFuture<>();
1962          final CompletableFuture<Integer> g = new CompletableFuture<>();
1963 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1964 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1965 <
1966 <        if (fFirst) {
1967 <            f.complete(v1);
1968 <            g.complete(v2);
1969 <        } else {
1970 <            g.complete(v2);
1971 <            f.complete(v1);
1972 <        }
1973 <
1974 <        checkCompletedWithWrappedCFException(h);
1963 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1964 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1965 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1966 >
1967 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1968 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1969 >        final Integer w1 =  fFirst ? v1 : v2;
1970 >        final Integer w2 = !fFirst ? v1 : v2;
1971 >
1972 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1973 >        assertTrue(fst.complete(w1));
1974 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1975 >        assertTrue(snd.complete(w2));
1976 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1977 >
1978 >        checkCompletedWithWrappedException(h1, r1.ex);
1979 >        checkCompletedWithWrappedException(h2, r2.ex);
1980 >        checkCompletedWithWrappedException(h3, r3.ex);
1981 >        r1.assertInvoked();
1982 >        r2.assertInvoked();
1983 >        r3.assertInvoked();
1984          checkCompletedNormally(f, v1);
1985          checkCompletedNormally(g, v2);
1986      }}
# Line 1753 | Line 1991 | public class CompletableFutureTest exten
1991       */
1992      public void testRunAfterBoth_normalCompletion() {
1993          for (ExecutionMode m : ExecutionMode.values())
1756        for (boolean createIncomplete : new boolean[] { true, false })
1994          for (boolean fFirst : new boolean[] { true, false })
1995          for (Integer v1 : new Integer[] { 1, null })
1996          for (Integer v2 : new Integer[] { 2, null })
1997      {
1998          final CompletableFuture<Integer> f = new CompletableFuture<>();
1999          final CompletableFuture<Integer> g = new CompletableFuture<>();
2000 <        final Noop r = new Noop(m);
2001 <
2002 <        if (fFirst) f.complete(v1); else g.complete(v2);
2003 <        if (!createIncomplete)
2004 <            if (!fFirst) f.complete(v1); else g.complete(v2);
2005 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2006 <        if (createIncomplete) {
2007 <            checkIncomplete(h);
2008 <            r.assertNotInvoked();
2009 <            if (!fFirst) f.complete(v1); else g.complete(v2);
2010 <        }
2000 >        final Noop r1 = new Noop(m);
2001 >        final Noop r2 = new Noop(m);
2002 >        final Noop r3 = new Noop(m);
2003 >
2004 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2005 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2006 >        final Integer w1 =  fFirst ? v1 : v2;
2007 >        final Integer w2 = !fFirst ? v1 : v2;
2008 >
2009 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2010 >        assertTrue(fst.complete(w1));
2011 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2012 >        checkIncomplete(h1);
2013 >        checkIncomplete(h2);
2014 >        r1.assertNotInvoked();
2015 >        r2.assertNotInvoked();
2016 >        assertTrue(snd.complete(w2));
2017 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2018  
2019 <        checkCompletedNormally(h, null);
2020 <        r.assertInvoked();
2019 >        checkCompletedNormally(h1, null);
2020 >        checkCompletedNormally(h2, null);
2021 >        checkCompletedNormally(h3, null);
2022 >        r1.assertInvoked();
2023 >        r2.assertInvoked();
2024 >        r3.assertInvoked();
2025          checkCompletedNormally(f, v1);
2026          checkCompletedNormally(g, v2);
2027      }}
# Line 1782 | Line 2030 | public class CompletableFutureTest exten
2030       * runAfterBoth result completes exceptionally after exceptional
2031       * completion of either source
2032       */
2033 <    public void testRunAfterBoth_exceptionalCompletion() {
2033 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2034          for (ExecutionMode m : ExecutionMode.values())
1787        for (boolean createIncomplete : new boolean[] { true, false })
2035          for (boolean fFirst : new boolean[] { true, false })
2036 +        for (boolean failFirst : new boolean[] { true, false })
2037          for (Integer v1 : new Integer[] { 1, null })
2038      {
2039          final CompletableFuture<Integer> f = new CompletableFuture<>();
2040          final CompletableFuture<Integer> g = new CompletableFuture<>();
2041          final CFException ex = new CFException();
2042 <        final Noop r = new Noop(m);
2043 <
2044 <        (fFirst ? f : g).complete(v1);
2045 <        if (!createIncomplete)
2046 <            (!fFirst ? f : g).completeExceptionally(ex);
2047 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2048 <        if (createIncomplete) {
2049 <            checkIncomplete(h);
2050 <            (!fFirst ? f : g).completeExceptionally(ex);
2051 <        }
2042 >        final Noop r1 = new Noop(m);
2043 >        final Noop r2 = new Noop(m);
2044 >        final Noop r3 = new Noop(m);
2045 >
2046 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2047 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2048 >        final Callable<Boolean> complete1 = failFirst ?
2049 >            () -> fst.completeExceptionally(ex) :
2050 >            () -> fst.complete(v1);
2051 >        final Callable<Boolean> complete2 = failFirst ?
2052 >            () -> snd.complete(v1) :
2053 >            () -> snd.completeExceptionally(ex);
2054 >
2055 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2056 >        assertTrue(complete1.call());
2057 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2058 >        checkIncomplete(h1);
2059 >        checkIncomplete(h2);
2060 >        assertTrue(complete2.call());
2061 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2062  
2063 <        checkCompletedWithWrappedException(h, ex);
2064 <        r.assertNotInvoked();
2065 <        checkCompletedNormally(fFirst ? f : g, v1);
2066 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
2063 >        checkCompletedWithWrappedException(h1, ex);
2064 >        checkCompletedWithWrappedException(h2, ex);
2065 >        checkCompletedWithWrappedException(h3, ex);
2066 >        r1.assertNotInvoked();
2067 >        r2.assertNotInvoked();
2068 >        r3.assertNotInvoked();
2069 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2070 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2071      }}
2072  
2073      /**
2074       * runAfterBoth result completes exceptionally if either source cancelled
2075       */
2076 <    public void testRunAfterBoth_sourceCancelled() {
2076 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2077          for (ExecutionMode m : ExecutionMode.values())
2078          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1817        for (boolean createIncomplete : new boolean[] { true, false })
2079          for (boolean fFirst : new boolean[] { true, false })
2080 +        for (boolean failFirst : new boolean[] { true, false })
2081          for (Integer v1 : new Integer[] { 1, null })
2082      {
2083          final CompletableFuture<Integer> f = new CompletableFuture<>();
2084          final CompletableFuture<Integer> g = new CompletableFuture<>();
2085 <        final Noop r = new Noop(m);
2086 <
2087 <        (fFirst ? f : g).complete(v1);
2088 <        if (!createIncomplete)
2089 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2090 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2091 <        if (createIncomplete) {
2092 <            checkIncomplete(h);
2093 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2094 <        }
2085 >        final Noop r1 = new Noop(m);
2086 >        final Noop r2 = new Noop(m);
2087 >        final Noop r3 = new Noop(m);
2088 >
2089 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2090 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2091 >        final Callable<Boolean> complete1 = failFirst ?
2092 >            () -> fst.cancel(mayInterruptIfRunning) :
2093 >            () -> fst.complete(v1);
2094 >        final Callable<Boolean> complete2 = failFirst ?
2095 >            () -> snd.complete(v1) :
2096 >            () -> snd.cancel(mayInterruptIfRunning);
2097 >
2098 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2099 >        assertTrue(complete1.call());
2100 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2101 >        checkIncomplete(h1);
2102 >        checkIncomplete(h2);
2103 >        assertTrue(complete2.call());
2104 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2105  
2106 <        checkCompletedWithWrappedCancellationException(h);
2107 <        checkCancelled(!fFirst ? f : g);
2108 <        r.assertNotInvoked();
2109 <        checkCompletedNormally(fFirst ? f : g, v1);
2106 >        checkCompletedWithWrappedCancellationException(h1);
2107 >        checkCompletedWithWrappedCancellationException(h2);
2108 >        checkCompletedWithWrappedCancellationException(h3);
2109 >        r1.assertNotInvoked();
2110 >        r2.assertNotInvoked();
2111 >        r3.assertNotInvoked();
2112 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2113 >        checkCancelled(failFirst ? fst : snd);
2114      }}
2115  
2116      /**
# Line 1850 | Line 2126 | public class CompletableFutureTest exten
2126          final CompletableFuture<Integer> g = new CompletableFuture<>();
2127          final FailingRunnable r1 = new FailingRunnable(m);
2128          final FailingRunnable r2 = new FailingRunnable(m);
2129 +        final FailingRunnable r3 = new FailingRunnable(m);
2130  
2131 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2132 <        if (fFirst) {
2133 <            f.complete(v1);
2134 <            g.complete(v2);
2135 <        } else {
2136 <            g.complete(v2);
2137 <            f.complete(v1);
2138 <        }
2139 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2140 <
2141 <        checkCompletedWithWrappedCFException(h1);
2142 <        checkCompletedWithWrappedCFException(h2);
2131 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2132 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2133 >        final Integer w1 =  fFirst ? v1 : v2;
2134 >        final Integer w2 = !fFirst ? v1 : v2;
2135 >
2136 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2137 >        assertTrue(fst.complete(w1));
2138 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2139 >        assertTrue(snd.complete(w2));
2140 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2141 >
2142 >        checkCompletedWithWrappedException(h1, r1.ex);
2143 >        checkCompletedWithWrappedException(h2, r2.ex);
2144 >        checkCompletedWithWrappedException(h3, r3.ex);
2145 >        r1.assertInvoked();
2146 >        r2.assertInvoked();
2147 >        r3.assertInvoked();
2148          checkCompletedNormally(f, v1);
2149          checkCompletedNormally(g, v2);
2150      }}
# Line 1985 | Line 2267 | public class CompletableFutureTest exten
2267  
2268          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2269          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2270 <        if (fFirst) {
2271 <            f.complete(v1);
1990 <            g.completeExceptionally(ex);
1991 <        } else {
1992 <            g.completeExceptionally(ex);
1993 <            f.complete(v1);
1994 <        }
2270 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2271 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2272          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2273          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2274  
# Line 2097 | Line 2374 | public class CompletableFutureTest exten
2374  
2375          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2376          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2377 <        if (fFirst) {
2378 <            f.complete(v1);
2102 <            g.cancel(mayInterruptIfRunning);
2103 <        } else {
2104 <            g.cancel(mayInterruptIfRunning);
2105 <            f.complete(v1);
2106 <        }
2377 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2378 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2379          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2380          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2381  
# Line 2159 | Line 2431 | public class CompletableFutureTest exten
2431          f.complete(v1);
2432          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2433          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2434 <        checkCompletedWithWrappedCFException(h0);
2435 <        checkCompletedWithWrappedCFException(h1);
2436 <        checkCompletedWithWrappedCFException(h2);
2437 <        checkCompletedWithWrappedCFException(h3);
2434 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2435 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2436 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2437 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2438          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2439  
2440          g.complete(v2);
# Line 2171 | Line 2443 | public class CompletableFutureTest exten
2443          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2444          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2445  
2446 <        checkCompletedWithWrappedCFException(h4);
2446 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2447          assertTrue(Objects.equals(v1, rs[4].value) ||
2448                     Objects.equals(v2, rs[4].value));
2449 <        checkCompletedWithWrappedCFException(h5);
2449 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2450          assertTrue(Objects.equals(v1, rs[5].value) ||
2451                     Objects.equals(v2, rs[5].value));
2452  
# Line 2305 | Line 2577 | public class CompletableFutureTest exten
2577  
2578          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2579          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2580 <        if (fFirst) {
2581 <            f.complete(v1);
2310 <            g.completeExceptionally(ex);
2311 <        } else {
2312 <            g.completeExceptionally(ex);
2313 <            f.complete(v1);
2314 <        }
2580 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2581 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2582          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2583          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2584  
2585          // unspecified behavior - both source completions available
2586          try {
2587 <            assertEquals(null, h0.join());
2587 >            assertNull(h0.join());
2588              rs[0].assertValue(v1);
2589          } catch (CompletionException ok) {
2590              checkCompletedWithWrappedException(h0, ex);
2591              rs[0].assertNotInvoked();
2592          }
2593          try {
2594 <            assertEquals(null, h1.join());
2594 >            assertNull(h1.join());
2595              rs[1].assertValue(v1);
2596          } catch (CompletionException ok) {
2597              checkCompletedWithWrappedException(h1, ex);
2598              rs[1].assertNotInvoked();
2599          }
2600          try {
2601 <            assertEquals(null, h2.join());
2601 >            assertNull(h2.join());
2602              rs[2].assertValue(v1);
2603          } catch (CompletionException ok) {
2604              checkCompletedWithWrappedException(h2, ex);
2605              rs[2].assertNotInvoked();
2606          }
2607          try {
2608 <            assertEquals(null, h3.join());
2608 >            assertNull(h3.join());
2609              rs[3].assertValue(v1);
2610          } catch (CompletionException ok) {
2611              checkCompletedWithWrappedException(h3, ex);
# Line 2423 | Line 2690 | public class CompletableFutureTest exten
2690          f.complete(v1);
2691          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2692          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2693 <        checkCompletedWithWrappedCFException(h0);
2694 <        checkCompletedWithWrappedCFException(h1);
2695 <        checkCompletedWithWrappedCFException(h2);
2696 <        checkCompletedWithWrappedCFException(h3);
2693 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2694 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2695 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2696 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2697          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2698  
2699          g.complete(v2);
# Line 2435 | Line 2702 | public class CompletableFutureTest exten
2702          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2703          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2704  
2705 <        checkCompletedWithWrappedCFException(h4);
2705 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2706          assertTrue(Objects.equals(v1, rs[4].value) ||
2707                     Objects.equals(v2, rs[4].value));
2708 <        checkCompletedWithWrappedCFException(h5);
2708 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2709          assertTrue(Objects.equals(v1, rs[5].value) ||
2710                     Objects.equals(v2, rs[5].value));
2711  
# Line 2454 | Line 2721 | public class CompletableFutureTest exten
2721          for (ExecutionMode m : ExecutionMode.values())
2722          for (Integer v1 : new Integer[] { 1, null })
2723          for (Integer v2 : new Integer[] { 2, null })
2724 +        for (boolean pushNop : new boolean[] { true, false })
2725      {
2726          final CompletableFuture<Integer> f = new CompletableFuture<>();
2727          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2466 | Line 2734 | public class CompletableFutureTest exten
2734          checkIncomplete(h1);
2735          rs[0].assertNotInvoked();
2736          rs[1].assertNotInvoked();
2737 +        if (pushNop) {          // ad hoc test of intra-completion interference
2738 +            m.thenRun(f, () -> {});
2739 +            m.thenRun(g, () -> {});
2740 +        }
2741          f.complete(v1);
2742          checkCompletedNormally(h0, null);
2743          checkCompletedNormally(h1, null);
# Line 2514 | Line 2786 | public class CompletableFutureTest exten
2786          checkIncomplete(h1);
2787          rs[0].assertNotInvoked();
2788          rs[1].assertNotInvoked();
2789 <        f.completeExceptionally(ex);
2789 >        assertTrue(f.completeExceptionally(ex));
2790          checkCompletedWithWrappedException(h0, ex);
2791          checkCompletedWithWrappedException(h1, ex);
2792          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
# Line 2522 | Line 2794 | public class CompletableFutureTest exten
2794          checkCompletedWithWrappedException(h2, ex);
2795          checkCompletedWithWrappedException(h3, ex);
2796  
2797 <        g.complete(v1);
2797 >        assertTrue(g.complete(v1));
2798  
2799          // unspecified behavior - both source completions available
2800          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2565 | Line 2837 | public class CompletableFutureTest exten
2837  
2838          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2839          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2840 <        if (fFirst) {
2841 <            f.complete(v1);
2570 <            g.completeExceptionally(ex);
2571 <        } else {
2572 <            g.completeExceptionally(ex);
2573 <            f.complete(v1);
2574 <        }
2840 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2841 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2842          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2843          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2844  
2845          // unspecified behavior - both source completions available
2846          try {
2847 <            assertEquals(null, h0.join());
2847 >            assertNull(h0.join());
2848              rs[0].assertInvoked();
2849          } catch (CompletionException ok) {
2850              checkCompletedWithWrappedException(h0, ex);
2851              rs[0].assertNotInvoked();
2852          }
2853          try {
2854 <            assertEquals(null, h1.join());
2854 >            assertNull(h1.join());
2855              rs[1].assertInvoked();
2856          } catch (CompletionException ok) {
2857              checkCompletedWithWrappedException(h1, ex);
2858              rs[1].assertNotInvoked();
2859          }
2860          try {
2861 <            assertEquals(null, h2.join());
2861 >            assertNull(h2.join());
2862              rs[2].assertInvoked();
2863          } catch (CompletionException ok) {
2864              checkCompletedWithWrappedException(h2, ex);
2865              rs[2].assertNotInvoked();
2866          }
2867          try {
2868 <            assertEquals(null, h3.join());
2868 >            assertNull(h3.join());
2869              rs[3].assertInvoked();
2870          } catch (CompletionException ok) {
2871              checkCompletedWithWrappedException(h3, ex);
# Line 2636 | Line 2903 | public class CompletableFutureTest exten
2903          checkCompletedWithWrappedCancellationException(h2);
2904          checkCompletedWithWrappedCancellationException(h3);
2905  
2906 <        g.complete(v1);
2906 >        assertTrue(g.complete(v1));
2907  
2908          // unspecified behavior - both source completions available
2909          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2680 | Line 2947 | public class CompletableFutureTest exten
2947  
2948          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2949          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2950 <        f.complete(v1);
2950 >        assertTrue(f.complete(v1));
2951          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2952          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2953 <        checkCompletedWithWrappedCFException(h0);
2954 <        checkCompletedWithWrappedCFException(h1);
2955 <        checkCompletedWithWrappedCFException(h2);
2956 <        checkCompletedWithWrappedCFException(h3);
2953 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2954 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2955 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2956 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2957          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2958 <        g.complete(v2);
2958 >        assertTrue(g.complete(v2));
2959          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2960          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2961 <        checkCompletedWithWrappedCFException(h4);
2962 <        checkCompletedWithWrappedCFException(h5);
2961 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2962 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2963  
2964          checkCompletedNormally(f, v1);
2965          checkCompletedNormally(g, v2);
# Line 2709 | Line 2976 | public class CompletableFutureTest exten
2976      {
2977          final CompletableFuture<Integer> f = new CompletableFuture<>();
2978          final CompletableFutureInc r = new CompletableFutureInc(m);
2979 <        if (!createIncomplete) f.complete(v1);
2979 >        if (!createIncomplete) assertTrue(f.complete(v1));
2980          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2981 <        if (createIncomplete) f.complete(v1);
2981 >        if (createIncomplete) assertTrue(f.complete(v1));
2982  
2983          checkCompletedNormally(g, inc(v1));
2984          checkCompletedNormally(f, v1);
# Line 2749 | Line 3016 | public class CompletableFutureTest exten
3016          final CompletableFuture<Integer> f = new CompletableFuture<>();
3017          final FailingCompletableFutureFunction r
3018              = new FailingCompletableFutureFunction(m);
3019 <        if (!createIncomplete) f.complete(v1);
3019 >        if (!createIncomplete) assertTrue(f.complete(v1));
3020          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3021 <        if (createIncomplete) f.complete(v1);
3021 >        if (createIncomplete) assertTrue(f.complete(v1));
3022  
3023 <        checkCompletedWithWrappedCFException(g);
3023 >        checkCompletedWithWrappedException(g, r.ex);
3024          checkCompletedNormally(f, v1);
3025      }}
3026  
# Line 2778 | Line 3045 | public class CompletableFutureTest exten
3045          checkCancelled(f);
3046      }}
3047  
3048 +    /**
3049 +     * thenCompose result completes exceptionally if the result of the action does
3050 +     */
3051 +    public void testThenCompose_actionReturnsFailingFuture() {
3052 +        for (ExecutionMode m : ExecutionMode.values())
3053 +        for (int order = 0; order < 6; order++)
3054 +        for (Integer v1 : new Integer[] { 1, null })
3055 +    {
3056 +        final CFException ex = new CFException();
3057 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3058 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3059 +        final CompletableFuture<Integer> h;
3060 +        // Test all permutations of orders
3061 +        switch (order) {
3062 +        case 0:
3063 +            assertTrue(f.complete(v1));
3064 +            assertTrue(g.completeExceptionally(ex));
3065 +            h = m.thenCompose(f, (x -> g));
3066 +            break;
3067 +        case 1:
3068 +            assertTrue(f.complete(v1));
3069 +            h = m.thenCompose(f, (x -> g));
3070 +            assertTrue(g.completeExceptionally(ex));
3071 +            break;
3072 +        case 2:
3073 +            assertTrue(g.completeExceptionally(ex));
3074 +            assertTrue(f.complete(v1));
3075 +            h = m.thenCompose(f, (x -> g));
3076 +            break;
3077 +        case 3:
3078 +            assertTrue(g.completeExceptionally(ex));
3079 +            h = m.thenCompose(f, (x -> g));
3080 +            assertTrue(f.complete(v1));
3081 +            break;
3082 +        case 4:
3083 +            h = m.thenCompose(f, (x -> g));
3084 +            assertTrue(f.complete(v1));
3085 +            assertTrue(g.completeExceptionally(ex));
3086 +            break;
3087 +        case 5:
3088 +            h = m.thenCompose(f, (x -> g));
3089 +            assertTrue(f.complete(v1));
3090 +            assertTrue(g.completeExceptionally(ex));
3091 +            break;
3092 +        default: throw new AssertionError();
3093 +        }
3094 +
3095 +        checkCompletedExceptionally(g, ex);
3096 +        checkCompletedWithWrappedException(h, ex);
3097 +        checkCompletedNormally(f, v1);
3098 +    }}
3099 +
3100      // other static methods
3101  
3102      /**
# Line 2794 | Line 3113 | public class CompletableFutureTest exten
3113       * when all components complete normally
3114       */
3115      public void testAllOf_normal() throws Exception {
3116 <        for (int k = 1; k < 20; ++k) {
3116 >        for (int k = 1; k < 10; k++) {
3117              CompletableFuture<Integer>[] fs
3118                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3119 <            for (int i = 0; i < k; ++i)
3119 >            for (int i = 0; i < k; i++)
3120                  fs[i] = new CompletableFuture<>();
3121              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3122 <            for (int i = 0; i < k; ++i) {
3122 >            for (int i = 0; i < k; i++) {
3123                  checkIncomplete(f);
3124                  checkIncomplete(CompletableFuture.allOf(fs));
3125                  fs[i].complete(one);
# Line 2810 | Line 3129 | public class CompletableFutureTest exten
3129          }
3130      }
3131  
3132 <    public void testAllOf_backwards() throws Exception {
3133 <        for (int k = 1; k < 20; ++k) {
3132 >    public void testAllOf_normal_backwards() throws Exception {
3133 >        for (int k = 1; k < 10; k++) {
3134              CompletableFuture<Integer>[] fs
3135                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3136 <            for (int i = 0; i < k; ++i)
3136 >            for (int i = 0; i < k; i++)
3137                  fs[i] = new CompletableFuture<>();
3138              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3139              for (int i = k - 1; i >= 0; i--) {
# Line 2827 | Line 3146 | public class CompletableFutureTest exten
3146          }
3147      }
3148  
3149 +    public void testAllOf_exceptional() throws Exception {
3150 +        for (int k = 1; k < 10; k++) {
3151 +            CompletableFuture<Integer>[] fs
3152 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3153 +            CFException ex = new CFException();
3154 +            for (int i = 0; i < k; i++)
3155 +                fs[i] = new CompletableFuture<>();
3156 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3157 +            for (int i = 0; i < k; i++) {
3158 +                checkIncomplete(f);
3159 +                checkIncomplete(CompletableFuture.allOf(fs));
3160 +                if (i != k / 2) {
3161 +                    fs[i].complete(i);
3162 +                    checkCompletedNormally(fs[i], i);
3163 +                } else {
3164 +                    fs[i].completeExceptionally(ex);
3165 +                    checkCompletedExceptionally(fs[i], ex);
3166 +                }
3167 +            }
3168 +            checkCompletedWithWrappedException(f, ex);
3169 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3170 +        }
3171 +    }
3172 +
3173      /**
3174       * anyOf(no component futures) returns an incomplete future
3175       */
3176      public void testAnyOf_empty() throws Exception {
3177 +        for (Integer v1 : new Integer[] { 1, null })
3178 +    {
3179          CompletableFuture<Object> f = CompletableFuture.anyOf();
3180          checkIncomplete(f);
3181 <    }
3181 >
3182 >        f.complete(v1);
3183 >        checkCompletedNormally(f, v1);
3184 >    }}
3185  
3186      /**
3187       * anyOf returns a future completed normally with a value when
3188       * a component future does
3189       */
3190      public void testAnyOf_normal() throws Exception {
3191 <        for (int k = 0; k < 10; ++k) {
3191 >        for (int k = 0; k < 10; k++) {
3192              CompletableFuture[] fs = new CompletableFuture[k];
3193 <            for (int i = 0; i < k; ++i)
3193 >            for (int i = 0; i < k; i++)
3194                  fs[i] = new CompletableFuture<>();
3195              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3196              checkIncomplete(f);
3197 <            for (int i = 0; i < k; ++i) {
3198 <                fs[i].complete(one);
3199 <                checkCompletedNormally(f, one);
3200 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3197 >            for (int i = 0; i < k; i++) {
3198 >                fs[i].complete(i);
3199 >                checkCompletedNormally(f, 0);
3200 >                int x = (int) CompletableFuture.anyOf(fs).join();
3201 >                assertTrue(0 <= x && x <= i);
3202 >            }
3203 >        }
3204 >    }
3205 >    public void testAnyOf_normal_backwards() throws Exception {
3206 >        for (int k = 0; k < 10; k++) {
3207 >            CompletableFuture[] fs = new CompletableFuture[k];
3208 >            for (int i = 0; i < k; i++)
3209 >                fs[i] = new CompletableFuture<>();
3210 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3211 >            checkIncomplete(f);
3212 >            for (int i = k - 1; i >= 0; i--) {
3213 >                fs[i].complete(i);
3214 >                checkCompletedNormally(f, k - 1);
3215 >                int x = (int) CompletableFuture.anyOf(fs).join();
3216 >                assertTrue(i <= x && x <= k - 1);
3217              }
3218          }
3219      }
# Line 2858 | Line 3222 | public class CompletableFutureTest exten
3222       * anyOf result completes exceptionally when any component does.
3223       */
3224      public void testAnyOf_exceptional() throws Exception {
3225 <        for (int k = 0; k < 10; ++k) {
3225 >        for (int k = 0; k < 10; k++) {
3226              CompletableFuture[] fs = new CompletableFuture[k];
3227 <            for (int i = 0; i < k; ++i)
3227 >            CFException[] exs = new CFException[k];
3228 >            for (int i = 0; i < k; i++) {
3229                  fs[i] = new CompletableFuture<>();
3230 +                exs[i] = new CFException();
3231 +            }
3232              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3233              checkIncomplete(f);
3234 <            for (int i = 0; i < k; ++i) {
3235 <                fs[i].completeExceptionally(new CFException());
3236 <                checkCompletedWithWrappedCFException(f);
3234 >            for (int i = 0; i < k; i++) {
3235 >                fs[i].completeExceptionally(exs[i]);
3236 >                checkCompletedWithWrappedException(f, exs[0]);
3237 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3238 >            }
3239 >        }
3240 >    }
3241 >
3242 >    public void testAnyOf_exceptional_backwards() throws Exception {
3243 >        for (int k = 0; k < 10; k++) {
3244 >            CompletableFuture[] fs = new CompletableFuture[k];
3245 >            CFException[] exs = new CFException[k];
3246 >            for (int i = 0; i < k; i++) {
3247 >                fs[i] = new CompletableFuture<>();
3248 >                exs[i] = new CFException();
3249 >            }
3250 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3251 >            checkIncomplete(f);
3252 >            for (int i = k - 1; i >= 0; i--) {
3253 >                fs[i].completeExceptionally(exs[i]);
3254 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3255                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3256              }
3257          }
# Line 2875 | Line 3260 | public class CompletableFutureTest exten
3260      /**
3261       * Completion methods throw NullPointerException with null arguments
3262       */
3263 +    @SuppressWarnings("FutureReturnValueIgnored")
3264      public void testNPE() {
3265          CompletableFuture<Integer> f = new CompletableFuture<>();
3266          CompletableFuture<Integer> g = new CompletableFuture<>();
3267          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2882        CompletableFuture<?> h;
3268          ThreadExecutor exec = new ThreadExecutor();
3269  
3270          Runnable[] throwingActions = {
3271              () -> CompletableFuture.supplyAsync(null),
3272              () -> CompletableFuture.supplyAsync(null, exec),
3273 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3273 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3274  
3275              () -> CompletableFuture.runAsync(null),
3276              () -> CompletableFuture.runAsync(null, exec),
# Line 2895 | Line 3280 | public class CompletableFutureTest exten
3280  
3281              () -> f.thenApply(null),
3282              () -> f.thenApplyAsync(null),
3283 <            () -> f.thenApplyAsync((x) -> x, null),
3283 >            () -> f.thenApplyAsync(x -> x, null),
3284              () -> f.thenApplyAsync(null, exec),
3285  
3286              () -> f.thenAccept(null),
3287              () -> f.thenAcceptAsync(null),
3288 <            () -> f.thenAcceptAsync((x) -> {} , null),
3288 >            () -> f.thenAcceptAsync(x -> {} , null),
3289              () -> f.thenAcceptAsync(null, exec),
3290  
3291              () -> f.thenRun(null),
# Line 2935 | Line 3320 | public class CompletableFutureTest exten
3320              () -> f.applyToEither(g, null),
3321              () -> f.applyToEitherAsync(g, null),
3322              () -> f.applyToEitherAsync(g, null, exec),
3323 <            () -> f.applyToEither(nullFuture, (x) -> x),
3324 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3325 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3326 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3323 >            () -> f.applyToEither(nullFuture, x -> x),
3324 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3325 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3326 >            () -> f.applyToEitherAsync(g, x -> x, null),
3327  
3328              () -> f.acceptEither(g, null),
3329              () -> f.acceptEitherAsync(g, null),
3330              () -> f.acceptEitherAsync(g, null, exec),
3331 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3332 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3333 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3334 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3331 >            () -> f.acceptEither(nullFuture, x -> {}),
3332 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3333 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3334 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3335  
3336              () -> f.runAfterEither(g, null),
3337              () -> f.runAfterEitherAsync(g, null),
# Line 2976 | Line 3361 | public class CompletableFutureTest exten
3361              () -> CompletableFuture.anyOf(null, f),
3362  
3363              () -> f.obtrudeException(null),
3364 +
3365 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3366 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3367 +            () -> CompletableFuture.delayedExecutor(1L, null),
3368 +
3369 +            () -> f.orTimeout(1L, null),
3370 +            () -> f.completeOnTimeout(42, 1L, null),
3371 +
3372 +            () -> CompletableFuture.failedFuture(null),
3373 +            () -> CompletableFuture.failedStage(null),
3374          };
3375  
3376          assertThrows(NullPointerException.class, throwingActions);
# Line 2983 | Line 3378 | public class CompletableFutureTest exten
3378      }
3379  
3380      /**
3381 +     * Test submissions to an executor that rejects all tasks.
3382 +     */
3383 +    public void testRejectingExecutor() {
3384 +        for (Integer v : new Integer[] { 1, null })
3385 +    {
3386 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3387 +
3388 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3389 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3390 +
3391 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3392 +
3393 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3394 +        srcs.add(complete);
3395 +        srcs.add(incomplete);
3396 +
3397 +        for (CompletableFuture<Integer> src : srcs) {
3398 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3399 +            fs.add(src.thenRunAsync(() -> {}, e));
3400 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3401 +            fs.add(src.thenApplyAsync(z -> z, e));
3402 +
3403 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3404 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3405 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3406 +
3407 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3408 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3409 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3410 +
3411 +            fs.add(src.thenComposeAsync(z -> null, e));
3412 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3413 +            fs.add(src.handleAsync((z, t) -> null, e));
3414 +
3415 +            for (CompletableFuture<?> future : fs) {
3416 +                if (src.isDone())
3417 +                    checkCompletedWithWrappedException(future, e.ex);
3418 +                else
3419 +                    checkIncomplete(future);
3420 +            }
3421 +            futures.addAll(fs);
3422 +        }
3423 +
3424 +        {
3425 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3426 +
3427 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3428 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3429 +
3430 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3431 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3432 +
3433 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3434 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3435 +
3436 +            for (CompletableFuture<?> future : fs)
3437 +                checkIncomplete(future);
3438 +            futures.addAll(fs);
3439 +        }
3440 +
3441 +        {
3442 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3443 +
3444 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3445 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3446 +
3447 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3448 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3449 +
3450 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3451 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3452 +
3453 +            for (CompletableFuture<?> future : fs)
3454 +                checkCompletedWithWrappedException(future, e.ex);
3455 +            futures.addAll(fs);
3456 +        }
3457 +
3458 +        incomplete.complete(v);
3459 +
3460 +        for (CompletableFuture<?> future : futures)
3461 +            checkCompletedWithWrappedException(future, e.ex);
3462 +
3463 +        assertEquals(futures.size(), e.count.get());
3464 +    }}
3465 +
3466 +    /**
3467 +     * Test submissions to an executor that rejects all tasks, but
3468 +     * should never be invoked because the dependent future is
3469 +     * explicitly completed.
3470 +     */
3471 +    public void testRejectingExecutorNeverInvoked() {
3472 +        for (Integer v : new Integer[] { 1, null })
3473 +    {
3474 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3475 +
3476 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3477 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3478 +
3479 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3480 +
3481 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3482 +        srcs.add(complete);
3483 +        srcs.add(incomplete);
3484 +
3485 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3486 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3487 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3488 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3489 +
3490 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3491 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3492 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3493 +
3494 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3495 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3496 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3497 +
3498 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3499 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3500 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3501 +
3502 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3503 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3504 +
3505 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3506 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3507 +
3508 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3509 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3510 +
3511 +        for (CompletableFuture<?> future : fs)
3512 +            checkIncomplete(future);
3513 +
3514 +        for (CompletableFuture<?> future : fs)
3515 +            future.complete(null);
3516 +
3517 +        incomplete.complete(v);
3518 +
3519 +        for (CompletableFuture<?> future : fs)
3520 +            checkCompletedNormally(future, null);
3521 +
3522 +        assertEquals(0, e.count.get());
3523 +    }}
3524 +
3525 +    /**
3526       * toCompletableFuture returns this CompletableFuture.
3527       */
3528      public void testToCompletableFuture() {
# Line 2990 | Line 3530 | public class CompletableFutureTest exten
3530          assertSame(f, f.toCompletableFuture());
3531      }
3532  
3533 +    // jdk9
3534 +
3535 +    /**
3536 +     * newIncompleteFuture returns an incomplete CompletableFuture
3537 +     */
3538 +    public void testNewIncompleteFuture() {
3539 +        for (Integer v1 : new Integer[] { 1, null })
3540 +    {
3541 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3542 +        CompletableFuture<Integer> g = f.newIncompleteFuture();
3543 +        checkIncomplete(f);
3544 +        checkIncomplete(g);
3545 +        f.complete(v1);
3546 +        checkCompletedNormally(f, v1);
3547 +        checkIncomplete(g);
3548 +        g.complete(v1);
3549 +        checkCompletedNormally(g, v1);
3550 +        assertSame(g.getClass(), CompletableFuture.class);
3551 +    }}
3552 +
3553 +    /**
3554 +     * completedStage returns a completed CompletionStage
3555 +     */
3556 +    public void testCompletedStage() {
3557 +        AtomicInteger x = new AtomicInteger(0);
3558 +        AtomicReference<Throwable> r = new AtomicReference<>();
3559 +        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3560 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3561 +        assertEquals(x.get(), 1);
3562 +        assertNull(r.get());
3563 +    }
3564 +
3565 +    /**
3566 +     * defaultExecutor by default returns the commonPool if
3567 +     * it supports more than one thread.
3568 +     */
3569 +    public void testDefaultExecutor() {
3570 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3571 +        Executor e = f.defaultExecutor();
3572 +        Executor c = ForkJoinPool.commonPool();
3573 +        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3574 +            assertSame(e, c);
3575 +        else
3576 +            assertNotSame(e, c);
3577 +    }
3578 +
3579 +    /**
3580 +     * failedFuture returns a CompletableFuture completed
3581 +     * exceptionally with the given Exception
3582 +     */
3583 +    public void testFailedFuture() {
3584 +        CFException ex = new CFException();
3585 +        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3586 +        checkCompletedExceptionally(f, ex);
3587 +    }
3588 +
3589 +    /**
3590 +     * failedFuture(null) throws NPE
3591 +     */
3592 +    public void testFailedFuture_null() {
3593 +        try {
3594 +            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3595 +            shouldThrow();
3596 +        } catch (NullPointerException success) {}
3597 +    }
3598 +
3599 +    /**
3600 +     * copy returns a CompletableFuture that is completed normally,
3601 +     * with the same value, when source is.
3602 +     */
3603 +    public void testCopy_normalCompletion() {
3604 +        for (boolean createIncomplete : new boolean[] { true, false })
3605 +        for (Integer v1 : new Integer[] { 1, null })
3606 +    {
3607 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3608 +        if (!createIncomplete) assertTrue(f.complete(v1));
3609 +        CompletableFuture<Integer> g = f.copy();
3610 +        if (createIncomplete) {
3611 +            checkIncomplete(f);
3612 +            checkIncomplete(g);
3613 +            assertTrue(f.complete(v1));
3614 +        }
3615 +        checkCompletedNormally(f, v1);
3616 +        checkCompletedNormally(g, v1);
3617 +    }}
3618 +
3619 +    /**
3620 +     * copy returns a CompletableFuture that is completed exceptionally
3621 +     * when source is.
3622 +     */
3623 +    public void testCopy_exceptionalCompletion() {
3624 +        for (boolean createIncomplete : new boolean[] { true, false })
3625 +    {
3626 +        CFException ex = new CFException();
3627 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3628 +        if (!createIncomplete) f.completeExceptionally(ex);
3629 +        CompletableFuture<Integer> g = f.copy();
3630 +        if (createIncomplete) {
3631 +            checkIncomplete(f);
3632 +            checkIncomplete(g);
3633 +            f.completeExceptionally(ex);
3634 +        }
3635 +        checkCompletedExceptionally(f, ex);
3636 +        checkCompletedWithWrappedException(g, ex);
3637 +    }}
3638 +
3639 +    /**
3640 +     * Completion of a copy does not complete its source.
3641 +     */
3642 +    public void testCopy_oneWayPropagation() {
3643 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3644 +        assertTrue(f.copy().complete(1));
3645 +        assertTrue(f.copy().complete(null));
3646 +        assertTrue(f.copy().cancel(true));
3647 +        assertTrue(f.copy().cancel(false));
3648 +        assertTrue(f.copy().completeExceptionally(new CFException()));
3649 +        checkIncomplete(f);
3650 +    }
3651 +
3652 +    /**
3653 +     * minimalCompletionStage returns a CompletableFuture that is
3654 +     * completed normally, with the same value, when source is.
3655 +     */
3656 +    public void testMinimalCompletionStage() {
3657 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3658 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3659 +        AtomicInteger x = new AtomicInteger(0);
3660 +        AtomicReference<Throwable> r = new AtomicReference<>();
3661 +        checkIncomplete(f);
3662 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3663 +        f.complete(1);
3664 +        checkCompletedNormally(f, 1);
3665 +        assertEquals(x.get(), 1);
3666 +        assertNull(r.get());
3667 +    }
3668 +
3669 +    /**
3670 +     * minimalCompletionStage returns a CompletableFuture that is
3671 +     * completed exceptionally when source is.
3672 +     */
3673 +    public void testMinimalCompletionStage2() {
3674 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3675 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3676 +        AtomicInteger x = new AtomicInteger(0);
3677 +        AtomicReference<Throwable> r = new AtomicReference<>();
3678 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3679 +        checkIncomplete(f);
3680 +        CFException ex = new CFException();
3681 +        f.completeExceptionally(ex);
3682 +        checkCompletedExceptionally(f, ex);
3683 +        assertEquals(x.get(), 0);
3684 +        assertEquals(r.get().getCause(), ex);
3685 +    }
3686 +
3687 +    /**
3688 +     * failedStage returns a CompletionStage completed
3689 +     * exceptionally with the given Exception
3690 +     */
3691 +    public void testFailedStage() {
3692 +        CFException ex = new CFException();
3693 +        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3694 +        AtomicInteger x = new AtomicInteger(0);
3695 +        AtomicReference<Throwable> r = new AtomicReference<>();
3696 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3697 +        assertEquals(x.get(), 0);
3698 +        assertEquals(r.get(), ex);
3699 +    }
3700 +
3701 +    /**
3702 +     * completeAsync completes with value of given supplier
3703 +     */
3704 +    public void testCompleteAsync() {
3705 +        for (Integer v1 : new Integer[] { 1, null })
3706 +    {
3707 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3708 +        f.completeAsync(() -> v1);
3709 +        f.join();
3710 +        checkCompletedNormally(f, v1);
3711 +    }}
3712 +
3713 +    /**
3714 +     * completeAsync completes exceptionally if given supplier throws
3715 +     */
3716 +    public void testCompleteAsync2() {
3717 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3718 +        CFException ex = new CFException();
3719 +        f.completeAsync(() -> { throw ex; });
3720 +        try {
3721 +            f.join();
3722 +            shouldThrow();
3723 +        } catch (CompletionException success) {}
3724 +        checkCompletedWithWrappedException(f, ex);
3725 +    }
3726 +
3727 +    /**
3728 +     * completeAsync with given executor completes with value of given supplier
3729 +     */
3730 +    public void testCompleteAsync3() {
3731 +        for (Integer v1 : new Integer[] { 1, null })
3732 +    {
3733 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3734 +        ThreadExecutor executor = new ThreadExecutor();
3735 +        f.completeAsync(() -> v1, executor);
3736 +        assertSame(v1, f.join());
3737 +        checkCompletedNormally(f, v1);
3738 +        assertEquals(1, executor.count.get());
3739 +    }}
3740 +
3741 +    /**
3742 +     * completeAsync with given executor completes exceptionally if
3743 +     * given supplier throws
3744 +     */
3745 +    public void testCompleteAsync4() {
3746 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3747 +        CFException ex = new CFException();
3748 +        ThreadExecutor executor = new ThreadExecutor();
3749 +        f.completeAsync(() -> { throw ex; }, executor);
3750 +        try {
3751 +            f.join();
3752 +            shouldThrow();
3753 +        } catch (CompletionException success) {}
3754 +        checkCompletedWithWrappedException(f, ex);
3755 +        assertEquals(1, executor.count.get());
3756 +    }
3757 +
3758 +    /**
3759 +     * orTimeout completes with TimeoutException if not complete
3760 +     */
3761 +    public void testOrTimeout_timesOut() {
3762 +        long timeoutMillis = timeoutMillis();
3763 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3764 +        long startTime = System.nanoTime();
3765 +        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3766 +        checkCompletedWithTimeoutException(f);
3767 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3768 +    }
3769 +
3770 +    /**
3771 +     * orTimeout completes normally if completed before timeout
3772 +     */
3773 +    public void testOrTimeout_completed() {
3774 +        for (Integer v1 : new Integer[] { 1, null })
3775 +    {
3776 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3777 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3778 +        long startTime = System.nanoTime();
3779 +        f.complete(v1);
3780 +        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3781 +        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3782 +        g.complete(v1);
3783 +        checkCompletedNormally(f, v1);
3784 +        checkCompletedNormally(g, v1);
3785 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3786 +    }}
3787 +
3788 +    /**
3789 +     * completeOnTimeout completes with given value if not complete
3790 +     */
3791 +    public void testCompleteOnTimeout_timesOut() {
3792 +        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3793 +                       () -> testCompleteOnTimeout_timesOut(null));
3794 +    }
3795 +
3796 +    /**
3797 +     * completeOnTimeout completes with given value if not complete
3798 +     */
3799 +    public void testCompleteOnTimeout_timesOut(Integer v) {
3800 +        long timeoutMillis = timeoutMillis();
3801 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3802 +        long startTime = System.nanoTime();
3803 +        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3804 +        assertSame(v, f.join());
3805 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3806 +        f.complete(99);         // should have no effect
3807 +        checkCompletedNormally(f, v);
3808 +    }
3809 +
3810 +    /**
3811 +     * completeOnTimeout has no effect if completed within timeout
3812 +     */
3813 +    public void testCompleteOnTimeout_completed() {
3814 +        for (Integer v1 : new Integer[] { 1, null })
3815 +    {
3816 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3817 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3818 +        long startTime = System.nanoTime();
3819 +        f.complete(v1);
3820 +        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3821 +        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3822 +        g.complete(v1);
3823 +        checkCompletedNormally(f, v1);
3824 +        checkCompletedNormally(g, v1);
3825 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3826 +    }}
3827 +
3828 +    /**
3829 +     * delayedExecutor returns an executor that delays submission
3830 +     */
3831 +    public void testDelayedExecutor() {
3832 +        testInParallel(() -> testDelayedExecutor(null, null),
3833 +                       () -> testDelayedExecutor(null, 1),
3834 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3835 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3836 +    }
3837 +
3838 +    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3839 +        long timeoutMillis = timeoutMillis();
3840 +        // Use an "unreasonably long" long timeout to catch lingering threads
3841 +        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3842 +        final Executor delayer, longDelayer;
3843 +        if (executor == null) {
3844 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3845 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3846 +        } else {
3847 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3848 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3849 +        }
3850 +        long startTime = System.nanoTime();
3851 +        CompletableFuture<Integer> f =
3852 +            CompletableFuture.supplyAsync(() -> v, delayer);
3853 +        CompletableFuture<Integer> g =
3854 +            CompletableFuture.supplyAsync(() -> v, longDelayer);
3855 +
3856 +        assertNull(g.getNow(null));
3857 +
3858 +        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3859 +        long millisElapsed = millisElapsedSince(startTime);
3860 +        assertTrue(millisElapsed >= timeoutMillis);
3861 +        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3862 +
3863 +        checkCompletedNormally(f, v);
3864 +
3865 +        checkIncomplete(g);
3866 +        assertTrue(g.cancel(true));
3867 +    }
3868 +
3869 +    //--- tests of implementation details; not part of official tck ---
3870 +
3871 +    Object resultOf(CompletableFuture<?> f) {
3872 +        SecurityManager sm = System.getSecurityManager();
3873 +        if (sm != null) {
3874 +            try {
3875 +                System.setSecurityManager(null);
3876 +            } catch (SecurityException giveUp) {
3877 +                return "Reflection not available";
3878 +            }
3879 +        }
3880 +
3881 +        try {
3882 +            java.lang.reflect.Field resultField
3883 +                = CompletableFuture.class.getDeclaredField("result");
3884 +            resultField.setAccessible(true);
3885 +            return resultField.get(f);
3886 +        } catch (Throwable t) {
3887 +            throw new AssertionError(t);
3888 +        } finally {
3889 +            if (sm != null) System.setSecurityManager(sm);
3890 +        }
3891 +    }
3892 +
3893 +    public void testExceptionPropagationReusesResultObject() {
3894 +        if (!testImplementationDetails) return;
3895 +        for (ExecutionMode m : ExecutionMode.values())
3896 +    {
3897 +        final CFException ex = new CFException();
3898 +        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3899 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3900 +
3901 +        final Runnable noopRunnable = new Noop(m);
3902 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
3903 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
3904 +
3905 +        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3906 +            = new ArrayList<>();
3907 +
3908 +        funs.add(y -> m.thenRun(y, noopRunnable));
3909 +        funs.add(y -> m.thenAccept(y, noopConsumer));
3910 +        funs.add(y -> m.thenApply(y, incFunction));
3911 +
3912 +        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
3913 +        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
3914 +        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
3915 +
3916 +        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
3917 +        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
3918 +        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3919 +        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3920 +        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
3921 +        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
3922 +
3923 +        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3924 +
3925 +        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
3926 +
3927 +        funs.add(y -> CompletableFuture.allOf(y));
3928 +        funs.add(y -> CompletableFuture.allOf(y, v42));
3929 +        funs.add(y -> CompletableFuture.allOf(v42, y));
3930 +        funs.add(y -> CompletableFuture.anyOf(y));
3931 +        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
3932 +        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
3933 +
3934 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3935 +                 fun : funs) {
3936 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3937 +            f.completeExceptionally(ex);
3938 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3939 +            checkCompletedWithWrappedException(src, ex);
3940 +            CompletableFuture<?> dep = fun.apply(src);
3941 +            checkCompletedWithWrappedException(dep, ex);
3942 +            assertSame(resultOf(src), resultOf(dep));
3943 +        }
3944 +
3945 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3946 +                 fun : funs) {
3947 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3948 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3949 +            CompletableFuture<?> dep = fun.apply(src);
3950 +            f.completeExceptionally(ex);
3951 +            checkCompletedWithWrappedException(src, ex);
3952 +            checkCompletedWithWrappedException(dep, ex);
3953 +            assertSame(resultOf(src), resultOf(dep));
3954 +        }
3955 +
3956 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3957 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3958 +                 fun : funs) {
3959 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3960 +            f.cancel(mayInterruptIfRunning);
3961 +            checkCancelled(f);
3962 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3963 +            checkCompletedWithWrappedCancellationException(src);
3964 +            CompletableFuture<?> dep = fun.apply(src);
3965 +            checkCompletedWithWrappedCancellationException(dep);
3966 +            assertSame(resultOf(src), resultOf(dep));
3967 +        }
3968 +
3969 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3970 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3971 +                 fun : funs) {
3972 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3973 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3974 +            CompletableFuture<?> dep = fun.apply(src);
3975 +            f.cancel(mayInterruptIfRunning);
3976 +            checkCancelled(f);
3977 +            checkCompletedWithWrappedCancellationException(src);
3978 +            checkCompletedWithWrappedCancellationException(dep);
3979 +            assertSame(resultOf(src), resultOf(dep));
3980 +        }
3981 +    }}
3982 +
3983 +    /**
3984 +     * Minimal completion stages throw UOE for most non-CompletionStage methods
3985 +     */
3986 +    public void testMinimalCompletionStage_minimality() {
3987 +        if (!testImplementationDetails) return;
3988 +        Function<Method, String> toSignature =
3989 +            method -> method.getName() + Arrays.toString(method.getParameterTypes());
3990 +        Predicate<Method> isNotStatic =
3991 +            method -> (method.getModifiers() & Modifier.STATIC) == 0;
3992 +        List<Method> minimalMethods =
3993 +            Stream.of(Object.class, CompletionStage.class)
3994 +            .flatMap(klazz -> Stream.of(klazz.getMethods()))
3995 +            .filter(isNotStatic)
3996 +            .collect(Collectors.toList());
3997 +        // Methods from CompletableFuture permitted NOT to throw UOE
3998 +        String[] signatureWhitelist = {
3999 +            "newIncompleteFuture[]",
4000 +            "defaultExecutor[]",
4001 +            "minimalCompletionStage[]",
4002 +            "copy[]",
4003 +        };
4004 +        Set<String> permittedMethodSignatures =
4005 +            Stream.concat(minimalMethods.stream().map(toSignature),
4006 +                          Stream.of(signatureWhitelist))
4007 +            .collect(Collectors.toSet());
4008 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4009 +            .filter(isNotStatic)
4010 +            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4011 +            .collect(Collectors.toList());
4012 +
4013 +        List<CompletionStage<Integer>> stages = new ArrayList<>();
4014 +        CompletionStage<Integer> min =
4015 +            new CompletableFuture<Integer>().minimalCompletionStage();
4016 +        stages.add(min);
4017 +        stages.add(min.thenApply(x -> x));
4018 +        stages.add(CompletableFuture.completedStage(1));
4019 +        stages.add(CompletableFuture.failedStage(new CFException()));
4020 +
4021 +        List<Method> bugs = new ArrayList<>();
4022 +        for (Method method : allMethods) {
4023 +            Class<?>[] parameterTypes = method.getParameterTypes();
4024 +            Object[] args = new Object[parameterTypes.length];
4025 +            // Manufacture boxed primitives for primitive params
4026 +            for (int i = 0; i < args.length; i++) {
4027 +                Class<?> type = parameterTypes[i];
4028 +                if (parameterTypes[i] == boolean.class)
4029 +                    args[i] = false;
4030 +                else if (parameterTypes[i] == int.class)
4031 +                    args[i] = 0;
4032 +                else if (parameterTypes[i] == long.class)
4033 +                    args[i] = 0L;
4034 +            }
4035 +            for (CompletionStage<Integer> stage : stages) {
4036 +                try {
4037 +                    method.invoke(stage, args);
4038 +                    bugs.add(method);
4039 +                }
4040 +                catch (java.lang.reflect.InvocationTargetException expected) {
4041 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4042 +                        bugs.add(method);
4043 +                        // expected.getCause().printStackTrace();
4044 +                    }
4045 +                }
4046 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4047 +            }
4048 +        }
4049 +        if (!bugs.isEmpty())
4050 +            throw new Error("Methods did not throw UOE: " + bugs);
4051 +    }
4052 +
4053 +    /**
4054 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4055 +     * is completed normally, with the same value, when source is.
4056 +     */
4057 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4058 +        for (boolean createIncomplete : new boolean[] { true, false })
4059 +        for (Integer v1 : new Integer[] { 1, null })
4060 +    {
4061 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4062 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4063 +        if (!createIncomplete) assertTrue(f.complete(v1));
4064 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4065 +        if (createIncomplete) {
4066 +            checkIncomplete(f);
4067 +            checkIncomplete(g);
4068 +            assertTrue(f.complete(v1));
4069 +        }
4070 +        checkCompletedNormally(f, v1);
4071 +        checkCompletedNormally(g, v1);
4072 +    }}
4073 +
4074 +    /**
4075 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4076 +     * is completed exceptionally when source is.
4077 +     */
4078 +    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4079 +        for (boolean createIncomplete : new boolean[] { true, false })
4080 +    {
4081 +        CFException ex = new CFException();
4082 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4083 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4084 +        if (!createIncomplete) f.completeExceptionally(ex);
4085 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4086 +        if (createIncomplete) {
4087 +            checkIncomplete(f);
4088 +            checkIncomplete(g);
4089 +            f.completeExceptionally(ex);
4090 +        }
4091 +        checkCompletedExceptionally(f, ex);
4092 +        checkCompletedWithWrappedException(g, ex);
4093 +    }}
4094 +
4095 +    /**
4096 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4097 +     */
4098 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4099 +        for (Integer v1 : new Integer[] { 1, null })
4100 +    {
4101 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4102 +        CompletionStage minimal = f.minimalCompletionStage();
4103 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4104 +        assertTrue(g.complete(v1));
4105 +        checkCompletedNormally(g, v1);
4106 +        checkIncomplete(f);
4107 +        checkIncomplete(minimal.toCompletableFuture());
4108 +    }}
4109 +
4110 +    /**
4111 +     * minimalStage.toCompletableFuture().join() awaits completion
4112 +     */
4113 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4114 +        for (boolean createIncomplete : new boolean[] { true, false })
4115 +        for (Integer v1 : new Integer[] { 1, null })
4116 +    {
4117 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4118 +        if (!createIncomplete) assertTrue(f.complete(v1));
4119 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4120 +        if (createIncomplete) assertTrue(f.complete(v1));
4121 +        assertEquals(v1, minimal.toCompletableFuture().join());
4122 +        assertEquals(v1, minimal.toCompletableFuture().get());
4123 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4124 +    }}
4125 +
4126 +    /**
4127 +     * Completion of a toCompletableFuture copy of a minimal stage
4128 +     * does not complete its source.
4129 +     */
4130 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4131 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4132 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4133 +        assertTrue(g.toCompletableFuture().complete(1));
4134 +        assertTrue(g.toCompletableFuture().complete(null));
4135 +        assertTrue(g.toCompletableFuture().cancel(true));
4136 +        assertTrue(g.toCompletableFuture().cancel(false));
4137 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4138 +        checkIncomplete(g.toCompletableFuture());
4139 +        f.complete(1);
4140 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4141 +    }
4142 +
4143 +    /** Demo utility method for external reliable toCompletableFuture */
4144 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4145 +        CompletableFuture<T> f = new CompletableFuture<>();
4146 +        stage.handle((T t, Throwable ex) -> {
4147 +                         if (ex != null) f.completeExceptionally(ex);
4148 +                         else f.complete(t);
4149 +                         return null;
4150 +                     });
4151 +        return f;
4152 +    }
4153 +
4154 +    /** Demo utility method to join a CompletionStage */
4155 +    static <T> T join(CompletionStage<T> stage) {
4156 +        return toCompletableFuture(stage).join();
4157 +    }
4158 +
4159 +    /**
4160 +     * Joining a minimal stage "by hand" works
4161 +     */
4162 +    public void testMinimalCompletionStage_join_by_hand() {
4163 +        for (boolean createIncomplete : new boolean[] { true, false })
4164 +        for (Integer v1 : new Integer[] { 1, null })
4165 +    {
4166 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4167 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4168 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4169 +        if (!createIncomplete) assertTrue(f.complete(v1));
4170 +        minimal.thenAccept(x -> g.complete(x));
4171 +        if (createIncomplete) assertTrue(f.complete(v1));
4172 +        g.join();
4173 +        checkCompletedNormally(g, v1);
4174 +        checkCompletedNormally(f, v1);
4175 +        assertEquals(v1, join(minimal));
4176 +    }}
4177 +
4178 +    static class Monad {
4179 +        static class ZeroException extends RuntimeException {
4180 +            public ZeroException() { super("monadic zero"); }
4181 +        }
4182 +        // "return", "unit"
4183 +        static <T> CompletableFuture<T> unit(T value) {
4184 +            return completedFuture(value);
4185 +        }
4186 +        // monadic zero ?
4187 +        static <T> CompletableFuture<T> zero() {
4188 +            return failedFuture(new ZeroException());
4189 +        }
4190 +        // >=>
4191 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4192 +            (Function<T, CompletableFuture<U>> f,
4193 +             Function<U, CompletableFuture<V>> g) {
4194 +            return x -> f.apply(x).thenCompose(g);
4195 +        }
4196 +
4197 +        static void assertZero(CompletableFuture<?> f) {
4198 +            try {
4199 +                f.getNow(null);
4200 +                throw new AssertionError("should throw");
4201 +            } catch (CompletionException success) {
4202 +                assertTrue(success.getCause() instanceof ZeroException);
4203 +            }
4204 +        }
4205 +
4206 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4207 +                                           CompletableFuture<T> g) {
4208 +            T fval = null, gval = null;
4209 +            Throwable fex = null, gex = null;
4210 +
4211 +            try { fval = f.get(); }
4212 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4213 +            catch (Throwable ex) { fex = ex; }
4214 +
4215 +            try { gval = g.get(); }
4216 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4217 +            catch (Throwable ex) { gex = ex; }
4218 +
4219 +            if (fex != null || gex != null)
4220 +                assertSame(fex.getClass(), gex.getClass());
4221 +            else
4222 +                assertEquals(fval, gval);
4223 +        }
4224 +
4225 +        static class PlusFuture<T> extends CompletableFuture<T> {
4226 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4227 +        }
4228 +
4229 +        /** Implements "monadic plus". */
4230 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4231 +                                             CompletableFuture<? extends T> g) {
4232 +            PlusFuture<T> plus = new PlusFuture<T>();
4233 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4234 +                try {
4235 +                    if (ex == null) {
4236 +                        if (plus.complete(result))
4237 +                            if (plus.firstFailure.get() != null)
4238 +                                plus.firstFailure.set(null);
4239 +                    }
4240 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4241 +                        if (plus.isDone())
4242 +                            plus.firstFailure.set(null);
4243 +                    }
4244 +                    else {
4245 +                        // first failure has precedence
4246 +                        Throwable first = plus.firstFailure.getAndSet(null);
4247 +
4248 +                        // may fail with "Self-suppression not permitted"
4249 +                        try { first.addSuppressed(ex); }
4250 +                        catch (Exception ignored) {}
4251 +
4252 +                        plus.completeExceptionally(first);
4253 +                    }
4254 +                } catch (Throwable unexpected) {
4255 +                    plus.completeExceptionally(unexpected);
4256 +                }
4257 +            };
4258 +            f.whenComplete(action);
4259 +            g.whenComplete(action);
4260 +            return plus;
4261 +        }
4262 +    }
4263 +
4264 +    /**
4265 +     * CompletableFuture is an additive monad - sort of.
4266 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4267 +     */
4268 +    public void testAdditiveMonad() throws Throwable {
4269 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4270 +        CompletableFuture<Long> zero = Monad.zero();
4271 +
4272 +        // Some mutually non-commutative functions
4273 +        Function<Long, CompletableFuture<Long>> triple
4274 +            = x -> Monad.unit(3 * x);
4275 +        Function<Long, CompletableFuture<Long>> inc
4276 +            = x -> Monad.unit(x + 1);
4277 +
4278 +        // unit is a right identity: m >>= unit === m
4279 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4280 +                                 inc.apply(5L));
4281 +        // unit is a left identity: (unit x) >>= f === f x
4282 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4283 +                                 inc.apply(5L));
4284 +
4285 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4286 +        Monad.assertFutureEquals(
4287 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4288 +            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4289 +
4290 +        // The case for CompletableFuture as an additive monad is weaker...
4291 +
4292 +        // zero is a monadic zero
4293 +        Monad.assertZero(zero);
4294 +
4295 +        // left zero: zero >>= f === zero
4296 +        Monad.assertZero(zero.thenCompose(inc));
4297 +        // right zero: f >>= (\x -> zero) === zero
4298 +        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4299 +
4300 +        // f plus zero === f
4301 +        Monad.assertFutureEquals(Monad.unit(5L),
4302 +                                 Monad.plus(Monad.unit(5L), zero));
4303 +        // zero plus f === f
4304 +        Monad.assertFutureEquals(Monad.unit(5L),
4305 +                                 Monad.plus(zero, Monad.unit(5L)));
4306 +        // zero plus zero === zero
4307 +        Monad.assertZero(Monad.plus(zero, zero));
4308 +        {
4309 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4310 +                                                   Monad.unit(8L));
4311 +            // non-determinism
4312 +            assertTrue(f.get() == 5L || f.get() == 8L);
4313 +        }
4314 +
4315 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4316 +        // f plus godot === f (doesn't wait for godot)
4317 +        Monad.assertFutureEquals(Monad.unit(5L),
4318 +                                 Monad.plus(Monad.unit(5L), godot));
4319 +        // godot plus f === f (doesn't wait for godot)
4320 +        Monad.assertFutureEquals(Monad.unit(5L),
4321 +                                 Monad.plus(godot, Monad.unit(5L)));
4322 +    }
4323 +
4324 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4325 +    @SuppressWarnings("FutureReturnValueIgnored")
4326 +    public void testRecursiveChains() throws Throwable {
4327 +        for (ExecutionMode m : ExecutionMode.values())
4328 +        for (boolean addDeadEnds : new boolean[] { true, false })
4329 +    {
4330 +        final int val = 42;
4331 +        final int n = expensiveTests ? 1_000 : 2;
4332 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4333 +        CompletableFuture<Integer> tail = head;
4334 +        for (int i = 0; i < n; i++) {
4335 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4336 +            tail = m.thenApply(tail, v -> v + 1);
4337 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4338 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4339 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4340 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4341 +        }
4342 +        head.complete(val);
4343 +        assertEquals(val + 3 * n, (int) tail.join());
4344 +    }}
4345 +
4346 +    /**
4347 +     * A single CompletableFuture with many dependents.
4348 +     * A demo of scalability - runtime is O(n).
4349 +     */
4350 +    @SuppressWarnings("FutureReturnValueIgnored")
4351 +    public void testManyDependents() throws Throwable {
4352 +        final int n = expensiveTests ? 1_000_000 : 10;
4353 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4354 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4355 +        final AtomicInteger count = new AtomicInteger(0);
4356 +        for (int i = 0; i < n; i++) {
4357 +            head.thenRun(() -> count.getAndIncrement());
4358 +            head.thenAccept(x -> count.getAndIncrement());
4359 +            head.thenApply(x -> count.getAndIncrement());
4360 +
4361 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4362 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4363 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4364 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4365 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4366 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4367 +
4368 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4369 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4370 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4371 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4372 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4373 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4374 +        }
4375 +        head.complete(null);
4376 +        assertEquals(5 * 3 * n, count.get());
4377 +    }
4378 +
4379 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4380 +    @SuppressWarnings("FutureReturnValueIgnored")
4381 +    public void testCoCompletionGarbageRetention() throws Throwable {
4382 +        final int n = expensiveTests ? 1_000_000 : 10;
4383 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4384 +        CompletableFuture<Integer> f;
4385 +        for (int i = 0; i < n; i++) {
4386 +            f = new CompletableFuture<>();
4387 +            f.runAfterEither(incomplete, () -> {});
4388 +            f.complete(null);
4389 +
4390 +            f = new CompletableFuture<>();
4391 +            f.acceptEither(incomplete, x -> {});
4392 +            f.complete(null);
4393 +
4394 +            f = new CompletableFuture<>();
4395 +            f.applyToEither(incomplete, x -> x);
4396 +            f.complete(null);
4397 +
4398 +            f = new CompletableFuture<>();
4399 +            CompletableFuture.anyOf(f, incomplete);
4400 +            f.complete(null);
4401 +        }
4402 +
4403 +        for (int i = 0; i < n; i++) {
4404 +            f = new CompletableFuture<>();
4405 +            incomplete.runAfterEither(f, () -> {});
4406 +            f.complete(null);
4407 +
4408 +            f = new CompletableFuture<>();
4409 +            incomplete.acceptEither(f, x -> {});
4410 +            f.complete(null);
4411 +
4412 +            f = new CompletableFuture<>();
4413 +            incomplete.applyToEither(f, x -> x);
4414 +            f.complete(null);
4415 +
4416 +            f = new CompletableFuture<>();
4417 +            CompletableFuture.anyOf(incomplete, f);
4418 +            f.complete(null);
4419 +        }
4420 +    }
4421 +
4422 +    /**
4423 +     * Reproduction recipe for:
4424 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4425 +     * 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
4426 +     */
4427 +    public void testAnyOfGarbageRetention() throws Throwable {
4428 +        for (Integer v : new Integer[] { 1, null })
4429 +    {
4430 +        final int n = expensiveTests ? 100_000 : 10;
4431 +        CompletableFuture<Integer>[] fs
4432 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4433 +        for (int i = 0; i < fs.length; i++)
4434 +            fs[i] = new CompletableFuture<>();
4435 +        fs[fs.length - 1].complete(v);
4436 +        for (int i = 0; i < n; i++)
4437 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4438 +    }}
4439 +
4440 +    /**
4441 +     * Checks for garbage retention with allOf.
4442 +     *
4443 +     * As of 2016-07, fails with OOME:
4444 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4445 +     */
4446 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4447 +        final int n = expensiveTests ? 100_000 : 10;
4448 +        CompletableFuture<Integer>[] fs
4449 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4450 +        for (int i = 0; i < fs.length; i++)
4451 +            fs[i] = new CompletableFuture<>();
4452 +        for (int i = 0; i < n; i++)
4453 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4454 +    }
4455 +
4456 +    /**
4457 +     * Checks for garbage retention when a dependent future is
4458 +     * cancelled and garbage-collected.
4459 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4460 +     *
4461 +     * As of 2016-07, fails with OOME:
4462 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4463 +     */
4464 +    public void testCancelledGarbageRetention() throws Throwable {
4465 +        final int n = expensiveTests ? 100_000 : 10;
4466 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4467 +        for (int i = 0; i < n; i++)
4468 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4469 +    }
4470 +
4471 +    /**
4472 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4473 +     * is invoked many times.
4474 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4475 +     *
4476 +     * As of 2016-07, fails with OOME:
4477 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4478 +     */
4479 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4480 +        final int n = expensiveTests ? 900_000 : 10;
4481 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4482 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4483 +        for (int i = 0; i < n; i++)
4484 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4485 +    }
4486 +
4487 + //     static <U> U join(CompletionStage<U> stage) {
4488 + //         CompletableFuture<U> f = new CompletableFuture<>();
4489 + //         stage.whenComplete((v, ex) -> {
4490 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4491 + //         });
4492 + //         return f.join();
4493 + //     }
4494 +
4495 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4496 + //         CompletableFuture<U> f = new CompletableFuture<>();
4497 + //         stage.whenComplete((v, ex) -> {
4498 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4499 + //         });
4500 + //         return f.isDone();
4501 + //     }
4502 +
4503 + //     static <U> U join2(CompletionStage<U> stage) {
4504 + //         return stage.toCompletableFuture().copy().join();
4505 + //     }
4506 +
4507 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4508 + //         return stage.toCompletableFuture().copy().isDone();
4509 + //     }
4510 +
4511   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines