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.74 by jsr166, Fri Jun 6 21:19:22 2014 UTC vs.
Revision 1.171 by jsr166, Wed Aug 24 22:22:39 2016 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 > import static java.util.concurrent.CompletableFuture.completedFuture;
11 > import static java.util.concurrent.CompletableFuture.failedFuture;
12 >
13 > import java.lang.reflect.Method;
14 > import java.lang.reflect.Modifier;
15 >
16 > import java.util.stream.Collectors;
17 > import java.util.stream.Stream;
18 >
19 > import java.util.ArrayList;
20 > import java.util.Arrays;
21 > import java.util.List;
22 > import java.util.Objects;
23 > import java.util.Set;
24   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
25   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
26   import java.util.concurrent.CompletableFuture;
27   import java.util.concurrent.CompletionException;
28   import java.util.concurrent.CompletionStage;
29 + import java.util.concurrent.ExecutionException;
30 + import java.util.concurrent.Executor;
31   import java.util.concurrent.ForkJoinPool;
32   import java.util.concurrent.ForkJoinTask;
33 + import java.util.concurrent.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
35   import java.util.concurrent.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.AssertionFailedError;
45 + import junit.framework.Test;
46 + import junit.framework.TestSuite;
47  
48   public class CompletableFutureTest extends JSR166TestCase {
49  
50      public static void main(String[] args) {
51 <        junit.textui.TestRunner.run(suite());
51 >        main(suite(), args);
52      }
53      public static Test suite() {
54          return new TestSuite(CompletableFutureTest.class);
# Line 44 | Line 59 | public class CompletableFutureTest exten
59      void checkIncomplete(CompletableFuture<?> f) {
60          assertFalse(f.isDone());
61          assertFalse(f.isCancelled());
62 <        assertTrue(f.toString().contains("[Not completed]"));
62 >        assertTrue(f.toString().contains("Not completed"));
63          try {
64              assertNull(f.getNow(null));
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 57 | Line 72 | public class CompletableFutureTest exten
72      }
73  
74      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
75 <        try {
76 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
75 >        checkTimedGet(f, value);
76 >
77          try {
78              assertEquals(value, f.join());
79          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 75 | Line 89 | public class CompletableFutureTest exten
89          assertTrue(f.toString().contains("[Completed normally]"));
90      }
91  
92 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
93 <        try {
94 <            f.get(LONG_DELAY_MS, MILLISECONDS);
95 <            shouldThrow();
96 <        } catch (ExecutionException success) {
97 <            assertTrue(success.getCause() instanceof CFException);
98 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
99 <        try {
100 <            f.join();
101 <            shouldThrow();
102 <        } catch (CompletionException success) {
103 <            assertTrue(success.getCause() instanceof CFException);
104 <        }
105 <        try {
106 <            f.getNow(null);
107 <            shouldThrow();
108 <        } catch (CompletionException success) {
95 <            assertTrue(success.getCause() instanceof CFException);
92 >    /**
93 >     * Returns the "raw" internal exceptional completion of f,
94 >     * without any additional wrapping with CompletionException.
95 >     */
96 >    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
97 >        // handle (and whenComplete) can distinguish between "direct"
98 >        // and "wrapped" exceptional completion
99 >        return f.handle((U u, Throwable t) -> t).join();
100 >    }
101 >
102 >    void checkCompletedExceptionally(CompletableFuture<?> f,
103 >                                     boolean wrapped,
104 >                                     Consumer<Throwable> checker) {
105 >        Throwable cause = exceptionalCompletion(f);
106 >        if (wrapped) {
107 >            assertTrue(cause instanceof CompletionException);
108 >            cause = cause.getCause();
109          }
110 <        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]"));
106 <    }
110 >        checker.accept(cause);
111  
112 <    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 <                                                      Throwable ex) {
112 >        long startTime = System.nanoTime();
113          try {
114              f.get(LONG_DELAY_MS, MILLISECONDS);
115              shouldThrow();
116          } catch (ExecutionException success) {
117 <            assertSame(ex, success.getCause());
117 >            assertSame(cause, success.getCause());
118          } catch (Throwable fail) { threadUnexpectedException(fail); }
119 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
120 +
121          try {
122              f.join();
123              shouldThrow();
124          } catch (CompletionException success) {
125 <            assertSame(ex, success.getCause());
126 <        }
125 >            assertSame(cause, success.getCause());
126 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
127 >
128          try {
129              f.getNow(null);
130              shouldThrow();
131          } catch (CompletionException success) {
132 <            assertSame(ex, success.getCause());
133 <        }
132 >            assertSame(cause, success.getCause());
133 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
134 >
135          try {
136              f.get();
137              shouldThrow();
138          } catch (ExecutionException success) {
139 <            assertSame(ex, success.getCause());
139 >            assertSame(cause, success.getCause());
140          } catch (Throwable fail) { threadUnexpectedException(fail); }
141  
135        assertTrue(f.isDone());
142          assertFalse(f.isCancelled());
143 +        assertTrue(f.isDone());
144 +        assertTrue(f.isCompletedExceptionally());
145          assertTrue(f.toString().contains("[Completed exceptionally]"));
146      }
147  
148 <    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
149 <                                                Throwable ex) {
150 <        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); }
148 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
149 >        checkCompletedExceptionally(f, true,
150 >            (t) -> assertTrue(t instanceof CFException));
151      }
152  
153 <    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
154 <        checkCompletedExceptionallyWithRootCause(f, ex);
155 <        try {
156 <            CompletableFuture<Throwable> spy = f.handle
157 <                ((U u, Throwable t) -> t);
158 <            assertSame(ex, spy.join());
159 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
153 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
154 >        checkCompletedExceptionally(f, true,
155 >            (t) -> assertTrue(t instanceof CancellationException));
156 >    }
157 >
158 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
159 >        checkCompletedExceptionally(f, false,
160 >            (t) -> assertTrue(t instanceof TimeoutException));
161 >    }
162 >
163 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
164 >                                            Throwable ex) {
165 >        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
166 >    }
167 >
168 >    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
169 >        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
170      }
171  
172      void checkCancelled(CompletableFuture<?> f) {
173 +        long startTime = System.nanoTime();
174          try {
175              f.get(LONG_DELAY_MS, MILLISECONDS);
176              shouldThrow();
177          } catch (CancellationException success) {
178          } catch (Throwable fail) { threadUnexpectedException(fail); }
179 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
180 +
181          try {
182              f.join();
183              shouldThrow();
# Line 176 | Line 191 | public class CompletableFutureTest exten
191              shouldThrow();
192          } catch (CancellationException success) {
193          } 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    }
194  
195 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
196 <        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); }
195 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
196 >
197          assertTrue(f.isDone());
211        assertFalse(f.isCancelled());
198          assertTrue(f.isCompletedExceptionally());
199 +        assertTrue(f.isCancelled());
200          assertTrue(f.toString().contains("[Completed exceptionally]"));
201      }
202  
# Line 227 | Line 214 | public class CompletableFutureTest exten
214       * isCancelled, join, get, and getNow
215       */
216      public void testComplete() {
217 +        for (Integer v1 : new Integer[] { 1, null })
218 +    {
219          CompletableFuture<Integer> f = new CompletableFuture<>();
220          checkIncomplete(f);
221 <        f.complete(one);
222 <        checkCompletedNormally(f, one);
223 <    }
221 >        assertTrue(f.complete(v1));
222 >        assertFalse(f.complete(v1));
223 >        checkCompletedNormally(f, v1);
224 >    }}
225  
226      /**
227       * completeExceptionally completes exceptionally, as indicated by
# Line 250 | Line 240 | public class CompletableFutureTest exten
240       * methods isDone, isCancelled, join, get, and getNow
241       */
242      public void testCancel() {
243 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
244 +    {
245          CompletableFuture<Integer> f = new CompletableFuture<>();
246          checkIncomplete(f);
247 <        assertTrue(f.cancel(true));
247 >        assertTrue(f.cancel(mayInterruptIfRunning));
248 >        assertTrue(f.cancel(mayInterruptIfRunning));
249 >        assertTrue(f.cancel(!mayInterruptIfRunning));
250          checkCancelled(f);
251 <    }
251 >    }}
252  
253      /**
254       * obtrudeValue forces completion with given value
# Line 262 | Line 256 | public class CompletableFutureTest exten
256      public void testObtrudeValue() {
257          CompletableFuture<Integer> f = new CompletableFuture<>();
258          checkIncomplete(f);
259 <        f.complete(one);
259 >        assertTrue(f.complete(one));
260          checkCompletedNormally(f, one);
261          f.obtrudeValue(three);
262          checkCompletedNormally(f, three);
# Line 289 | Line 283 | public class CompletableFutureTest exten
283          CompletableFuture<Integer> f;
284  
285          f = new CompletableFuture<>();
286 <        f.complete(v1);
286 >        assertTrue(f.complete(v1));
287          for (int i = 0; i < 2; i++) {
288              f.obtrudeException(ex = new CFException());
289              checkCompletedExceptionally(f, ex);
# Line 309 | Line 303 | public class CompletableFutureTest exten
303          checkCompletedExceptionally(f, ex);
304          f.completeExceptionally(new CFException());
305          checkCompletedExceptionally(f, ex);
306 <        f.complete(v1);
306 >        assertFalse(f.complete(v1));
307          checkCompletedExceptionally(f, ex);
308      }}
309  
# Line 317 | Line 311 | public class CompletableFutureTest exten
311       * getNumberOfDependents returns number of dependent tasks
312       */
313      public void testGetNumberOfDependents() {
314 +        for (ExecutionMode m : ExecutionMode.values())
315 +        for (Integer v1 : new Integer[] { 1, null })
316 +    {
317          CompletableFuture<Integer> f = new CompletableFuture<>();
318          assertEquals(0, f.getNumberOfDependents());
319 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
319 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
320          assertEquals(1, f.getNumberOfDependents());
321          assertEquals(0, g.getNumberOfDependents());
322 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
322 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
323          assertEquals(2, f.getNumberOfDependents());
324 <        f.complete(1);
324 >        assertEquals(0, h.getNumberOfDependents());
325 >        assertTrue(f.complete(v1));
326          checkCompletedNormally(g, null);
327 +        checkCompletedNormally(h, null);
328          assertEquals(0, f.getNumberOfDependents());
329          assertEquals(0, g.getNumberOfDependents());
330 <    }
330 >        assertEquals(0, h.getNumberOfDependents());
331 >    }}
332  
333      /**
334       * toString indicates current completion state
# Line 339 | Line 339 | public class CompletableFutureTest exten
339          f = new CompletableFuture<String>();
340          assertTrue(f.toString().contains("[Not completed]"));
341  
342 <        f.complete("foo");
342 >        assertTrue(f.complete("foo"));
343          assertTrue(f.toString().contains("[Completed normally]"));
344  
345          f = new CompletableFuture<String>();
346 <        f.completeExceptionally(new IndexOutOfBoundsException());
347 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
348 <
349 <        f = new CompletableFuture<String>();
350 <        f.cancel(true);
346 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
347          assertTrue(f.toString().contains("[Completed exceptionally]"));
348  
349 <        f = new CompletableFuture<String>();
350 <        f.cancel(false);
351 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
349 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
350 >            f = new CompletableFuture<String>();
351 >            assertTrue(f.cancel(mayInterruptIfRunning));
352 >            assertTrue(f.toString().contains("[Completed exceptionally]"));
353 >        }
354      }
355  
356      /**
# Line 461 | Line 459 | public class CompletableFutureTest exten
459      class FailingSupplier extends CheckedAction
460          implements Supplier<Integer>
461      {
462 <        FailingSupplier(ExecutionMode m) { super(m); }
462 >        final CFException ex;
463 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
464          public Integer get() {
465              invoked();
466 <            throw new CFException();
466 >            throw ex;
467          }
468      }
469  
470      class FailingConsumer extends CheckedIntegerAction
471          implements Consumer<Integer>
472      {
473 <        FailingConsumer(ExecutionMode m) { super(m); }
473 >        final CFException ex;
474 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
475          public void accept(Integer x) {
476              invoked();
477              value = x;
478 <            throw new CFException();
478 >            throw ex;
479          }
480      }
481  
482      class FailingBiConsumer extends CheckedIntegerAction
483          implements BiConsumer<Integer, Integer>
484      {
485 <        FailingBiConsumer(ExecutionMode m) { super(m); }
485 >        final CFException ex;
486 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
487          public void accept(Integer x, Integer y) {
488              invoked();
489              value = subtract(x, y);
490 <            throw new CFException();
490 >            throw ex;
491          }
492      }
493  
494      class FailingFunction extends CheckedIntegerAction
495          implements Function<Integer, Integer>
496      {
497 <        FailingFunction(ExecutionMode m) { super(m); }
497 >        final CFException ex;
498 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
499          public Integer apply(Integer x) {
500              invoked();
501              value = x;
502 <            throw new CFException();
502 >            throw ex;
503          }
504      }
505  
506      class FailingBiFunction extends CheckedIntegerAction
507          implements BiFunction<Integer, Integer, Integer>
508      {
509 <        FailingBiFunction(ExecutionMode m) { super(m); }
509 >        final CFException ex;
510 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
511          public Integer apply(Integer x, Integer y) {
512              invoked();
513              value = subtract(x, y);
514 <            throw new CFException();
514 >            throw ex;
515          }
516      }
517  
518      class FailingRunnable extends CheckedAction implements Runnable {
519 <        FailingRunnable(ExecutionMode m) { super(m); }
519 >        final CFException ex;
520 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
521          public void run() {
522              invoked();
523 <            throw new CFException();
523 >            throw ex;
524          }
525      }
526  
523
527      class CompletableFutureInc extends CheckedIntegerAction
528          implements Function<Integer, CompletableFuture<Integer>>
529      {
# Line 529 | Line 532 | public class CompletableFutureTest exten
532              invoked();
533              value = x;
534              CompletableFuture<Integer> f = new CompletableFuture<>();
535 <            f.complete(inc(x));
535 >            assertTrue(f.complete(inc(x)));
536              return f;
537          }
538      }
# Line 537 | Line 540 | public class CompletableFutureTest exten
540      class FailingCompletableFutureFunction extends CheckedIntegerAction
541          implements Function<Integer, CompletableFuture<Integer>>
542      {
543 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
543 >        final CFException ex;
544 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
545          public CompletableFuture<Integer> apply(Integer x) {
546              invoked();
547              value = x;
548 <            throw new CFException();
548 >            throw ex;
549 >        }
550 >    }
551 >
552 >    static class CountingRejectingExecutor implements Executor {
553 >        final RejectedExecutionException ex = new RejectedExecutionException();
554 >        final AtomicInteger count = new AtomicInteger(0);
555 >        public void execute(Runnable r) {
556 >            count.getAndIncrement();
557 >            throw ex;
558          }
559      }
560  
# Line 559 | Line 572 | public class CompletableFutureTest exten
572          }
573      }
574  
575 +    static final boolean defaultExecutorIsCommonPool
576 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
577 +
578      /**
579       * Permits the testing of parallel code for the 3 different
580       * execution modes without copy/pasting all the test methods.
581       */
582      enum ExecutionMode {
583 <        DEFAULT {
583 >        SYNC {
584              public void checkExecutionMode() {
585                  assertFalse(ThreadExecutor.startedCurrentThread());
586                  assertNull(ForkJoinTask.getPool());
# Line 640 | Line 656 | public class CompletableFutureTest exten
656  
657          ASYNC {
658              public void checkExecutionMode() {
659 <                assertSame(ForkJoinPool.commonPool(),
660 <                           ForkJoinTask.getPool());
659 >                assertEquals(defaultExecutorIsCommonPool,
660 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
661              }
662              public CompletableFuture<Void> runAsync(Runnable a) {
663                  return CompletableFuture.runAsync(a);
# Line 837 | Line 853 | public class CompletableFutureTest exten
853      {
854          final AtomicInteger a = new AtomicInteger(0);
855          final CompletableFuture<Integer> f = new CompletableFuture<>();
856 <        if (!createIncomplete) f.complete(v1);
856 >        if (!createIncomplete) assertTrue(f.complete(v1));
857          final CompletableFuture<Integer> g = f.exceptionally
858              ((Throwable t) -> {
843                // Should not be called
859                  a.getAndIncrement();
860 <                throw new AssertionError();
860 >                threadFail("should not be called");
861 >                return null;            // unreached
862              });
863 <        if (createIncomplete) f.complete(v1);
863 >        if (createIncomplete) assertTrue(f.complete(v1));
864  
865          checkCompletedNormally(g, v1);
866          checkCompletedNormally(f, v1);
867          assertEquals(0, a.get());
868      }}
869  
854
870      /**
871       * exceptionally action completes with function value on source
872       * exception
# Line 866 | Line 881 | public class CompletableFutureTest exten
881          if (!createIncomplete) f.completeExceptionally(ex);
882          final CompletableFuture<Integer> g = f.exceptionally
883              ((Throwable t) -> {
884 <                ExecutionMode.DEFAULT.checkExecutionMode();
884 >                ExecutionMode.SYNC.checkExecutionMode();
885                  threadAssertSame(t, ex);
886                  a.getAndIncrement();
887                  return v1;
# Line 877 | Line 892 | public class CompletableFutureTest exten
892          assertEquals(1, a.get());
893      }}
894  
895 +    /**
896 +     * If an "exceptionally action" throws an exception, it completes
897 +     * exceptionally with that exception
898 +     */
899      public void testExceptionally_exceptionalCompletionActionFailed() {
900          for (boolean createIncomplete : new boolean[] { true, false })
882        for (Integer v1 : new Integer[] { 1, null })
901      {
902          final AtomicInteger a = new AtomicInteger(0);
903          final CFException ex1 = new CFException();
# Line 888 | Line 906 | public class CompletableFutureTest exten
906          if (!createIncomplete) f.completeExceptionally(ex1);
907          final CompletableFuture<Integer> g = f.exceptionally
908              ((Throwable t) -> {
909 <                ExecutionMode.DEFAULT.checkExecutionMode();
909 >                ExecutionMode.SYNC.checkExecutionMode();
910                  threadAssertSame(t, ex1);
911                  a.getAndIncrement();
912                  throw ex2;
# Line 896 | Line 914 | public class CompletableFutureTest exten
914          if (createIncomplete) f.completeExceptionally(ex1);
915  
916          checkCompletedWithWrappedException(g, ex2);
917 +        checkCompletedExceptionally(f, ex1);
918 +        assertEquals(1, a.get());
919 +    }}
920 +
921 +    /**
922 +     * whenComplete action executes on normal completion, propagating
923 +     * source result.
924 +     */
925 +    public void testWhenComplete_normalCompletion() {
926 +        for (ExecutionMode m : ExecutionMode.values())
927 +        for (boolean createIncomplete : new boolean[] { true, false })
928 +        for (Integer v1 : new Integer[] { 1, null })
929 +    {
930 +        final AtomicInteger a = new AtomicInteger(0);
931 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
932 +        if (!createIncomplete) assertTrue(f.complete(v1));
933 +        final CompletableFuture<Integer> g = m.whenComplete
934 +            (f,
935 +             (Integer result, Throwable t) -> {
936 +                m.checkExecutionMode();
937 +                threadAssertSame(result, v1);
938 +                threadAssertNull(t);
939 +                a.getAndIncrement();
940 +            });
941 +        if (createIncomplete) assertTrue(f.complete(v1));
942 +
943 +        checkCompletedNormally(g, v1);
944 +        checkCompletedNormally(f, v1);
945 +        assertEquals(1, a.get());
946 +    }}
947 +
948 +    /**
949 +     * whenComplete action executes on exceptional completion, propagating
950 +     * source result.
951 +     */
952 +    public void testWhenComplete_exceptionalCompletion() {
953 +        for (ExecutionMode m : ExecutionMode.values())
954 +        for (boolean createIncomplete : new boolean[] { true, false })
955 +    {
956 +        final AtomicInteger a = new AtomicInteger(0);
957 +        final CFException ex = new CFException();
958 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
959 +        if (!createIncomplete) f.completeExceptionally(ex);
960 +        final CompletableFuture<Integer> g = m.whenComplete
961 +            (f,
962 +             (Integer result, Throwable t) -> {
963 +                m.checkExecutionMode();
964 +                threadAssertNull(result);
965 +                threadAssertSame(t, ex);
966 +                a.getAndIncrement();
967 +            });
968 +        if (createIncomplete) f.completeExceptionally(ex);
969 +
970 +        checkCompletedWithWrappedException(g, ex);
971 +        checkCompletedExceptionally(f, ex);
972 +        assertEquals(1, a.get());
973 +    }}
974 +
975 +    /**
976 +     * whenComplete action executes on cancelled source, propagating
977 +     * CancellationException.
978 +     */
979 +    public void testWhenComplete_sourceCancelled() {
980 +        for (ExecutionMode m : ExecutionMode.values())
981 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
982 +        for (boolean createIncomplete : new boolean[] { true, false })
983 +    {
984 +        final AtomicInteger a = new AtomicInteger(0);
985 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
986 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987 +        final CompletableFuture<Integer> g = m.whenComplete
988 +            (f,
989 +             (Integer result, Throwable t) -> {
990 +                m.checkExecutionMode();
991 +                threadAssertNull(result);
992 +                threadAssertTrue(t instanceof CancellationException);
993 +                a.getAndIncrement();
994 +            });
995 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
996 +
997 +        checkCompletedWithWrappedCancellationException(g);
998 +        checkCancelled(f);
999 +        assertEquals(1, a.get());
1000 +    }}
1001 +
1002 +    /**
1003 +     * If a whenComplete action throws an exception when triggered by
1004 +     * a normal completion, it completes exceptionally
1005 +     */
1006 +    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1007 +        for (boolean createIncomplete : new boolean[] { true, false })
1008 +        for (ExecutionMode m : ExecutionMode.values())
1009 +        for (Integer v1 : new Integer[] { 1, null })
1010 +    {
1011 +        final AtomicInteger a = new AtomicInteger(0);
1012 +        final CFException ex = new CFException();
1013 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1014 +        if (!createIncomplete) assertTrue(f.complete(v1));
1015 +        final CompletableFuture<Integer> g = m.whenComplete
1016 +            (f,
1017 +             (Integer result, Throwable t) -> {
1018 +                m.checkExecutionMode();
1019 +                threadAssertSame(result, v1);
1020 +                threadAssertNull(t);
1021 +                a.getAndIncrement();
1022 +                throw ex;
1023 +            });
1024 +        if (createIncomplete) assertTrue(f.complete(v1));
1025 +
1026 +        checkCompletedWithWrappedException(g, ex);
1027 +        checkCompletedNormally(f, v1);
1028 +        assertEquals(1, a.get());
1029 +    }}
1030 +
1031 +    /**
1032 +     * If a whenComplete action throws an exception when triggered by
1033 +     * a source completion that also throws an exception, the source
1034 +     * exception takes precedence (unlike handle)
1035 +     */
1036 +    public void testWhenComplete_sourceFailedActionFailed() {
1037 +        for (boolean createIncomplete : new boolean[] { true, false })
1038 +        for (ExecutionMode m : ExecutionMode.values())
1039 +    {
1040 +        final AtomicInteger a = new AtomicInteger(0);
1041 +        final CFException ex1 = new CFException();
1042 +        final CFException ex2 = new CFException();
1043 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1044 +
1045 +        if (!createIncomplete) f.completeExceptionally(ex1);
1046 +        final CompletableFuture<Integer> g = m.whenComplete
1047 +            (f,
1048 +             (Integer result, Throwable t) -> {
1049 +                m.checkExecutionMode();
1050 +                threadAssertSame(t, ex1);
1051 +                threadAssertNull(result);
1052 +                a.getAndIncrement();
1053 +                throw ex2;
1054 +            });
1055 +        if (createIncomplete) f.completeExceptionally(ex1);
1056 +
1057 +        checkCompletedWithWrappedException(g, ex1);
1058 +        checkCompletedExceptionally(f, ex1);
1059 +        if (testImplementationDetails) {
1060 +            assertEquals(1, ex1.getSuppressed().length);
1061 +            assertSame(ex2, ex1.getSuppressed()[0]);
1062 +        }
1063          assertEquals(1, a.get());
1064      }}
1065  
# Line 910 | Line 1074 | public class CompletableFutureTest exten
1074      {
1075          final CompletableFuture<Integer> f = new CompletableFuture<>();
1076          final AtomicInteger a = new AtomicInteger(0);
1077 <        if (!createIncomplete) f.complete(v1);
1077 >        if (!createIncomplete) assertTrue(f.complete(v1));
1078          final CompletableFuture<Integer> g = m.handle
1079              (f,
1080 <             (Integer x, Throwable t) -> {
1080 >             (Integer result, Throwable t) -> {
1081                  m.checkExecutionMode();
1082 <                threadAssertSame(x, v1);
1082 >                threadAssertSame(result, v1);
1083                  threadAssertNull(t);
1084                  a.getAndIncrement();
1085                  return inc(v1);
1086              });
1087 <        if (createIncomplete) f.complete(v1);
1087 >        if (createIncomplete) assertTrue(f.complete(v1));
1088  
1089          checkCompletedNormally(g, inc(v1));
1090          checkCompletedNormally(f, v1);
# Line 942 | Line 1106 | public class CompletableFutureTest exten
1106          if (!createIncomplete) f.completeExceptionally(ex);
1107          final CompletableFuture<Integer> g = m.handle
1108              (f,
1109 <             (Integer x, Throwable t) -> {
1109 >             (Integer result, Throwable t) -> {
1110                  m.checkExecutionMode();
1111 <                threadAssertNull(x);
1111 >                threadAssertNull(result);
1112                  threadAssertSame(t, ex);
1113                  a.getAndIncrement();
1114                  return v1;
# Line 971 | Line 1135 | public class CompletableFutureTest exten
1135          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1136          final CompletableFuture<Integer> g = m.handle
1137              (f,
1138 <             (Integer x, Throwable t) -> {
1138 >             (Integer result, Throwable t) -> {
1139                  m.checkExecutionMode();
1140 <                threadAssertNull(x);
1140 >                threadAssertNull(result);
1141                  threadAssertTrue(t instanceof CancellationException);
1142                  a.getAndIncrement();
1143                  return v1;
# Line 986 | Line 1150 | public class CompletableFutureTest exten
1150      }}
1151  
1152      /**
1153 <     * handle result completes exceptionally if action does
1153 >     * If a "handle action" throws an exception when triggered by
1154 >     * a normal completion, it completes exceptionally
1155       */
1156 <    public void testHandle_sourceFailedActionFailed() {
1156 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1157          for (ExecutionMode m : ExecutionMode.values())
1158          for (boolean createIncomplete : new boolean[] { true, false })
1159 +        for (Integer v1 : new Integer[] { 1, null })
1160      {
1161          final CompletableFuture<Integer> f = new CompletableFuture<>();
1162          final AtomicInteger a = new AtomicInteger(0);
1163 <        final CFException ex1 = new CFException();
1164 <        final CFException ex2 = new CFException();
999 <        if (!createIncomplete) f.completeExceptionally(ex1);
1163 >        final CFException ex = new CFException();
1164 >        if (!createIncomplete) assertTrue(f.complete(v1));
1165          final CompletableFuture<Integer> g = m.handle
1166              (f,
1167 <             (Integer x, Throwable t) -> {
1167 >             (Integer result, Throwable t) -> {
1168                  m.checkExecutionMode();
1169 <                threadAssertNull(x);
1170 <                threadAssertSame(ex1, t);
1169 >                threadAssertSame(result, v1);
1170 >                threadAssertNull(t);
1171                  a.getAndIncrement();
1172 <                throw ex2;
1172 >                throw ex;
1173              });
1174 <        if (createIncomplete) f.completeExceptionally(ex1);
1174 >        if (createIncomplete) assertTrue(f.complete(v1));
1175  
1176 <        checkCompletedWithWrappedException(g, ex2);
1177 <        checkCompletedExceptionally(f, ex1);
1176 >        checkCompletedWithWrappedException(g, ex);
1177 >        checkCompletedNormally(f, v1);
1178          assertEquals(1, a.get());
1179      }}
1180  
1181 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1182 <        for (ExecutionMode m : ExecutionMode.values())
1181 >    /**
1182 >     * If a "handle action" throws an exception when triggered by
1183 >     * a source completion that also throws an exception, the action
1184 >     * exception takes precedence (unlike whenComplete)
1185 >     */
1186 >    public void testHandle_sourceFailedActionFailed() {
1187          for (boolean createIncomplete : new boolean[] { true, false })
1188 <        for (Integer v1 : new Integer[] { 1, null })
1188 >        for (ExecutionMode m : ExecutionMode.values())
1189      {
1021        final CompletableFuture<Integer> f = new CompletableFuture<>();
1190          final AtomicInteger a = new AtomicInteger(0);
1191 <        final CFException ex = new CFException();
1192 <        if (!createIncomplete) f.complete(v1);
1191 >        final CFException ex1 = new CFException();
1192 >        final CFException ex2 = new CFException();
1193 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1194 >
1195 >        if (!createIncomplete) f.completeExceptionally(ex1);
1196          final CompletableFuture<Integer> g = m.handle
1197              (f,
1198 <             (Integer x, Throwable t) -> {
1198 >             (Integer result, Throwable t) -> {
1199                  m.checkExecutionMode();
1200 <                threadAssertSame(x, v1);
1201 <                threadAssertNull(t);
1200 >                threadAssertNull(result);
1201 >                threadAssertSame(ex1, t);
1202                  a.getAndIncrement();
1203 <                throw ex;
1203 >                throw ex2;
1204              });
1205 <        if (createIncomplete) f.complete(v1);
1205 >        if (createIncomplete) f.completeExceptionally(ex1);
1206  
1207 <        checkCompletedWithWrappedException(g, ex);
1208 <        checkCompletedNormally(f, v1);
1207 >        checkCompletedWithWrappedException(g, ex2);
1208 >        checkCompletedExceptionally(f, ex1);
1209          assertEquals(1, a.get());
1210      }}
1211  
# Line 1067 | Line 1238 | public class CompletableFutureTest exten
1238      {
1239          final FailingRunnable r = new FailingRunnable(m);
1240          final CompletableFuture<Void> f = m.runAsync(r);
1241 <        checkCompletedWithWrappedCFException(f);
1241 >        checkCompletedWithWrappedException(f, r.ex);
1242          r.assertInvoked();
1243      }}
1244  
1245 +    public void testRunAsync_rejectingExecutor() {
1246 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1247 +        try {
1248 +            CompletableFuture.runAsync(() -> {}, e);
1249 +            shouldThrow();
1250 +        } catch (Throwable t) {
1251 +            assertSame(e.ex, t);
1252 +        }
1253 +
1254 +        assertEquals(1, e.count.get());
1255 +    }
1256 +
1257      /**
1258       * supplyAsync completes with result of supplier
1259       */
# Line 1101 | Line 1284 | public class CompletableFutureTest exten
1284      {
1285          FailingSupplier r = new FailingSupplier(m);
1286          CompletableFuture<Integer> f = m.supplyAsync(r);
1287 <        checkCompletedWithWrappedCFException(f);
1287 >        checkCompletedWithWrappedException(f, r.ex);
1288          r.assertInvoked();
1289      }}
1290  
1291 +    public void testSupplyAsync_rejectingExecutor() {
1292 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1293 +        try {
1294 +            CompletableFuture.supplyAsync(() -> null, e);
1295 +            shouldThrow();
1296 +        } catch (Throwable t) {
1297 +            assertSame(e.ex, t);
1298 +        }
1299 +
1300 +        assertEquals(1, e.count.get());
1301 +    }
1302 +
1303      // seq completion methods
1304  
1305      /**
# Line 1112 | Line 1307 | public class CompletableFutureTest exten
1307       */
1308      public void testThenRun_normalCompletion() {
1309          for (ExecutionMode m : ExecutionMode.values())
1115        for (boolean createIncomplete : new boolean[] { true, false })
1310          for (Integer v1 : new Integer[] { 1, null })
1311      {
1312          final CompletableFuture<Integer> f = new CompletableFuture<>();
1313 <        final Noop r = new Noop(m);
1314 <        if (!createIncomplete) f.complete(v1);
1121 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1122 <        if (createIncomplete) {
1123 <            checkIncomplete(g);
1124 <            f.complete(v1);
1125 <        }
1313 >        final Noop[] rs = new Noop[6];
1314 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1315  
1316 <        checkCompletedNormally(g, null);
1316 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1317 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1318 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1319 >        checkIncomplete(h0);
1320 >        checkIncomplete(h1);
1321 >        checkIncomplete(h2);
1322 >        assertTrue(f.complete(v1));
1323 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1324 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1325 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1326 >
1327 >        checkCompletedNormally(h0, null);
1328 >        checkCompletedNormally(h1, null);
1329 >        checkCompletedNormally(h2, null);
1330 >        checkCompletedNormally(h3, null);
1331 >        checkCompletedNormally(h4, null);
1332 >        checkCompletedNormally(h5, null);
1333          checkCompletedNormally(f, v1);
1334 <        r.assertInvoked();
1334 >        for (Noop r : rs) r.assertInvoked();
1335      }}
1336  
1337      /**
# Line 1135 | Line 1340 | public class CompletableFutureTest exten
1340       */
1341      public void testThenRun_exceptionalCompletion() {
1342          for (ExecutionMode m : ExecutionMode.values())
1138        for (boolean createIncomplete : new boolean[] { true, false })
1343      {
1344          final CFException ex = new CFException();
1345          final CompletableFuture<Integer> f = new CompletableFuture<>();
1346 <        final Noop r = new Noop(m);
1347 <        if (!createIncomplete) f.completeExceptionally(ex);
1144 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1145 <        if (createIncomplete) {
1146 <            checkIncomplete(g);
1147 <            f.completeExceptionally(ex);
1148 <        }
1346 >        final Noop[] rs = new Noop[6];
1347 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1348  
1349 <        checkCompletedWithWrappedException(g, ex);
1349 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1350 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1351 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1352 >        checkIncomplete(h0);
1353 >        checkIncomplete(h1);
1354 >        checkIncomplete(h2);
1355 >        assertTrue(f.completeExceptionally(ex));
1356 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1357 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1358 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1359 >
1360 >        checkCompletedWithWrappedException(h0, ex);
1361 >        checkCompletedWithWrappedException(h1, ex);
1362 >        checkCompletedWithWrappedException(h2, ex);
1363 >        checkCompletedWithWrappedException(h3, ex);
1364 >        checkCompletedWithWrappedException(h4, ex);
1365 >        checkCompletedWithWrappedException(h5, ex);
1366          checkCompletedExceptionally(f, ex);
1367 <        r.assertNotInvoked();
1367 >        for (Noop r : rs) r.assertNotInvoked();
1368      }}
1369  
1370      /**
# Line 1157 | Line 1372 | public class CompletableFutureTest exten
1372       */
1373      public void testThenRun_sourceCancelled() {
1374          for (ExecutionMode m : ExecutionMode.values())
1160        for (boolean createIncomplete : new boolean[] { true, false })
1375          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1376      {
1377          final CompletableFuture<Integer> f = new CompletableFuture<>();
1378 <        final Noop r = new Noop(m);
1379 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1166 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1167 <        if (createIncomplete) {
1168 <            checkIncomplete(g);
1169 <            assertTrue(f.cancel(mayInterruptIfRunning));
1170 <        }
1378 >        final Noop[] rs = new Noop[6];
1379 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1380  
1381 <        checkCompletedWithWrappedCancellationException(g);
1381 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1382 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1383 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1384 >        checkIncomplete(h0);
1385 >        checkIncomplete(h1);
1386 >        checkIncomplete(h2);
1387 >        assertTrue(f.cancel(mayInterruptIfRunning));
1388 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1389 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1390 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1391 >
1392 >        checkCompletedWithWrappedCancellationException(h0);
1393 >        checkCompletedWithWrappedCancellationException(h1);
1394 >        checkCompletedWithWrappedCancellationException(h2);
1395 >        checkCompletedWithWrappedCancellationException(h3);
1396 >        checkCompletedWithWrappedCancellationException(h4);
1397 >        checkCompletedWithWrappedCancellationException(h5);
1398          checkCancelled(f);
1399 <        r.assertNotInvoked();
1399 >        for (Noop r : rs) r.assertNotInvoked();
1400      }}
1401  
1402      /**
# Line 1179 | Line 1404 | public class CompletableFutureTest exten
1404       */
1405      public void testThenRun_actionFailed() {
1406          for (ExecutionMode m : ExecutionMode.values())
1182        for (boolean createIncomplete : new boolean[] { true, false })
1407          for (Integer v1 : new Integer[] { 1, null })
1408      {
1409          final CompletableFuture<Integer> f = new CompletableFuture<>();
1410 <        final FailingRunnable r = new FailingRunnable(m);
1411 <        if (!createIncomplete) f.complete(v1);
1188 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1189 <        if (createIncomplete) {
1190 <            checkIncomplete(g);
1191 <            f.complete(v1);
1192 <        }
1410 >        final FailingRunnable[] rs = new FailingRunnable[6];
1411 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1412  
1413 <        checkCompletedWithWrappedCFException(g);
1413 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1414 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1415 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1416 >        assertTrue(f.complete(v1));
1417 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1418 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1419 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1420 >
1421 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1422 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1423 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1424 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1425 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1426 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1427          checkCompletedNormally(f, v1);
1428      }}
1429  
# Line 1200 | Line 1432 | public class CompletableFutureTest exten
1432       */
1433      public void testThenApply_normalCompletion() {
1434          for (ExecutionMode m : ExecutionMode.values())
1203        for (boolean createIncomplete : new boolean[] { true, false })
1435          for (Integer v1 : new Integer[] { 1, null })
1436      {
1437          final CompletableFuture<Integer> f = new CompletableFuture<>();
1438 <        final IncFunction r = new IncFunction(m);
1439 <        if (!createIncomplete) f.complete(v1);
1209 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1210 <        if (createIncomplete) {
1211 <            checkIncomplete(g);
1212 <            f.complete(v1);
1213 <        }
1438 >        final IncFunction[] rs = new IncFunction[4];
1439 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1440  
1441 <        checkCompletedNormally(g, inc(v1));
1441 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1442 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1443 >        checkIncomplete(h0);
1444 >        checkIncomplete(h1);
1445 >        assertTrue(f.complete(v1));
1446 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1447 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1448 >
1449 >        checkCompletedNormally(h0, inc(v1));
1450 >        checkCompletedNormally(h1, inc(v1));
1451 >        checkCompletedNormally(h2, inc(v1));
1452 >        checkCompletedNormally(h3, inc(v1));
1453          checkCompletedNormally(f, v1);
1454 <        r.assertValue(inc(v1));
1454 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1455      }}
1456  
1457      /**
# Line 1223 | Line 1460 | public class CompletableFutureTest exten
1460       */
1461      public void testThenApply_exceptionalCompletion() {
1462          for (ExecutionMode m : ExecutionMode.values())
1226        for (boolean createIncomplete : new boolean[] { true, false })
1463      {
1464          final CFException ex = new CFException();
1465          final CompletableFuture<Integer> f = new CompletableFuture<>();
1466 <        final IncFunction r = new IncFunction(m);
1467 <        if (!createIncomplete) f.completeExceptionally(ex);
1232 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1233 <        if (createIncomplete) {
1234 <            checkIncomplete(g);
1235 <            f.completeExceptionally(ex);
1236 <        }
1466 >        final IncFunction[] rs = new IncFunction[4];
1467 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1468  
1469 <        checkCompletedWithWrappedException(g, ex);
1469 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1470 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1471 >        assertTrue(f.completeExceptionally(ex));
1472 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1473 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1474 >
1475 >        checkCompletedWithWrappedException(h0, ex);
1476 >        checkCompletedWithWrappedException(h1, ex);
1477 >        checkCompletedWithWrappedException(h2, ex);
1478 >        checkCompletedWithWrappedException(h3, ex);
1479          checkCompletedExceptionally(f, ex);
1480 <        r.assertNotInvoked();
1480 >        for (IncFunction r : rs) r.assertNotInvoked();
1481      }}
1482  
1483      /**
# Line 1245 | Line 1485 | public class CompletableFutureTest exten
1485       */
1486      public void testThenApply_sourceCancelled() {
1487          for (ExecutionMode m : ExecutionMode.values())
1248        for (boolean createIncomplete : new boolean[] { true, false })
1488          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1489      {
1490          final CompletableFuture<Integer> f = new CompletableFuture<>();
1491 <        final IncFunction r = new IncFunction(m);
1492 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1254 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1255 <        if (createIncomplete) {
1256 <            checkIncomplete(g);
1257 <            assertTrue(f.cancel(mayInterruptIfRunning));
1258 <        }
1491 >        final IncFunction[] rs = new IncFunction[4];
1492 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1493  
1494 <        checkCompletedWithWrappedCancellationException(g);
1494 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1495 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1496 >        assertTrue(f.cancel(mayInterruptIfRunning));
1497 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1498 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1499 >
1500 >        checkCompletedWithWrappedCancellationException(h0);
1501 >        checkCompletedWithWrappedCancellationException(h1);
1502 >        checkCompletedWithWrappedCancellationException(h2);
1503 >        checkCompletedWithWrappedCancellationException(h3);
1504          checkCancelled(f);
1505 <        r.assertNotInvoked();
1505 >        for (IncFunction r : rs) r.assertNotInvoked();
1506      }}
1507  
1508      /**
# Line 1267 | Line 1510 | public class CompletableFutureTest exten
1510       */
1511      public void testThenApply_actionFailed() {
1512          for (ExecutionMode m : ExecutionMode.values())
1270        for (boolean createIncomplete : new boolean[] { true, false })
1513          for (Integer v1 : new Integer[] { 1, null })
1514      {
1515          final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 <        final FailingFunction r = new FailingFunction(m);
1517 <        if (!createIncomplete) f.complete(v1);
1276 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1277 <        if (createIncomplete) {
1278 <            checkIncomplete(g);
1279 <            f.complete(v1);
1280 <        }
1516 >        final FailingFunction[] rs = new FailingFunction[4];
1517 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1518  
1519 <        checkCompletedWithWrappedCFException(g);
1519 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1520 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1521 >        assertTrue(f.complete(v1));
1522 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1523 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1524 >
1525 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1526 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1527 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1528 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1529          checkCompletedNormally(f, v1);
1530      }}
1531  
# Line 1288 | Line 1534 | public class CompletableFutureTest exten
1534       */
1535      public void testThenAccept_normalCompletion() {
1536          for (ExecutionMode m : ExecutionMode.values())
1291        for (boolean createIncomplete : new boolean[] { true, false })
1537          for (Integer v1 : new Integer[] { 1, null })
1538      {
1539          final CompletableFuture<Integer> f = new CompletableFuture<>();
1540 <        final NoopConsumer r = new NoopConsumer(m);
1541 <        if (!createIncomplete) f.complete(v1);
1297 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1298 <        if (createIncomplete) {
1299 <            checkIncomplete(g);
1300 <            f.complete(v1);
1301 <        }
1540 >        final NoopConsumer[] rs = new NoopConsumer[4];
1541 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1542  
1543 <        checkCompletedNormally(g, null);
1544 <        r.assertValue(v1);
1543 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1544 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1545 >        checkIncomplete(h0);
1546 >        checkIncomplete(h1);
1547 >        assertTrue(f.complete(v1));
1548 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1549 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1550 >
1551 >        checkCompletedNormally(h0, null);
1552 >        checkCompletedNormally(h1, null);
1553 >        checkCompletedNormally(h2, null);
1554 >        checkCompletedNormally(h3, null);
1555          checkCompletedNormally(f, v1);
1556 +        for (NoopConsumer r : rs) r.assertValue(v1);
1557      }}
1558  
1559      /**
# Line 1311 | Line 1562 | public class CompletableFutureTest exten
1562       */
1563      public void testThenAccept_exceptionalCompletion() {
1564          for (ExecutionMode m : ExecutionMode.values())
1314        for (boolean createIncomplete : new boolean[] { true, false })
1565      {
1566          final CFException ex = new CFException();
1567          final CompletableFuture<Integer> f = new CompletableFuture<>();
1568 <        final NoopConsumer r = new NoopConsumer(m);
1569 <        if (!createIncomplete) f.completeExceptionally(ex);
1320 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1321 <        if (createIncomplete) {
1322 <            checkIncomplete(g);
1323 <            f.completeExceptionally(ex);
1324 <        }
1568 >        final NoopConsumer[] rs = new NoopConsumer[4];
1569 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1570  
1571 <        checkCompletedWithWrappedException(g, ex);
1571 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1572 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1573 >        assertTrue(f.completeExceptionally(ex));
1574 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1575 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1576 >
1577 >        checkCompletedWithWrappedException(h0, ex);
1578 >        checkCompletedWithWrappedException(h1, ex);
1579 >        checkCompletedWithWrappedException(h2, ex);
1580 >        checkCompletedWithWrappedException(h3, ex);
1581          checkCompletedExceptionally(f, ex);
1582 <        r.assertNotInvoked();
1582 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1583      }}
1584  
1585      /**
# Line 1333 | Line 1587 | public class CompletableFutureTest exten
1587       */
1588      public void testThenAccept_sourceCancelled() {
1589          for (ExecutionMode m : ExecutionMode.values())
1336        for (boolean createIncomplete : new boolean[] { true, false })
1590          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1591      {
1592          final CompletableFuture<Integer> f = new CompletableFuture<>();
1593 <        final NoopConsumer r = new NoopConsumer(m);
1594 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1342 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1343 <        if (createIncomplete) {
1344 <            checkIncomplete(g);
1345 <            assertTrue(f.cancel(mayInterruptIfRunning));
1346 <        }
1593 >        final NoopConsumer[] rs = new NoopConsumer[4];
1594 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1595  
1596 <        checkCompletedWithWrappedCancellationException(g);
1596 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1597 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1598 >        assertTrue(f.cancel(mayInterruptIfRunning));
1599 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1600 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1601 >
1602 >        checkCompletedWithWrappedCancellationException(h0);
1603 >        checkCompletedWithWrappedCancellationException(h1);
1604 >        checkCompletedWithWrappedCancellationException(h2);
1605 >        checkCompletedWithWrappedCancellationException(h3);
1606          checkCancelled(f);
1607 <        r.assertNotInvoked();
1607 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1608      }}
1609  
1610      /**
# Line 1355 | Line 1612 | public class CompletableFutureTest exten
1612       */
1613      public void testThenAccept_actionFailed() {
1614          for (ExecutionMode m : ExecutionMode.values())
1358        for (boolean createIncomplete : new boolean[] { true, false })
1615          for (Integer v1 : new Integer[] { 1, null })
1616      {
1617          final CompletableFuture<Integer> f = new CompletableFuture<>();
1618 <        final FailingConsumer r = new FailingConsumer(m);
1619 <        if (!createIncomplete) f.complete(v1);
1364 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1365 <        if (createIncomplete) {
1366 <            checkIncomplete(g);
1367 <            f.complete(v1);
1368 <        }
1618 >        final FailingConsumer[] rs = new FailingConsumer[4];
1619 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1620  
1621 <        checkCompletedWithWrappedCFException(g);
1621 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1622 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1623 >        assertTrue(f.complete(v1));
1624 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1625 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1626 >
1627 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1628 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1629 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1630 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1631          checkCompletedNormally(f, v1);
1632      }}
1633  
# Line 1377 | Line 1637 | public class CompletableFutureTest exten
1637       */
1638      public void testThenCombine_normalCompletion() {
1639          for (ExecutionMode m : ExecutionMode.values())
1380        for (boolean createIncomplete : new boolean[] { true, false })
1640          for (boolean fFirst : new boolean[] { true, false })
1641          for (Integer v1 : new Integer[] { 1, null })
1642          for (Integer v2 : new Integer[] { 2, null })
1643      {
1644          final CompletableFuture<Integer> f = new CompletableFuture<>();
1645          final CompletableFuture<Integer> g = new CompletableFuture<>();
1646 <        final SubtractFunction r = new SubtractFunction(m);
1646 >        final SubtractFunction[] rs = new SubtractFunction[6];
1647 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1648  
1649 <        if (fFirst) f.complete(v1); else g.complete(v2);
1650 <        if (!createIncomplete)
1651 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1652 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1653 <        if (createIncomplete) {
1654 <            checkIncomplete(h);
1655 <            r.assertNotInvoked();
1656 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1657 <        }
1649 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1650 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1651 >        final Integer w1 =  fFirst ? v1 : v2;
1652 >        final Integer w2 = !fFirst ? v1 : v2;
1653 >
1654 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1655 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1656 >        assertTrue(fst.complete(w1));
1657 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1658 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1659 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1660 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1661 >        checkCompletedNormally(h1, subtract(w1, w1));
1662 >        checkCompletedNormally(h3, subtract(w1, w1));
1663 >        rs[1].assertValue(subtract(w1, w1));
1664 >        rs[3].assertValue(subtract(w1, w1));
1665 >        assertTrue(snd.complete(w2));
1666 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1667 >
1668 >        checkCompletedNormally(h0, subtract(v1, v2));
1669 >        checkCompletedNormally(h2, subtract(v1, v2));
1670 >        checkCompletedNormally(h4, subtract(v1, v2));
1671 >        rs[0].assertValue(subtract(v1, v2));
1672 >        rs[2].assertValue(subtract(v1, v2));
1673 >        rs[4].assertValue(subtract(v1, v2));
1674  
1399        checkCompletedNormally(h, subtract(v1, v2));
1675          checkCompletedNormally(f, v1);
1676          checkCompletedNormally(g, v2);
1402        r.assertValue(subtract(v1, v2));
1677      }}
1678  
1679      /**
1680       * thenCombine result completes exceptionally after exceptional
1681       * completion of either source
1682       */
1683 <    public void testThenCombine_exceptionalCompletion() {
1683 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1684          for (ExecutionMode m : ExecutionMode.values())
1411        for (boolean createIncomplete : new boolean[] { true, false })
1685          for (boolean fFirst : new boolean[] { true, false })
1686 +        for (boolean failFirst : new boolean[] { true, false })
1687          for (Integer v1 : new Integer[] { 1, null })
1688      {
1689          final CompletableFuture<Integer> f = new CompletableFuture<>();
1690          final CompletableFuture<Integer> g = new CompletableFuture<>();
1691          final CFException ex = new CFException();
1692 <        final SubtractFunction r = new SubtractFunction(m);
1693 <
1694 <        (fFirst ? f : g).complete(v1);
1695 <        if (!createIncomplete)
1696 <            (!fFirst ? f : g).completeExceptionally(ex);
1697 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1698 <        if (createIncomplete) {
1699 <            checkIncomplete(h);
1700 <            (!fFirst ? f : g).completeExceptionally(ex);
1701 <        }
1692 >        final SubtractFunction r1 = new SubtractFunction(m);
1693 >        final SubtractFunction r2 = new SubtractFunction(m);
1694 >        final SubtractFunction r3 = new SubtractFunction(m);
1695 >
1696 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1697 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1698 >        final Callable<Boolean> complete1 = failFirst ?
1699 >            () -> fst.completeExceptionally(ex) :
1700 >            () -> fst.complete(v1);
1701 >        final Callable<Boolean> complete2 = failFirst ?
1702 >            () -> snd.complete(v1) :
1703 >            () -> snd.completeExceptionally(ex);
1704 >
1705 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1706 >        assertTrue(complete1.call());
1707 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1708 >        checkIncomplete(h1);
1709 >        checkIncomplete(h2);
1710 >        assertTrue(complete2.call());
1711 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1712  
1713 <        checkCompletedWithWrappedException(h, ex);
1714 <        r.assertNotInvoked();
1715 <        checkCompletedNormally(fFirst ? f : g, v1);
1716 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1713 >        checkCompletedWithWrappedException(h1, ex);
1714 >        checkCompletedWithWrappedException(h2, ex);
1715 >        checkCompletedWithWrappedException(h3, ex);
1716 >        r1.assertNotInvoked();
1717 >        r2.assertNotInvoked();
1718 >        r3.assertNotInvoked();
1719 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1720 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1721      }}
1722  
1723      /**
1724       * thenCombine result completes exceptionally if either source cancelled
1725       */
1726 <    public void testThenCombine_sourceCancelled() {
1726 >    public void testThenCombine_sourceCancelled() throws Throwable {
1727          for (ExecutionMode m : ExecutionMode.values())
1728          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1441        for (boolean createIncomplete : new boolean[] { true, false })
1729          for (boolean fFirst : new boolean[] { true, false })
1730 +        for (boolean failFirst : new boolean[] { true, false })
1731          for (Integer v1 : new Integer[] { 1, null })
1732      {
1733          final CompletableFuture<Integer> f = new CompletableFuture<>();
1734          final CompletableFuture<Integer> g = new CompletableFuture<>();
1735 <        final SubtractFunction r = new SubtractFunction(m);
1736 <
1737 <        (fFirst ? f : g).complete(v1);
1738 <        if (!createIncomplete)
1739 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1740 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1741 <        if (createIncomplete) {
1742 <            checkIncomplete(h);
1743 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1744 <        }
1735 >        final SubtractFunction r1 = new SubtractFunction(m);
1736 >        final SubtractFunction r2 = new SubtractFunction(m);
1737 >        final SubtractFunction r3 = new SubtractFunction(m);
1738 >
1739 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1740 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1741 >        final Callable<Boolean> complete1 = failFirst ?
1742 >            () -> fst.cancel(mayInterruptIfRunning) :
1743 >            () -> fst.complete(v1);
1744 >        final Callable<Boolean> complete2 = failFirst ?
1745 >            () -> snd.complete(v1) :
1746 >            () -> snd.cancel(mayInterruptIfRunning);
1747 >
1748 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1749 >        assertTrue(complete1.call());
1750 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1751 >        checkIncomplete(h1);
1752 >        checkIncomplete(h2);
1753 >        assertTrue(complete2.call());
1754 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1755  
1756 <        checkCompletedWithWrappedCancellationException(h);
1757 <        checkCancelled(!fFirst ? f : g);
1758 <        r.assertNotInvoked();
1759 <        checkCompletedNormally(fFirst ? f : g, v1);
1756 >        checkCompletedWithWrappedCancellationException(h1);
1757 >        checkCompletedWithWrappedCancellationException(h2);
1758 >        checkCompletedWithWrappedCancellationException(h3);
1759 >        r1.assertNotInvoked();
1760 >        r2.assertNotInvoked();
1761 >        r3.assertNotInvoked();
1762 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1763 >        checkCancelled(failFirst ? fst : snd);
1764      }}
1765  
1766      /**
# Line 1472 | Line 1774 | public class CompletableFutureTest exten
1774      {
1775          final CompletableFuture<Integer> f = new CompletableFuture<>();
1776          final CompletableFuture<Integer> g = new CompletableFuture<>();
1777 <        final FailingBiFunction r = new FailingBiFunction(m);
1778 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1779 <
1780 <        if (fFirst) {
1781 <            f.complete(v1);
1782 <            g.complete(v2);
1783 <        } else {
1784 <            g.complete(v2);
1785 <            f.complete(v1);
1786 <        }
1787 <
1788 <        checkCompletedWithWrappedCFException(h);
1777 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1778 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1779 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1780 >
1781 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1782 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1783 >        final Integer w1 =  fFirst ? v1 : v2;
1784 >        final Integer w2 = !fFirst ? v1 : v2;
1785 >
1786 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1787 >        assertTrue(fst.complete(w1));
1788 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1789 >        assertTrue(snd.complete(w2));
1790 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1791 >
1792 >        checkCompletedWithWrappedException(h1, r1.ex);
1793 >        checkCompletedWithWrappedException(h2, r2.ex);
1794 >        checkCompletedWithWrappedException(h3, r3.ex);
1795 >        r1.assertInvoked();
1796 >        r2.assertInvoked();
1797 >        r3.assertInvoked();
1798          checkCompletedNormally(f, v1);
1799          checkCompletedNormally(g, v2);
1800      }}
# Line 1494 | Line 1805 | public class CompletableFutureTest exten
1805       */
1806      public void testThenAcceptBoth_normalCompletion() {
1807          for (ExecutionMode m : ExecutionMode.values())
1497        for (boolean createIncomplete : new boolean[] { true, false })
1808          for (boolean fFirst : new boolean[] { true, false })
1809          for (Integer v1 : new Integer[] { 1, null })
1810          for (Integer v2 : new Integer[] { 2, null })
1811      {
1812          final CompletableFuture<Integer> f = new CompletableFuture<>();
1813          final CompletableFuture<Integer> g = new CompletableFuture<>();
1814 <        final SubtractAction r = new SubtractAction(m);
1815 <
1816 <        if (fFirst) f.complete(v1); else g.complete(v2);
1817 <        if (!createIncomplete)
1818 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1819 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1820 <        if (createIncomplete) {
1821 <            checkIncomplete(h);
1822 <            r.assertNotInvoked();
1823 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1824 <        }
1814 >        final SubtractAction r1 = new SubtractAction(m);
1815 >        final SubtractAction r2 = new SubtractAction(m);
1816 >        final SubtractAction r3 = new SubtractAction(m);
1817 >
1818 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1819 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1820 >        final Integer w1 =  fFirst ? v1 : v2;
1821 >        final Integer w2 = !fFirst ? v1 : v2;
1822 >
1823 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1824 >        assertTrue(fst.complete(w1));
1825 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1826 >        checkIncomplete(h1);
1827 >        checkIncomplete(h2);
1828 >        r1.assertNotInvoked();
1829 >        r2.assertNotInvoked();
1830 >        assertTrue(snd.complete(w2));
1831 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1832  
1833 <        checkCompletedNormally(h, null);
1834 <        r.assertValue(subtract(v1, v2));
1833 >        checkCompletedNormally(h1, null);
1834 >        checkCompletedNormally(h2, null);
1835 >        checkCompletedNormally(h3, null);
1836 >        r1.assertValue(subtract(v1, v2));
1837 >        r2.assertValue(subtract(v1, v2));
1838 >        r3.assertValue(subtract(v1, v2));
1839          checkCompletedNormally(f, v1);
1840          checkCompletedNormally(g, v2);
1841      }}
# Line 1523 | Line 1844 | public class CompletableFutureTest exten
1844       * thenAcceptBoth result completes exceptionally after exceptional
1845       * completion of either source
1846       */
1847 <    public void testThenAcceptBoth_exceptionalCompletion() {
1847 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1848          for (ExecutionMode m : ExecutionMode.values())
1528        for (boolean createIncomplete : new boolean[] { true, false })
1849          for (boolean fFirst : new boolean[] { true, false })
1850 +        for (boolean failFirst : new boolean[] { true, false })
1851          for (Integer v1 : new Integer[] { 1, null })
1852      {
1853          final CompletableFuture<Integer> f = new CompletableFuture<>();
1854          final CompletableFuture<Integer> g = new CompletableFuture<>();
1855          final CFException ex = new CFException();
1856 <        final SubtractAction r = new SubtractAction(m);
1857 <
1858 <        (fFirst ? f : g).complete(v1);
1859 <        if (!createIncomplete)
1860 <            (!fFirst ? f : g).completeExceptionally(ex);
1861 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1862 <        if (createIncomplete) {
1863 <            checkIncomplete(h);
1864 <            (!fFirst ? f : g).completeExceptionally(ex);
1865 <        }
1856 >        final SubtractAction r1 = new SubtractAction(m);
1857 >        final SubtractAction r2 = new SubtractAction(m);
1858 >        final SubtractAction r3 = new SubtractAction(m);
1859 >
1860 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1861 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1862 >        final Callable<Boolean> complete1 = failFirst ?
1863 >            () -> fst.completeExceptionally(ex) :
1864 >            () -> fst.complete(v1);
1865 >        final Callable<Boolean> complete2 = failFirst ?
1866 >            () -> snd.complete(v1) :
1867 >            () -> snd.completeExceptionally(ex);
1868 >
1869 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1870 >        assertTrue(complete1.call());
1871 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1872 >        checkIncomplete(h1);
1873 >        checkIncomplete(h2);
1874 >        assertTrue(complete2.call());
1875 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1876  
1877 <        checkCompletedWithWrappedException(h, ex);
1878 <        r.assertNotInvoked();
1879 <        checkCompletedNormally(fFirst ? f : g, v1);
1880 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1877 >        checkCompletedWithWrappedException(h1, ex);
1878 >        checkCompletedWithWrappedException(h2, ex);
1879 >        checkCompletedWithWrappedException(h3, ex);
1880 >        r1.assertNotInvoked();
1881 >        r2.assertNotInvoked();
1882 >        r3.assertNotInvoked();
1883 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1884 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1885      }}
1886  
1887      /**
1888       * thenAcceptBoth result completes exceptionally if either source cancelled
1889       */
1890 <    public void testThenAcceptBoth_sourceCancelled() {
1890 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1891          for (ExecutionMode m : ExecutionMode.values())
1892          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1558        for (boolean createIncomplete : new boolean[] { true, false })
1893          for (boolean fFirst : new boolean[] { true, false })
1894 +        for (boolean failFirst : new boolean[] { true, false })
1895          for (Integer v1 : new Integer[] { 1, null })
1896      {
1897          final CompletableFuture<Integer> f = new CompletableFuture<>();
1898          final CompletableFuture<Integer> g = new CompletableFuture<>();
1899 <        final SubtractAction r = new SubtractAction(m);
1900 <
1901 <        (fFirst ? f : g).complete(v1);
1902 <        if (!createIncomplete)
1903 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1904 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1905 <        if (createIncomplete) {
1906 <            checkIncomplete(h);
1907 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1908 <        }
1899 >        final SubtractAction r1 = new SubtractAction(m);
1900 >        final SubtractAction r2 = new SubtractAction(m);
1901 >        final SubtractAction r3 = new SubtractAction(m);
1902 >
1903 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1904 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1905 >        final Callable<Boolean> complete1 = failFirst ?
1906 >            () -> fst.cancel(mayInterruptIfRunning) :
1907 >            () -> fst.complete(v1);
1908 >        final Callable<Boolean> complete2 = failFirst ?
1909 >            () -> snd.complete(v1) :
1910 >            () -> snd.cancel(mayInterruptIfRunning);
1911 >
1912 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1913 >        assertTrue(complete1.call());
1914 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1915 >        checkIncomplete(h1);
1916 >        checkIncomplete(h2);
1917 >        assertTrue(complete2.call());
1918 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1919  
1920 <        checkCompletedWithWrappedCancellationException(h);
1921 <        checkCancelled(!fFirst ? f : g);
1922 <        r.assertNotInvoked();
1923 <        checkCompletedNormally(fFirst ? f : g, v1);
1920 >        checkCompletedWithWrappedCancellationException(h1);
1921 >        checkCompletedWithWrappedCancellationException(h2);
1922 >        checkCompletedWithWrappedCancellationException(h3);
1923 >        r1.assertNotInvoked();
1924 >        r2.assertNotInvoked();
1925 >        r3.assertNotInvoked();
1926 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1927 >        checkCancelled(failFirst ? fst : snd);
1928      }}
1929  
1930      /**
# Line 1589 | Line 1938 | public class CompletableFutureTest exten
1938      {
1939          final CompletableFuture<Integer> f = new CompletableFuture<>();
1940          final CompletableFuture<Integer> g = new CompletableFuture<>();
1941 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1942 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1943 <
1944 <        if (fFirst) {
1945 <            f.complete(v1);
1946 <            g.complete(v2);
1947 <        } else {
1948 <            g.complete(v2);
1949 <            f.complete(v1);
1950 <        }
1951 <
1952 <        checkCompletedWithWrappedCFException(h);
1941 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1942 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1943 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1944 >
1945 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1946 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1947 >        final Integer w1 =  fFirst ? v1 : v2;
1948 >        final Integer w2 = !fFirst ? v1 : v2;
1949 >
1950 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1951 >        assertTrue(fst.complete(w1));
1952 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1953 >        assertTrue(snd.complete(w2));
1954 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1955 >
1956 >        checkCompletedWithWrappedException(h1, r1.ex);
1957 >        checkCompletedWithWrappedException(h2, r2.ex);
1958 >        checkCompletedWithWrappedException(h3, r3.ex);
1959 >        r1.assertInvoked();
1960 >        r2.assertInvoked();
1961 >        r3.assertInvoked();
1962          checkCompletedNormally(f, v1);
1963          checkCompletedNormally(g, v2);
1964      }}
# Line 1611 | Line 1969 | public class CompletableFutureTest exten
1969       */
1970      public void testRunAfterBoth_normalCompletion() {
1971          for (ExecutionMode m : ExecutionMode.values())
1614        for (boolean createIncomplete : new boolean[] { true, false })
1972          for (boolean fFirst : new boolean[] { true, false })
1973          for (Integer v1 : new Integer[] { 1, null })
1974          for (Integer v2 : new Integer[] { 2, null })
1975      {
1976          final CompletableFuture<Integer> f = new CompletableFuture<>();
1977          final CompletableFuture<Integer> g = new CompletableFuture<>();
1978 <        final Noop r = new Noop(m);
1979 <
1980 <        if (fFirst) f.complete(v1); else g.complete(v2);
1981 <        if (!createIncomplete)
1982 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1983 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1984 <        if (createIncomplete) {
1985 <            checkIncomplete(h);
1986 <            r.assertNotInvoked();
1987 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1988 <        }
1978 >        final Noop r1 = new Noop(m);
1979 >        final Noop r2 = new Noop(m);
1980 >        final Noop r3 = new Noop(m);
1981 >
1982 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1983 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1984 >        final Integer w1 =  fFirst ? v1 : v2;
1985 >        final Integer w2 = !fFirst ? v1 : v2;
1986 >
1987 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1988 >        assertTrue(fst.complete(w1));
1989 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1990 >        checkIncomplete(h1);
1991 >        checkIncomplete(h2);
1992 >        r1.assertNotInvoked();
1993 >        r2.assertNotInvoked();
1994 >        assertTrue(snd.complete(w2));
1995 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1996  
1997 <        checkCompletedNormally(h, null);
1998 <        r.assertInvoked();
1997 >        checkCompletedNormally(h1, null);
1998 >        checkCompletedNormally(h2, null);
1999 >        checkCompletedNormally(h3, null);
2000 >        r1.assertInvoked();
2001 >        r2.assertInvoked();
2002 >        r3.assertInvoked();
2003          checkCompletedNormally(f, v1);
2004          checkCompletedNormally(g, v2);
2005      }}
# Line 1640 | Line 2008 | public class CompletableFutureTest exten
2008       * runAfterBoth result completes exceptionally after exceptional
2009       * completion of either source
2010       */
2011 <    public void testRunAfterBoth_exceptionalCompletion() {
2011 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2012          for (ExecutionMode m : ExecutionMode.values())
1645        for (boolean createIncomplete : new boolean[] { true, false })
2013          for (boolean fFirst : new boolean[] { true, false })
2014 +        for (boolean failFirst : new boolean[] { true, false })
2015          for (Integer v1 : new Integer[] { 1, null })
2016      {
2017          final CompletableFuture<Integer> f = new CompletableFuture<>();
2018          final CompletableFuture<Integer> g = new CompletableFuture<>();
2019          final CFException ex = new CFException();
2020 <        final Noop r = new Noop(m);
2021 <
2022 <        (fFirst ? f : g).complete(v1);
2023 <        if (!createIncomplete)
2024 <            (!fFirst ? f : g).completeExceptionally(ex);
2025 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2026 <        if (createIncomplete) {
2027 <            checkIncomplete(h);
2028 <            (!fFirst ? f : g).completeExceptionally(ex);
2029 <        }
2020 >        final Noop r1 = new Noop(m);
2021 >        final Noop r2 = new Noop(m);
2022 >        final Noop r3 = new Noop(m);
2023 >
2024 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2025 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2026 >        final Callable<Boolean> complete1 = failFirst ?
2027 >            () -> fst.completeExceptionally(ex) :
2028 >            () -> fst.complete(v1);
2029 >        final Callable<Boolean> complete2 = failFirst ?
2030 >            () -> snd.complete(v1) :
2031 >            () -> snd.completeExceptionally(ex);
2032 >
2033 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2034 >        assertTrue(complete1.call());
2035 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2036 >        checkIncomplete(h1);
2037 >        checkIncomplete(h2);
2038 >        assertTrue(complete2.call());
2039 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2040  
2041 <        checkCompletedWithWrappedException(h, ex);
2042 <        r.assertNotInvoked();
2043 <        checkCompletedNormally(fFirst ? f : g, v1);
2044 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
2041 >        checkCompletedWithWrappedException(h1, ex);
2042 >        checkCompletedWithWrappedException(h2, ex);
2043 >        checkCompletedWithWrappedException(h3, ex);
2044 >        r1.assertNotInvoked();
2045 >        r2.assertNotInvoked();
2046 >        r3.assertNotInvoked();
2047 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2048 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2049      }}
2050  
2051      /**
2052       * runAfterBoth result completes exceptionally if either source cancelled
2053       */
2054 <    public void testRunAfterBoth_sourceCancelled() {
2054 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2055          for (ExecutionMode m : ExecutionMode.values())
2056          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1675        for (boolean createIncomplete : new boolean[] { true, false })
2057          for (boolean fFirst : new boolean[] { true, false })
2058 +        for (boolean failFirst : new boolean[] { true, false })
2059          for (Integer v1 : new Integer[] { 1, null })
2060      {
2061          final CompletableFuture<Integer> f = new CompletableFuture<>();
2062          final CompletableFuture<Integer> g = new CompletableFuture<>();
2063 <        final Noop r = new Noop(m);
2064 <
2065 <
2066 <        (fFirst ? f : g).complete(v1);
2067 <        if (!createIncomplete)
2068 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2069 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2070 <        if (createIncomplete) {
2071 <            checkIncomplete(h);
2072 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2073 <        }
2063 >        final Noop r1 = new Noop(m);
2064 >        final Noop r2 = new Noop(m);
2065 >        final Noop r3 = new Noop(m);
2066 >
2067 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2068 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2069 >        final Callable<Boolean> complete1 = failFirst ?
2070 >            () -> fst.cancel(mayInterruptIfRunning) :
2071 >            () -> fst.complete(v1);
2072 >        final Callable<Boolean> complete2 = failFirst ?
2073 >            () -> snd.complete(v1) :
2074 >            () -> snd.cancel(mayInterruptIfRunning);
2075 >
2076 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2077 >        assertTrue(complete1.call());
2078 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2079 >        checkIncomplete(h1);
2080 >        checkIncomplete(h2);
2081 >        assertTrue(complete2.call());
2082 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2083  
2084 <        checkCompletedWithWrappedCancellationException(h);
2085 <        checkCancelled(!fFirst ? f : g);
2086 <        r.assertNotInvoked();
2087 <        checkCompletedNormally(fFirst ? f : g, v1);
2084 >        checkCompletedWithWrappedCancellationException(h1);
2085 >        checkCompletedWithWrappedCancellationException(h2);
2086 >        checkCompletedWithWrappedCancellationException(h3);
2087 >        r1.assertNotInvoked();
2088 >        r2.assertNotInvoked();
2089 >        r3.assertNotInvoked();
2090 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2091 >        checkCancelled(failFirst ? fst : snd);
2092      }}
2093  
2094      /**
# Line 1709 | Line 2104 | public class CompletableFutureTest exten
2104          final CompletableFuture<Integer> g = new CompletableFuture<>();
2105          final FailingRunnable r1 = new FailingRunnable(m);
2106          final FailingRunnable r2 = new FailingRunnable(m);
2107 +        final FailingRunnable r3 = new FailingRunnable(m);
2108  
2109 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2110 <        if (fFirst) {
2111 <            f.complete(v1);
2112 <            g.complete(v2);
2113 <        } else {
2114 <            g.complete(v2);
2115 <            f.complete(v1);
2116 <        }
2117 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2118 <
2119 <        checkCompletedWithWrappedCFException(h1);
2120 <        checkCompletedWithWrappedCFException(h2);
2109 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2110 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2111 >        final Integer w1 =  fFirst ? v1 : v2;
2112 >        final Integer w2 = !fFirst ? v1 : v2;
2113 >
2114 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2115 >        assertTrue(fst.complete(w1));
2116 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2117 >        assertTrue(snd.complete(w2));
2118 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2119 >
2120 >        checkCompletedWithWrappedException(h1, r1.ex);
2121 >        checkCompletedWithWrappedException(h2, r2.ex);
2122 >        checkCompletedWithWrappedException(h3, r3.ex);
2123 >        r1.assertInvoked();
2124 >        r2.assertInvoked();
2125 >        r3.assertInvoked();
2126          checkCompletedNormally(f, v1);
2127          checkCompletedNormally(g, v2);
2128      }}
# Line 1844 | Line 2245 | public class CompletableFutureTest exten
2245  
2246          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2247          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2248 <        if (fFirst) {
2249 <            f.complete(v1);
1849 <            g.completeExceptionally(ex);
1850 <        } else {
1851 <            g.completeExceptionally(ex);
1852 <            f.complete(v1);
1853 <        }
2248 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2249 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2250          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2251          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2252  
# Line 1956 | Line 2352 | public class CompletableFutureTest exten
2352  
2353          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2354          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2355 <        if (fFirst) {
2356 <            f.complete(v1);
1961 <            g.cancel(mayInterruptIfRunning);
1962 <        } else {
1963 <            g.cancel(mayInterruptIfRunning);
1964 <            f.complete(v1);
1965 <        }
2355 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2356 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2357          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2358          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2359  
# Line 2018 | Line 2409 | public class CompletableFutureTest exten
2409          f.complete(v1);
2410          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2411          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2412 <        checkCompletedWithWrappedCFException(h0);
2413 <        checkCompletedWithWrappedCFException(h1);
2414 <        checkCompletedWithWrappedCFException(h2);
2415 <        checkCompletedWithWrappedCFException(h3);
2412 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2413 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2414 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2415 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2416          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2417  
2418          g.complete(v2);
# Line 2030 | Line 2421 | public class CompletableFutureTest exten
2421          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2422          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2423  
2424 <        checkCompletedWithWrappedCFException(h4);
2424 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2425          assertTrue(Objects.equals(v1, rs[4].value) ||
2426                     Objects.equals(v2, rs[4].value));
2427 <        checkCompletedWithWrappedCFException(h5);
2427 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2428          assertTrue(Objects.equals(v1, rs[5].value) ||
2429                     Objects.equals(v2, rs[5].value));
2430  
# Line 2164 | Line 2555 | public class CompletableFutureTest exten
2555  
2556          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2557          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2558 <        if (fFirst) {
2559 <            f.complete(v1);
2169 <            g.completeExceptionally(ex);
2170 <        } else {
2171 <            g.completeExceptionally(ex);
2172 <            f.complete(v1);
2173 <        }
2558 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2559 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2560          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2561          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2562  
# Line 2282 | Line 2668 | public class CompletableFutureTest exten
2668          f.complete(v1);
2669          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2670          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2671 <        checkCompletedWithWrappedCFException(h0);
2672 <        checkCompletedWithWrappedCFException(h1);
2673 <        checkCompletedWithWrappedCFException(h2);
2674 <        checkCompletedWithWrappedCFException(h3);
2671 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2672 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2673 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2674 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2675          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2676  
2677          g.complete(v2);
# Line 2294 | Line 2680 | public class CompletableFutureTest exten
2680          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2681          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2682  
2683 <        checkCompletedWithWrappedCFException(h4);
2683 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2684          assertTrue(Objects.equals(v1, rs[4].value) ||
2685                     Objects.equals(v2, rs[4].value));
2686 <        checkCompletedWithWrappedCFException(h5);
2686 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2687          assertTrue(Objects.equals(v1, rs[5].value) ||
2688                     Objects.equals(v2, rs[5].value));
2689  
# Line 2313 | Line 2699 | public class CompletableFutureTest exten
2699          for (ExecutionMode m : ExecutionMode.values())
2700          for (Integer v1 : new Integer[] { 1, null })
2701          for (Integer v2 : new Integer[] { 2, null })
2702 +        for (boolean pushNop : new boolean[] { true, false })
2703      {
2704          final CompletableFuture<Integer> f = new CompletableFuture<>();
2705          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2325 | Line 2712 | public class CompletableFutureTest exten
2712          checkIncomplete(h1);
2713          rs[0].assertNotInvoked();
2714          rs[1].assertNotInvoked();
2715 +        if (pushNop) {          // ad hoc test of intra-completion interference
2716 +            m.thenRun(f, () -> {});
2717 +            m.thenRun(g, () -> {});
2718 +        }
2719          f.complete(v1);
2720          checkCompletedNormally(h0, null);
2721          checkCompletedNormally(h1, null);
# Line 2373 | Line 2764 | public class CompletableFutureTest exten
2764          checkIncomplete(h1);
2765          rs[0].assertNotInvoked();
2766          rs[1].assertNotInvoked();
2767 <        f.completeExceptionally(ex);
2767 >        assertTrue(f.completeExceptionally(ex));
2768          checkCompletedWithWrappedException(h0, ex);
2769          checkCompletedWithWrappedException(h1, ex);
2770          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
# Line 2381 | Line 2772 | public class CompletableFutureTest exten
2772          checkCompletedWithWrappedException(h2, ex);
2773          checkCompletedWithWrappedException(h3, ex);
2774  
2775 <        g.complete(v1);
2775 >        assertTrue(g.complete(v1));
2776  
2777          // unspecified behavior - both source completions available
2778          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2424 | Line 2815 | public class CompletableFutureTest exten
2815  
2816          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2817          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2818 <        if (fFirst) {
2819 <            f.complete(v1);
2429 <            g.completeExceptionally(ex);
2430 <        } else {
2431 <            g.completeExceptionally(ex);
2432 <            f.complete(v1);
2433 <        }
2818 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2819 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2820          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2821          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2822  
# Line 2495 | Line 2881 | public class CompletableFutureTest exten
2881          checkCompletedWithWrappedCancellationException(h2);
2882          checkCompletedWithWrappedCancellationException(h3);
2883  
2884 <        g.complete(v1);
2884 >        assertTrue(g.complete(v1));
2885  
2886          // unspecified behavior - both source completions available
2887          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2539 | Line 2925 | public class CompletableFutureTest exten
2925  
2926          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2927          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2928 <        f.complete(v1);
2928 >        assertTrue(f.complete(v1));
2929          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2930          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2931 <        checkCompletedWithWrappedCFException(h0);
2932 <        checkCompletedWithWrappedCFException(h1);
2933 <        checkCompletedWithWrappedCFException(h2);
2934 <        checkCompletedWithWrappedCFException(h3);
2931 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2932 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2933 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2934 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2935          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2936 <        g.complete(v2);
2936 >        assertTrue(g.complete(v2));
2937          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2938          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2939 <        checkCompletedWithWrappedCFException(h4);
2940 <        checkCompletedWithWrappedCFException(h5);
2939 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2940 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2941  
2942          checkCompletedNormally(f, v1);
2943          checkCompletedNormally(g, v2);
# Line 2568 | Line 2954 | public class CompletableFutureTest exten
2954      {
2955          final CompletableFuture<Integer> f = new CompletableFuture<>();
2956          final CompletableFutureInc r = new CompletableFutureInc(m);
2957 <        if (!createIncomplete) f.complete(v1);
2957 >        if (!createIncomplete) assertTrue(f.complete(v1));
2958          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2959 <        if (createIncomplete) f.complete(v1);
2959 >        if (createIncomplete) assertTrue(f.complete(v1));
2960  
2961          checkCompletedNormally(g, inc(v1));
2962          checkCompletedNormally(f, v1);
# Line 2608 | Line 2994 | public class CompletableFutureTest exten
2994          final CompletableFuture<Integer> f = new CompletableFuture<>();
2995          final FailingCompletableFutureFunction r
2996              = new FailingCompletableFutureFunction(m);
2997 <        if (!createIncomplete) f.complete(v1);
2997 >        if (!createIncomplete) assertTrue(f.complete(v1));
2998          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2999 <        if (createIncomplete) f.complete(v1);
2999 >        if (createIncomplete) assertTrue(f.complete(v1));
3000  
3001 <        checkCompletedWithWrappedCFException(g);
3001 >        checkCompletedWithWrappedException(g, r.ex);
3002          checkCompletedNormally(f, v1);
3003      }}
3004  
# Line 2637 | Line 3023 | public class CompletableFutureTest exten
3023          checkCancelled(f);
3024      }}
3025  
3026 +    /**
3027 +     * thenCompose result completes exceptionally if the result of the action does
3028 +     */
3029 +    public void testThenCompose_actionReturnsFailingFuture() {
3030 +        for (ExecutionMode m : ExecutionMode.values())
3031 +        for (int order = 0; order < 6; order++)
3032 +        for (Integer v1 : new Integer[] { 1, null })
3033 +    {
3034 +        final CFException ex = new CFException();
3035 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3036 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3037 +        final CompletableFuture<Integer> h;
3038 +        // Test all permutations of orders
3039 +        switch (order) {
3040 +        case 0:
3041 +            assertTrue(f.complete(v1));
3042 +            assertTrue(g.completeExceptionally(ex));
3043 +            h = m.thenCompose(f, (x -> g));
3044 +            break;
3045 +        case 1:
3046 +            assertTrue(f.complete(v1));
3047 +            h = m.thenCompose(f, (x -> g));
3048 +            assertTrue(g.completeExceptionally(ex));
3049 +            break;
3050 +        case 2:
3051 +            assertTrue(g.completeExceptionally(ex));
3052 +            assertTrue(f.complete(v1));
3053 +            h = m.thenCompose(f, (x -> g));
3054 +            break;
3055 +        case 3:
3056 +            assertTrue(g.completeExceptionally(ex));
3057 +            h = m.thenCompose(f, (x -> g));
3058 +            assertTrue(f.complete(v1));
3059 +            break;
3060 +        case 4:
3061 +            h = m.thenCompose(f, (x -> g));
3062 +            assertTrue(f.complete(v1));
3063 +            assertTrue(g.completeExceptionally(ex));
3064 +            break;
3065 +        case 5:
3066 +            h = m.thenCompose(f, (x -> g));
3067 +            assertTrue(f.complete(v1));
3068 +            assertTrue(g.completeExceptionally(ex));
3069 +            break;
3070 +        default: throw new AssertionError();
3071 +        }
3072 +
3073 +        checkCompletedExceptionally(g, ex);
3074 +        checkCompletedWithWrappedException(h, ex);
3075 +        checkCompletedNormally(f, v1);
3076 +    }}
3077 +
3078      // other static methods
3079  
3080      /**
# Line 2653 | Line 3091 | public class CompletableFutureTest exten
3091       * when all components complete normally
3092       */
3093      public void testAllOf_normal() throws Exception {
3094 <        for (int k = 1; k < 20; ++k) {
3094 >        for (int k = 1; k < 10; k++) {
3095              CompletableFuture<Integer>[] fs
3096                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3097 <            for (int i = 0; i < k; ++i)
3097 >            for (int i = 0; i < k; i++)
3098                  fs[i] = new CompletableFuture<>();
3099              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3100 <            for (int i = 0; i < k; ++i) {
3100 >            for (int i = 0; i < k; i++) {
3101                  checkIncomplete(f);
3102                  checkIncomplete(CompletableFuture.allOf(fs));
3103                  fs[i].complete(one);
# Line 2669 | Line 3107 | public class CompletableFutureTest exten
3107          }
3108      }
3109  
3110 <    public void testAllOf_backwards() throws Exception {
3111 <        for (int k = 1; k < 20; ++k) {
3110 >    public void testAllOf_normal_backwards() throws Exception {
3111 >        for (int k = 1; k < 10; k++) {
3112              CompletableFuture<Integer>[] fs
3113                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3114 <            for (int i = 0; i < k; ++i)
3114 >            for (int i = 0; i < k; i++)
3115                  fs[i] = new CompletableFuture<>();
3116              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3117              for (int i = k - 1; i >= 0; i--) {
# Line 2686 | Line 3124 | public class CompletableFutureTest exten
3124          }
3125      }
3126  
3127 +    public void testAllOf_exceptional() throws Exception {
3128 +        for (int k = 1; k < 10; k++) {
3129 +            CompletableFuture<Integer>[] fs
3130 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3131 +            CFException ex = new CFException();
3132 +            for (int i = 0; i < k; i++)
3133 +                fs[i] = new CompletableFuture<>();
3134 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3135 +            for (int i = 0; i < k; i++) {
3136 +                checkIncomplete(f);
3137 +                checkIncomplete(CompletableFuture.allOf(fs));
3138 +                if (i != k / 2) {
3139 +                    fs[i].complete(i);
3140 +                    checkCompletedNormally(fs[i], i);
3141 +                } else {
3142 +                    fs[i].completeExceptionally(ex);
3143 +                    checkCompletedExceptionally(fs[i], ex);
3144 +                }
3145 +            }
3146 +            checkCompletedWithWrappedException(f, ex);
3147 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3148 +        }
3149 +    }
3150 +
3151      /**
3152       * anyOf(no component futures) returns an incomplete future
3153       */
3154      public void testAnyOf_empty() throws Exception {
3155 +        for (Integer v1 : new Integer[] { 1, null })
3156 +    {
3157          CompletableFuture<Object> f = CompletableFuture.anyOf();
3158          checkIncomplete(f);
3159 <    }
3159 >
3160 >        f.complete(v1);
3161 >        checkCompletedNormally(f, v1);
3162 >    }}
3163  
3164      /**
3165       * anyOf returns a future completed normally with a value when
3166       * a component future does
3167       */
3168      public void testAnyOf_normal() throws Exception {
3169 <        for (int k = 0; k < 10; ++k) {
3169 >        for (int k = 0; k < 10; k++) {
3170              CompletableFuture[] fs = new CompletableFuture[k];
3171 <            for (int i = 0; i < k; ++i)
3171 >            for (int i = 0; i < k; i++)
3172                  fs[i] = new CompletableFuture<>();
3173              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3174              checkIncomplete(f);
3175 <            for (int i = 0; i < k; ++i) {
3176 <                fs[i].complete(one);
3177 <                checkCompletedNormally(f, one);
3178 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3175 >            for (int i = 0; i < k; i++) {
3176 >                fs[i].complete(i);
3177 >                checkCompletedNormally(f, 0);
3178 >                int x = (int) CompletableFuture.anyOf(fs).join();
3179 >                assertTrue(0 <= x && x <= i);
3180 >            }
3181 >        }
3182 >    }
3183 >    public void testAnyOf_normal_backwards() throws Exception {
3184 >        for (int k = 0; k < 10; k++) {
3185 >            CompletableFuture[] fs = new CompletableFuture[k];
3186 >            for (int i = 0; i < k; i++)
3187 >                fs[i] = new CompletableFuture<>();
3188 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3189 >            checkIncomplete(f);
3190 >            for (int i = k - 1; i >= 0; i--) {
3191 >                fs[i].complete(i);
3192 >                checkCompletedNormally(f, k - 1);
3193 >                int x = (int) CompletableFuture.anyOf(fs).join();
3194 >                assertTrue(i <= x && x <= k - 1);
3195              }
3196          }
3197      }
# Line 2717 | Line 3200 | public class CompletableFutureTest exten
3200       * anyOf result completes exceptionally when any component does.
3201       */
3202      public void testAnyOf_exceptional() throws Exception {
3203 <        for (int k = 0; k < 10; ++k) {
3203 >        for (int k = 0; k < 10; k++) {
3204              CompletableFuture[] fs = new CompletableFuture[k];
3205 <            for (int i = 0; i < k; ++i)
3205 >            CFException[] exs = new CFException[k];
3206 >            for (int i = 0; i < k; i++) {
3207                  fs[i] = new CompletableFuture<>();
3208 +                exs[i] = new CFException();
3209 +            }
3210              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3211              checkIncomplete(f);
3212 <            for (int i = 0; i < k; ++i) {
3213 <                fs[i].completeExceptionally(new CFException());
3214 <                checkCompletedWithWrappedCFException(f);
3212 >            for (int i = 0; i < k; i++) {
3213 >                fs[i].completeExceptionally(exs[i]);
3214 >                checkCompletedWithWrappedException(f, exs[0]);
3215 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3216 >            }
3217 >        }
3218 >    }
3219 >
3220 >    public void testAnyOf_exceptional_backwards() throws Exception {
3221 >        for (int k = 0; k < 10; k++) {
3222 >            CompletableFuture[] fs = new CompletableFuture[k];
3223 >            CFException[] exs = new CFException[k];
3224 >            for (int i = 0; i < k; i++) {
3225 >                fs[i] = new CompletableFuture<>();
3226 >                exs[i] = new CFException();
3227 >            }
3228 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3229 >            checkIncomplete(f);
3230 >            for (int i = k - 1; i >= 0; i--) {
3231 >                fs[i].completeExceptionally(exs[i]);
3232 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3233                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3234              }
3235          }
# Line 2738 | Line 3242 | public class CompletableFutureTest exten
3242          CompletableFuture<Integer> f = new CompletableFuture<>();
3243          CompletableFuture<Integer> g = new CompletableFuture<>();
3244          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2741        CompletableFuture<?> h;
3245          ThreadExecutor exec = new ThreadExecutor();
3246  
3247          Runnable[] throwingActions = {
3248              () -> CompletableFuture.supplyAsync(null),
3249              () -> CompletableFuture.supplyAsync(null, exec),
3250 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3250 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3251  
3252              () -> CompletableFuture.runAsync(null),
3253              () -> CompletableFuture.runAsync(null, exec),
# Line 2835 | Line 3338 | public class CompletableFutureTest exten
3338              () -> CompletableFuture.anyOf(null, f),
3339  
3340              () -> f.obtrudeException(null),
3341 +
3342 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3343 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3344 +            () -> CompletableFuture.delayedExecutor(1L, null),
3345 +
3346 +            () -> f.orTimeout(1L, null),
3347 +            () -> f.completeOnTimeout(42, 1L, null),
3348 +
3349 +            () -> CompletableFuture.failedFuture(null),
3350 +            () -> CompletableFuture.failedStage(null),
3351          };
3352  
3353          assertThrows(NullPointerException.class, throwingActions);
# Line 2842 | Line 3355 | public class CompletableFutureTest exten
3355      }
3356  
3357      /**
3358 +     * Test submissions to an executor that rejects all tasks.
3359 +     */
3360 +    public void testRejectingExecutor() {
3361 +        for (Integer v : new Integer[] { 1, null })
3362 +    {
3363 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3364 +
3365 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3366 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3367 +
3368 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3369 +
3370 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3371 +        srcs.add(complete);
3372 +        srcs.add(incomplete);
3373 +
3374 +        for (CompletableFuture<Integer> src : srcs) {
3375 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3376 +            fs.add(src.thenRunAsync(() -> {}, e));
3377 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3378 +            fs.add(src.thenApplyAsync((z) -> z, e));
3379 +
3380 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3381 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3382 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3383 +
3384 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3385 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3386 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3387 +
3388 +            fs.add(src.thenComposeAsync((z) -> null, e));
3389 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3390 +            fs.add(src.handleAsync((z, t) -> null, e));
3391 +
3392 +            for (CompletableFuture<?> future : fs) {
3393 +                if (src.isDone())
3394 +                    checkCompletedWithWrappedException(future, e.ex);
3395 +                else
3396 +                    checkIncomplete(future);
3397 +            }
3398 +            futures.addAll(fs);
3399 +        }
3400 +
3401 +        {
3402 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3403 +
3404 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3405 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3406 +
3407 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3408 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3409 +
3410 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3411 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3412 +
3413 +            for (CompletableFuture<?> future : fs)
3414 +                checkIncomplete(future);
3415 +            futures.addAll(fs);
3416 +        }
3417 +
3418 +        {
3419 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3420 +
3421 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3422 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3423 +
3424 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3425 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3426 +
3427 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3428 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3429 +
3430 +            for (CompletableFuture<?> future : fs)
3431 +                checkCompletedWithWrappedException(future, e.ex);
3432 +            futures.addAll(fs);
3433 +        }
3434 +
3435 +        incomplete.complete(v);
3436 +
3437 +        for (CompletableFuture<?> future : futures)
3438 +            checkCompletedWithWrappedException(future, e.ex);
3439 +
3440 +        assertEquals(futures.size(), e.count.get());
3441 +    }}
3442 +
3443 +    /**
3444 +     * Test submissions to an executor that rejects all tasks, but
3445 +     * should never be invoked because the dependent future is
3446 +     * explicitly completed.
3447 +     */
3448 +    public void testRejectingExecutorNeverInvoked() {
3449 +        for (Integer v : new Integer[] { 1, null })
3450 +    {
3451 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3452 +
3453 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3454 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3455 +
3456 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3457 +
3458 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3459 +        srcs.add(complete);
3460 +        srcs.add(incomplete);
3461 +
3462 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3463 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3464 +        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3465 +        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3466 +
3467 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3468 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3469 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3470 +
3471 +        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3472 +        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3473 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3474 +
3475 +        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3476 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3477 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3478 +
3479 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3480 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3481 +
3482 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3483 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3484 +
3485 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3486 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3487 +
3488 +        for (CompletableFuture<?> future : fs)
3489 +            checkIncomplete(future);
3490 +
3491 +        for (CompletableFuture<?> future : fs)
3492 +            future.complete(null);
3493 +
3494 +        incomplete.complete(v);
3495 +
3496 +        for (CompletableFuture<?> future : fs)
3497 +            checkCompletedNormally(future, null);
3498 +
3499 +        assertEquals(0, e.count.get());
3500 +    }}
3501 +
3502 +    /**
3503       * toCompletableFuture returns this CompletableFuture.
3504       */
3505      public void testToCompletableFuture() {
# Line 2849 | Line 3507 | public class CompletableFutureTest exten
3507          assertSame(f, f.toCompletableFuture());
3508      }
3509  
3510 +    // jdk9
3511 +
3512      /**
3513 <     * whenComplete action executes on normal completion, propagating
2854 <     * source result.
3513 >     * newIncompleteFuture returns an incomplete CompletableFuture
3514       */
3515 <    public void testWhenComplete_normalCompletion1() {
2857 <        for (ExecutionMode m : ExecutionMode.values())
2858 <        for (boolean createIncomplete : new boolean[] { true, false })
3515 >    public void testNewIncompleteFuture() {
3516          for (Integer v1 : new Integer[] { 1, null })
3517      {
3518 <        final AtomicInteger a = new AtomicInteger(0);
3519 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3520 <        if (!createIncomplete) f.complete(v1);
3521 <        final CompletableFuture<Integer> g = m.whenComplete
3522 <            (f,
2866 <             (Integer x, Throwable t) -> {
2867 <                m.checkExecutionMode();
2868 <                threadAssertSame(x, v1);
2869 <                threadAssertNull(t);
2870 <                a.getAndIncrement();
2871 <            });
2872 <        if (createIncomplete) f.complete(v1);
2873 <
2874 <        checkCompletedNormally(g, v1);
3518 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3519 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3520 >        checkIncomplete(f);
3521 >        checkIncomplete(g);
3522 >        f.complete(v1);
3523          checkCompletedNormally(f, v1);
3524 <        assertEquals(1, a.get());
3524 >        checkIncomplete(g);
3525 >        g.complete(v1);
3526 >        checkCompletedNormally(g, v1);
3527 >        assertSame(g.getClass(), CompletableFuture.class);
3528      }}
3529  
3530      /**
3531 <     * whenComplete action executes on exceptional completion, propagating
2881 <     * source result.
3531 >     * completedStage returns a completed CompletionStage
3532       */
3533 <    public void testWhenComplete_exceptionalCompletion() {
3534 <        for (ExecutionMode m : ExecutionMode.values())
3535 <        for (boolean createIncomplete : new boolean[] { true, false })
3536 <        for (Integer v1 : new Integer[] { 1, null })
3537 <    {
3538 <        final AtomicInteger a = new AtomicInteger(0);
3539 <        final CFException ex = new CFException();
3540 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3541 <        if (!createIncomplete) f.completeExceptionally(ex);
3542 <        final CompletableFuture<Integer> g = m.whenComplete
3543 <            (f,
3544 <             (Integer x, Throwable t) -> {
3545 <                m.checkExecutionMode();
3546 <                threadAssertNull(x);
3547 <                threadAssertSame(t, ex);
3548 <                a.getAndIncrement();
3549 <            });
3550 <        if (createIncomplete) f.completeExceptionally(ex);
3533 >    public void testCompletedStage() {
3534 >        AtomicInteger x = new AtomicInteger(0);
3535 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3536 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3537 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3538 >        assertEquals(x.get(), 1);
3539 >        assertNull(r.get());
3540 >    }
3541 >
3542 >    /**
3543 >     * defaultExecutor by default returns the commonPool if
3544 >     * it supports more than one thread.
3545 >     */
3546 >    public void testDefaultExecutor() {
3547 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3548 >        Executor e = f.defaultExecutor();
3549 >        Executor c = ForkJoinPool.commonPool();
3550 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3551 >            assertSame(e, c);
3552 >        else
3553 >            assertNotSame(e, c);
3554 >    }
3555 >
3556 >    /**
3557 >     * failedFuture returns a CompletableFuture completed
3558 >     * exceptionally with the given Exception
3559 >     */
3560 >    public void testFailedFuture() {
3561 >        CFException ex = new CFException();
3562 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3563 >        checkCompletedExceptionally(f, ex);
3564 >    }
3565 >
3566 >    /**
3567 >     * failedFuture(null) throws NPE
3568 >     */
3569 >    public void testFailedFuture_null() {
3570 >        try {
3571 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3572 >            shouldThrow();
3573 >        } catch (NullPointerException success) {}
3574 >    }
3575 >
3576 >    /**
3577 >     * copy returns a CompletableFuture that is completed normally,
3578 >     * with the same value, when source is.
3579 >     */
3580 >    public void testCopy() {
3581 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3582 >        CompletableFuture<Integer> g = f.copy();
3583 >        checkIncomplete(f);
3584 >        checkIncomplete(g);
3585 >        f.complete(1);
3586 >        checkCompletedNormally(f, 1);
3587 >        checkCompletedNormally(g, 1);
3588 >    }
3589 >
3590 >    /**
3591 >     * copy returns a CompletableFuture that is completed exceptionally
3592 >     * when source is.
3593 >     */
3594 >    public void testCopy2() {
3595 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3596 >        CompletableFuture<Integer> g = f.copy();
3597 >        checkIncomplete(f);
3598 >        checkIncomplete(g);
3599 >        CFException ex = new CFException();
3600 >        f.completeExceptionally(ex);
3601          checkCompletedExceptionally(f, ex);
3602          checkCompletedWithWrappedException(g, ex);
3603 <        assertEquals(1, a.get());
3603 >    }
3604 >
3605 >    /**
3606 >     * minimalCompletionStage returns a CompletableFuture that is
3607 >     * completed normally, with the same value, when source is.
3608 >     */
3609 >    public void testMinimalCompletionStage() {
3610 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3611 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3612 >        AtomicInteger x = new AtomicInteger(0);
3613 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3614 >        checkIncomplete(f);
3615 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3616 >        f.complete(1);
3617 >        checkCompletedNormally(f, 1);
3618 >        assertEquals(x.get(), 1);
3619 >        assertNull(r.get());
3620 >    }
3621 >
3622 >    /**
3623 >     * minimalCompletionStage returns a CompletableFuture that is
3624 >     * completed exceptionally when source is.
3625 >     */
3626 >    public void testMinimalCompletionStage2() {
3627 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3628 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3629 >        AtomicInteger x = new AtomicInteger(0);
3630 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3631 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3632 >        checkIncomplete(f);
3633 >        CFException ex = new CFException();
3634 >        f.completeExceptionally(ex);
3635 >        checkCompletedExceptionally(f, ex);
3636 >        assertEquals(x.get(), 0);
3637 >        assertEquals(r.get().getCause(), ex);
3638 >    }
3639 >
3640 >    /**
3641 >     * failedStage returns a CompletionStage completed
3642 >     * exceptionally with the given Exception
3643 >     */
3644 >    public void testFailedStage() {
3645 >        CFException ex = new CFException();
3646 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3647 >        AtomicInteger x = new AtomicInteger(0);
3648 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3649 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3650 >        assertEquals(x.get(), 0);
3651 >        assertEquals(r.get(), ex);
3652 >    }
3653 >
3654 >    /**
3655 >     * completeAsync completes with value of given supplier
3656 >     */
3657 >    public void testCompleteAsync() {
3658 >        for (Integer v1 : new Integer[] { 1, null })
3659 >    {
3660 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3661 >        f.completeAsync(() -> v1);
3662 >        f.join();
3663 >        checkCompletedNormally(f, v1);
3664      }}
3665  
3666      /**
3667 <     * whenComplete action executes on cancelled source, propagating
2908 <     * CancellationException.
3667 >     * completeAsync completes exceptionally if given supplier throws
3668       */
3669 <    public void testWhenComplete_sourceCancelled() {
3670 <        for (ExecutionMode m : ExecutionMode.values())
3671 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3672 <        for (boolean createIncomplete : new boolean[] { true, false })
3669 >    public void testCompleteAsync2() {
3670 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3671 >        CFException ex = new CFException();
3672 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3673 >        try {
3674 >            f.join();
3675 >            shouldThrow();
3676 >        } catch (CompletionException success) {}
3677 >        checkCompletedWithWrappedException(f, ex);
3678 >    }
3679 >
3680 >    /**
3681 >     * completeAsync with given executor completes with value of given supplier
3682 >     */
3683 >    public void testCompleteAsync3() {
3684 >        for (Integer v1 : new Integer[] { 1, null })
3685      {
3686 <        final AtomicInteger a = new AtomicInteger(0);
3687 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3688 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3689 <        final CompletableFuture<Integer> g = m.whenComplete
3690 <            (f,
3691 <             (Integer x, Throwable t) -> {
3692 <                m.checkExecutionMode();
2922 <                threadAssertNull(x);
2923 <                threadAssertTrue(t instanceof CancellationException);
2924 <                a.getAndIncrement();
2925 <            });
2926 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3686 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3687 >        ThreadExecutor executor = new ThreadExecutor();
3688 >        f.completeAsync(() -> v1, executor);
3689 >        assertSame(v1, f.join());
3690 >        checkCompletedNormally(f, v1);
3691 >        assertEquals(1, executor.count.get());
3692 >    }}
3693  
3694 <        checkCompletedWithWrappedCancellationException(g);
3695 <        checkCancelled(f);
3696 <        assertEquals(1, a.get());
3694 >    /**
3695 >     * completeAsync with given executor completes exceptionally if
3696 >     * given supplier throws
3697 >     */
3698 >    public void testCompleteAsync4() {
3699 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3700 >        CFException ex = new CFException();
3701 >        ThreadExecutor executor = new ThreadExecutor();
3702 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3703 >        try {
3704 >            f.join();
3705 >            shouldThrow();
3706 >        } catch (CompletionException success) {}
3707 >        checkCompletedWithWrappedException(f, ex);
3708 >        assertEquals(1, executor.count.get());
3709 >    }
3710 >
3711 >    /**
3712 >     * orTimeout completes with TimeoutException if not complete
3713 >     */
3714 >    public void testOrTimeout_timesOut() {
3715 >        long timeoutMillis = timeoutMillis();
3716 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3717 >        long startTime = System.nanoTime();
3718 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3719 >        checkCompletedWithTimeoutException(f);
3720 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3721 >    }
3722 >
3723 >    /**
3724 >     * orTimeout completes normally if completed before timeout
3725 >     */
3726 >    public void testOrTimeout_completed() {
3727 >        for (Integer v1 : new Integer[] { 1, null })
3728 >    {
3729 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3730 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3731 >        long startTime = System.nanoTime();
3732 >        f.complete(v1);
3733 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3734 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3735 >        g.complete(v1);
3736 >        checkCompletedNormally(f, v1);
3737 >        checkCompletedNormally(g, v1);
3738 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3739      }}
3740  
3741      /**
3742 <     * If a whenComplete action throws an exception when triggered by
2935 <     * a normal completion, it completes exceptionally
3742 >     * completeOnTimeout completes with given value if not complete
3743       */
3744 <    public void testWhenComplete_actionFailed() {
3745 <        for (boolean createIncomplete : new boolean[] { true, false })
3746 <        for (ExecutionMode m : ExecutionMode.values())
3744 >    public void testCompleteOnTimeout_timesOut() {
3745 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3746 >                       () -> testCompleteOnTimeout_timesOut(null));
3747 >    }
3748 >
3749 >    /**
3750 >     * completeOnTimeout completes with given value if not complete
3751 >     */
3752 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3753 >        long timeoutMillis = timeoutMillis();
3754 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3755 >        long startTime = System.nanoTime();
3756 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3757 >        assertSame(v, f.join());
3758 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3759 >        f.complete(99);         // should have no effect
3760 >        checkCompletedNormally(f, v);
3761 >    }
3762 >
3763 >    /**
3764 >     * completeOnTimeout has no effect if completed within timeout
3765 >     */
3766 >    public void testCompleteOnTimeout_completed() {
3767          for (Integer v1 : new Integer[] { 1, null })
3768      {
3769 <        final AtomicInteger a = new AtomicInteger(0);
3770 <        final CFException ex = new CFException();
3771 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3772 <        if (!createIncomplete) f.complete(v1);
3773 <        final CompletableFuture<Integer> g = m.whenComplete
3774 <            (f,
3775 <             (Integer x, Throwable t) -> {
2949 <                m.checkExecutionMode();
2950 <                threadAssertSame(x, v1);
2951 <                threadAssertNull(t);
2952 <                a.getAndIncrement();
2953 <                throw ex;
2954 <            });
2955 <        if (createIncomplete) f.complete(v1);
3769 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3770 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3771 >        long startTime = System.nanoTime();
3772 >        f.complete(v1);
3773 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3774 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3775 >        g.complete(v1);
3776          checkCompletedNormally(f, v1);
3777 <        checkCompletedWithWrappedException(g, ex);
3778 <        assertEquals(1, a.get());
3777 >        checkCompletedNormally(g, v1);
3778 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3779      }}
3780  
3781      /**
3782 <     * If a whenComplete action throws an exception when triggered by
2963 <     * a source completion that also throws an exception, the source
2964 <     * exception takes precedence.
3782 >     * delayedExecutor returns an executor that delays submission
3783       */
3784 <    public void testWhenComplete_actionFailedSourceFailed() {
3785 <        for (boolean createIncomplete : new boolean[] { true, false })
3784 >    public void testDelayedExecutor() {
3785 >        testInParallel(() -> testDelayedExecutor(null, null),
3786 >                       () -> testDelayedExecutor(null, 1),
3787 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3788 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3789 >    }
3790 >
3791 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3792 >        long timeoutMillis = timeoutMillis();
3793 >        // Use an "unreasonably long" long timeout to catch lingering threads
3794 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3795 >        final Executor delayer, longDelayer;
3796 >        if (executor == null) {
3797 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3798 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3799 >        } else {
3800 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3801 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3802 >        }
3803 >        long startTime = System.nanoTime();
3804 >        CompletableFuture<Integer> f =
3805 >            CompletableFuture.supplyAsync(() -> v, delayer);
3806 >        CompletableFuture<Integer> g =
3807 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3808 >
3809 >        assertNull(g.getNow(null));
3810 >
3811 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3812 >        long millisElapsed = millisElapsedSince(startTime);
3813 >        assertTrue(millisElapsed >= timeoutMillis);
3814 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3815 >
3816 >        checkCompletedNormally(f, v);
3817 >
3818 >        checkIncomplete(g);
3819 >        assertTrue(g.cancel(true));
3820 >    }
3821 >
3822 >    //--- tests of implementation details; not part of official tck ---
3823 >
3824 >    Object resultOf(CompletableFuture<?> f) {
3825 >        SecurityManager sm = System.getSecurityManager();
3826 >        if (sm != null) {
3827 >            try {
3828 >                System.setSecurityManager(null);
3829 >            } catch (SecurityException giveUp) {
3830 >                return "Reflection not available";
3831 >            }
3832 >        }
3833 >
3834 >        try {
3835 >            java.lang.reflect.Field resultField
3836 >                = CompletableFuture.class.getDeclaredField("result");
3837 >            resultField.setAccessible(true);
3838 >            return resultField.get(f);
3839 >        } catch (Throwable t) {
3840 >            throw new AssertionError(t);
3841 >        } finally {
3842 >            if (sm != null) System.setSecurityManager(sm);
3843 >        }
3844 >    }
3845 >
3846 >    public void testExceptionPropagationReusesResultObject() {
3847 >        if (!testImplementationDetails) return;
3848          for (ExecutionMode m : ExecutionMode.values())
2969        for (Integer v1 : new Integer[] { 1, null })
3849      {
3850 <        final AtomicInteger a = new AtomicInteger(0);
3851 <        final CFException ex1 = new CFException();
3852 <        final CFException ex2 = new CFException();
2974 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3850 >        final CFException ex = new CFException();
3851 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3852 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3853  
3854 <        if (!createIncomplete) f.completeExceptionally(ex1);
3855 <        final CompletableFuture<Integer> g = m.whenComplete
3856 <            (f,
3857 <             (Integer x, Throwable t) -> {
3858 <                m.checkExecutionMode();
3859 <                threadAssertSame(t, ex1);
3860 <                threadAssertNull(x);
3861 <                a.getAndIncrement();
3862 <                throw ex2;
3863 <            });
3864 <        if (createIncomplete) f.completeExceptionally(ex1);
3854 >        final Runnable noopRunnable = new Noop(m);
3855 >        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
3856 >        final Function<Integer, Integer> incFunction = new IncFunction(m);
3857 >
3858 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3859 >            = new ArrayList<>();
3860 >
3861 >        funs.add((y) -> m.thenRun(y, noopRunnable));
3862 >        funs.add((y) -> m.thenAccept(y, noopConsumer));
3863 >        funs.add((y) -> m.thenApply(y, incFunction));
3864 >
3865 >        funs.add((y) -> m.runAfterEither(y, incomplete, noopRunnable));
3866 >        funs.add((y) -> m.acceptEither(y, incomplete, noopConsumer));
3867 >        funs.add((y) -> m.applyToEither(y, incomplete, incFunction));
3868 >
3869 >        funs.add((y) -> m.runAfterBoth(y, v42, noopRunnable));
3870 >        funs.add((y) -> m.runAfterBoth(v42, y, noopRunnable));
3871 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3872 >        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3873 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3874 >        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3875 >
3876 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3877 >
3878 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3879 >
3880 >        funs.add((y) -> CompletableFuture.allOf(y));
3881 >        funs.add((y) -> CompletableFuture.allOf(y, v42));
3882 >        funs.add((y) -> CompletableFuture.allOf(v42, y));
3883 >        funs.add((y) -> CompletableFuture.anyOf(y));
3884 >        funs.add((y) -> CompletableFuture.anyOf(y, incomplete));
3885 >        funs.add((y) -> CompletableFuture.anyOf(incomplete, y));
3886  
3887 <        checkCompletedExceptionally(f, ex1);
3888 <        checkCompletedWithWrappedException(g, ex1);
3889 <        assertEquals(1, a.get());
3887 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3888 >                 fun : funs) {
3889 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3890 >            f.completeExceptionally(ex);
3891 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3892 >            checkCompletedWithWrappedException(src, ex);
3893 >            CompletableFuture<?> dep = fun.apply(src);
3894 >            checkCompletedWithWrappedException(dep, ex);
3895 >            assertSame(resultOf(src), resultOf(dep));
3896 >        }
3897 >
3898 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3899 >                 fun : funs) {
3900 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3901 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3902 >            CompletableFuture<?> dep = fun.apply(src);
3903 >            f.completeExceptionally(ex);
3904 >            checkCompletedWithWrappedException(src, ex);
3905 >            checkCompletedWithWrappedException(dep, ex);
3906 >            assertSame(resultOf(src), resultOf(dep));
3907 >        }
3908 >
3909 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3910 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3911 >                 fun : funs) {
3912 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3913 >            f.cancel(mayInterruptIfRunning);
3914 >            checkCancelled(f);
3915 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3916 >            checkCompletedWithWrappedCancellationException(src);
3917 >            CompletableFuture<?> dep = fun.apply(src);
3918 >            checkCompletedWithWrappedCancellationException(dep);
3919 >            assertSame(resultOf(src), resultOf(dep));
3920 >        }
3921 >
3922 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3923 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3924 >                 fun : funs) {
3925 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3926 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3927 >            CompletableFuture<?> dep = fun.apply(src);
3928 >            f.cancel(mayInterruptIfRunning);
3929 >            checkCancelled(f);
3930 >            checkCompletedWithWrappedCancellationException(src);
3931 >            checkCompletedWithWrappedCancellationException(dep);
3932 >            assertSame(resultOf(src), resultOf(dep));
3933 >        }
3934      }}
3935  
3936 +    /**
3937 +     * Minimal completion stages throw UOE for most non-CompletionStage methods
3938 +     */
3939 +    public void testMinimalCompletionStage_minimality() {
3940 +        if (!testImplementationDetails) return;
3941 +        Function<Method, String> toSignature =
3942 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3943 +        Predicate<Method> isNotStatic =
3944 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3945 +        List<Method> minimalMethods =
3946 +            Stream.of(Object.class, CompletionStage.class)
3947 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3948 +            .filter(isNotStatic)
3949 +            .collect(Collectors.toList());
3950 +        // Methods from CompletableFuture permitted NOT to throw UOE
3951 +        String[] signatureWhitelist = {
3952 +            "newIncompleteFuture[]",
3953 +            "defaultExecutor[]",
3954 +            "minimalCompletionStage[]",
3955 +            "copy[]",
3956 +        };
3957 +        Set<String> permittedMethodSignatures =
3958 +            Stream.concat(minimalMethods.stream().map(toSignature),
3959 +                          Stream.of(signatureWhitelist))
3960 +            .collect(Collectors.toSet());
3961 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3962 +            .filter(isNotStatic)
3963 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3964 +            .collect(Collectors.toList());
3965 +
3966 +        List<CompletionStage<Integer>> stages = new ArrayList<>();
3967 +        stages.add(new CompletableFuture<Integer>().minimalCompletionStage());
3968 +        stages.add(CompletableFuture.completedStage(1));
3969 +        stages.add(CompletableFuture.failedStage(new CFException()));
3970 +
3971 +        List<Method> bugs = new ArrayList<>();
3972 +        for (Method method : allMethods) {
3973 +            Class<?>[] parameterTypes = method.getParameterTypes();
3974 +            Object[] args = new Object[parameterTypes.length];
3975 +            // Manufacture boxed primitives for primitive params
3976 +            for (int i = 0; i < args.length; i++) {
3977 +                Class<?> type = parameterTypes[i];
3978 +                if (parameterTypes[i] == boolean.class)
3979 +                    args[i] = false;
3980 +                else if (parameterTypes[i] == int.class)
3981 +                    args[i] = 0;
3982 +                else if (parameterTypes[i] == long.class)
3983 +                    args[i] = 0L;
3984 +            }
3985 +            for (CompletionStage<Integer> stage : stages) {
3986 +                try {
3987 +                    method.invoke(stage, args);
3988 +                    bugs.add(method);
3989 +                }
3990 +                catch (java.lang.reflect.InvocationTargetException expected) {
3991 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3992 +                        bugs.add(method);
3993 +                        // expected.getCause().printStackTrace();
3994 +                    }
3995 +                }
3996 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
3997 +            }
3998 +        }
3999 +        if (!bugs.isEmpty())
4000 +            throw new Error("Methods did not throw UOE: " + bugs);
4001 +    }
4002 +
4003 +    static class Monad {
4004 +        static class ZeroException extends RuntimeException {
4005 +            public ZeroException() { super("monadic zero"); }
4006 +        }
4007 +        // "return", "unit"
4008 +        static <T> CompletableFuture<T> unit(T value) {
4009 +            return completedFuture(value);
4010 +        }
4011 +        // monadic zero ?
4012 +        static <T> CompletableFuture<T> zero() {
4013 +            return failedFuture(new ZeroException());
4014 +        }
4015 +        // >=>
4016 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4017 +            (Function<T, CompletableFuture<U>> f,
4018 +             Function<U, CompletableFuture<V>> g) {
4019 +            return (x) -> f.apply(x).thenCompose(g);
4020 +        }
4021 +
4022 +        static void assertZero(CompletableFuture<?> f) {
4023 +            try {
4024 +                f.getNow(null);
4025 +                throw new AssertionFailedError("should throw");
4026 +            } catch (CompletionException success) {
4027 +                assertTrue(success.getCause() instanceof ZeroException);
4028 +            }
4029 +        }
4030 +
4031 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4032 +                                           CompletableFuture<T> g) {
4033 +            T fval = null, gval = null;
4034 +            Throwable fex = null, gex = null;
4035 +
4036 +            try { fval = f.get(); }
4037 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4038 +            catch (Throwable ex) { fex = ex; }
4039 +
4040 +            try { gval = g.get(); }
4041 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4042 +            catch (Throwable ex) { gex = ex; }
4043 +
4044 +            if (fex != null || gex != null)
4045 +                assertSame(fex.getClass(), gex.getClass());
4046 +            else
4047 +                assertEquals(fval, gval);
4048 +        }
4049 +
4050 +        static class PlusFuture<T> extends CompletableFuture<T> {
4051 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4052 +        }
4053 +
4054 +        /** Implements "monadic plus". */
4055 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4056 +                                             CompletableFuture<? extends T> g) {
4057 +            PlusFuture<T> plus = new PlusFuture<T>();
4058 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4059 +                try {
4060 +                    if (ex == null) {
4061 +                        if (plus.complete(result))
4062 +                            if (plus.firstFailure.get() != null)
4063 +                                plus.firstFailure.set(null);
4064 +                    }
4065 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4066 +                        if (plus.isDone())
4067 +                            plus.firstFailure.set(null);
4068 +                    }
4069 +                    else {
4070 +                        // first failure has precedence
4071 +                        Throwable first = plus.firstFailure.getAndSet(null);
4072 +
4073 +                        // may fail with "Self-suppression not permitted"
4074 +                        try { first.addSuppressed(ex); }
4075 +                        catch (Exception ignored) {}
4076 +
4077 +                        plus.completeExceptionally(first);
4078 +                    }
4079 +                } catch (Throwable unexpected) {
4080 +                    plus.completeExceptionally(unexpected);
4081 +                }
4082 +            };
4083 +            f.whenComplete(action);
4084 +            g.whenComplete(action);
4085 +            return plus;
4086 +        }
4087 +    }
4088 +
4089 +    /**
4090 +     * CompletableFuture is an additive monad - sort of.
4091 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4092 +     */
4093 +    public void testAdditiveMonad() throws Throwable {
4094 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4095 +        CompletableFuture<Long> zero = Monad.zero();
4096 +
4097 +        // Some mutually non-commutative functions
4098 +        Function<Long, CompletableFuture<Long>> triple
4099 +            = (x) -> Monad.unit(3 * x);
4100 +        Function<Long, CompletableFuture<Long>> inc
4101 +            = (x) -> Monad.unit(x + 1);
4102 +
4103 +        // unit is a right identity: m >>= unit === m
4104 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4105 +                                 inc.apply(5L));
4106 +        // unit is a left identity: (unit x) >>= f === f x
4107 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4108 +                                 inc.apply(5L));
4109 +
4110 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4111 +        Monad.assertFutureEquals(
4112 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4113 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4114 +
4115 +        // The case for CompletableFuture as an additive monad is weaker...
4116 +
4117 +        // zero is a monadic zero
4118 +        Monad.assertZero(zero);
4119 +
4120 +        // left zero: zero >>= f === zero
4121 +        Monad.assertZero(zero.thenCompose(inc));
4122 +        // right zero: f >>= (\x -> zero) === zero
4123 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4124 +
4125 +        // f plus zero === f
4126 +        Monad.assertFutureEquals(Monad.unit(5L),
4127 +                                 Monad.plus(Monad.unit(5L), zero));
4128 +        // zero plus f === f
4129 +        Monad.assertFutureEquals(Monad.unit(5L),
4130 +                                 Monad.plus(zero, Monad.unit(5L)));
4131 +        // zero plus zero === zero
4132 +        Monad.assertZero(Monad.plus(zero, zero));
4133 +        {
4134 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4135 +                                                   Monad.unit(8L));
4136 +            // non-determinism
4137 +            assertTrue(f.get() == 5L || f.get() == 8L);
4138 +        }
4139 +
4140 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4141 +        // f plus godot === f (doesn't wait for godot)
4142 +        Monad.assertFutureEquals(Monad.unit(5L),
4143 +                                 Monad.plus(Monad.unit(5L), godot));
4144 +        // godot plus f === f (doesn't wait for godot)
4145 +        Monad.assertFutureEquals(Monad.unit(5L),
4146 +                                 Monad.plus(godot, Monad.unit(5L)));
4147 +    }
4148 +
4149 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4150 +    public void testRecursiveChains() throws Throwable {
4151 +        for (ExecutionMode m : ExecutionMode.values())
4152 +        for (boolean addDeadEnds : new boolean[] { true, false })
4153 +    {
4154 +        final int val = 42;
4155 +        final int n = expensiveTests ? 1_000 : 2;
4156 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4157 +        CompletableFuture<Integer> tail = head;
4158 +        for (int i = 0; i < n; i++) {
4159 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4160 +            tail = m.thenApply(tail, v -> v + 1);
4161 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4162 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4163 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4164 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4165 +        }
4166 +        head.complete(val);
4167 +        assertEquals(val + 3 * n, (int) tail.join());
4168 +    }}
4169 +
4170 +    /**
4171 +     * A single CompletableFuture with many dependents.
4172 +     * A demo of scalability - runtime is O(n).
4173 +     */
4174 +    public void testManyDependents() throws Throwable {
4175 +        final int n = expensiveTests ? 1_000_000 : 10;
4176 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4177 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4178 +        final AtomicInteger count = new AtomicInteger(0);
4179 +        for (int i = 0; i < n; i++) {
4180 +            head.thenRun(() -> count.getAndIncrement());
4181 +            head.thenAccept((x) -> count.getAndIncrement());
4182 +            head.thenApply((x) -> count.getAndIncrement());
4183 +
4184 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4185 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4186 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4187 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4188 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4189 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4190 +
4191 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4192 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4193 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4194 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4195 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4196 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4197 +        }
4198 +        head.complete(null);
4199 +        assertEquals(5 * 3 * n, count.get());
4200 +    }
4201 +
4202 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4203 +    public void testCoCompletionGarbageRetention() throws Throwable {
4204 +        final int n = expensiveTests ? 1_000_000 : 10;
4205 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4206 +        CompletableFuture<Integer> f;
4207 +        for (int i = 0; i < n; i++) {
4208 +            f = new CompletableFuture<>();
4209 +            f.runAfterEither(incomplete, () -> {});
4210 +            f.complete(null);
4211 +
4212 +            f = new CompletableFuture<>();
4213 +            f.acceptEither(incomplete, (x) -> {});
4214 +            f.complete(null);
4215 +
4216 +            f = new CompletableFuture<>();
4217 +            f.applyToEither(incomplete, (x) -> x);
4218 +            f.complete(null);
4219 +
4220 +            f = new CompletableFuture<>();
4221 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4222 +            f.complete(null);
4223 +        }
4224 +
4225 +        for (int i = 0; i < n; i++) {
4226 +            f = new CompletableFuture<>();
4227 +            incomplete.runAfterEither(f, () -> {});
4228 +            f.complete(null);
4229 +
4230 +            f = new CompletableFuture<>();
4231 +            incomplete.acceptEither(f, (x) -> {});
4232 +            f.complete(null);
4233 +
4234 +            f = new CompletableFuture<>();
4235 +            incomplete.applyToEither(f, (x) -> x);
4236 +            f.complete(null);
4237 +
4238 +            f = new CompletableFuture<>();
4239 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4240 +            f.complete(null);
4241 +        }
4242 +    }
4243 +
4244 +    /**
4245 +     * Reproduction recipe for:
4246 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4247 +     * 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
4248 +     */
4249 +    public void testAnyOfGarbageRetention() throws Throwable {
4250 +        for (Integer v : new Integer[] { 1, null })
4251 +    {
4252 +        final int n = expensiveTests ? 100_000 : 10;
4253 +        CompletableFuture<Integer>[] fs
4254 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4255 +        for (int i = 0; i < fs.length; i++)
4256 +            fs[i] = new CompletableFuture<>();
4257 +        fs[fs.length - 1].complete(v);
4258 +        for (int i = 0; i < n; i++)
4259 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4260 +    }}
4261 +
4262 +    /**
4263 +     * Checks for garbage retention with allOf.
4264 +     *
4265 +     * As of 2016-07, fails with OOME:
4266 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4267 +     */
4268 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4269 +        final int n = expensiveTests ? 100_000 : 10;
4270 +        CompletableFuture<Integer>[] fs
4271 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4272 +        for (int i = 0; i < fs.length; i++)
4273 +            fs[i] = new CompletableFuture<>();
4274 +        for (int i = 0; i < n; i++)
4275 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4276 +    }
4277 +
4278 +    /**
4279 +     * Checks for garbage retention when a dependent future is
4280 +     * cancelled and garbage-collected.
4281 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4282 +     *
4283 +     * As of 2016-07, fails with OOME:
4284 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4285 +     */
4286 +    public void testCancelledGarbageRetention() throws Throwable {
4287 +        final int n = expensiveTests ? 100_000 : 10;
4288 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4289 +        for (int i = 0; i < n; i++)
4290 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4291 +    }
4292 +
4293 + //     static <U> U join(CompletionStage<U> stage) {
4294 + //         CompletableFuture<U> f = new CompletableFuture<>();
4295 + //         stage.whenComplete((v, ex) -> {
4296 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4297 + //         });
4298 + //         return f.join();
4299 + //     }
4300 +
4301 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4302 + //         CompletableFuture<U> f = new CompletableFuture<>();
4303 + //         stage.whenComplete((v, ex) -> {
4304 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4305 + //         });
4306 + //         return f.isDone();
4307 + //     }
4308 +
4309 + //     static <U> U join2(CompletionStage<U> stage) {
4310 + //         return stage.toCompletableFuture().copy().join();
4311 + //     }
4312 +
4313 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4314 + //         return stage.toCompletableFuture().copy().isDone();
4315 + //     }
4316 +
4317   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines