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.80 by jsr166, Mon Jun 16 17:29:03 2014 UTC vs.
Revision 1.157 by jsr166, Mon Jun 27 02:47:42 2016 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 > import static java.util.concurrent.CompletableFuture.completedFuture;
11 > import static java.util.concurrent.CompletableFuture.failedFuture;
12 >
13 > import java.lang.reflect.Method;
14 > import java.lang.reflect.Modifier;
15 >
16 > import java.util.stream.Collectors;
17 > import java.util.stream.Stream;
18 >
19 > import java.util.ArrayList;
20 > import java.util.Arrays;
21 > import java.util.List;
22 > import java.util.Objects;
23 > import java.util.Set;
24   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
25   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
26   import java.util.concurrent.CompletableFuture;
27   import java.util.concurrent.CompletionException;
28   import java.util.concurrent.CompletionStage;
29 + import java.util.concurrent.ExecutionException;
30 + import java.util.concurrent.Executor;
31   import java.util.concurrent.ForkJoinPool;
32   import java.util.concurrent.ForkJoinTask;
33 + import java.util.concurrent.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
35 + import java.util.concurrent.TimeUnit;
36   import java.util.concurrent.atomic.AtomicInteger;
37 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 < import static java.util.concurrent.TimeUnit.SECONDS;
26 < import java.util.*;
27 < import java.util.function.Supplier;
28 < import java.util.function.Consumer;
37 > import java.util.concurrent.atomic.AtomicReference;
38   import java.util.function.BiConsumer;
30 import java.util.function.Function;
39   import java.util.function.BiFunction;
40 + import java.util.function.Consumer;
41 + import java.util.function.Function;
42 + import java.util.function.Predicate;
43 + import java.util.function.Supplier;
44 +
45 + import junit.framework.AssertionFailedError;
46 + import junit.framework.Test;
47 + import junit.framework.TestSuite;
48  
49   public class CompletableFutureTest extends JSR166TestCase {
50  
51      public static void main(String[] args) {
52 <        junit.textui.TestRunner.run(suite());
52 >        main(suite(), args);
53      }
54      public static Test suite() {
55          return new TestSuite(CompletableFutureTest.class);
# Line 44 | Line 60 | public class CompletableFutureTest exten
60      void checkIncomplete(CompletableFuture<?> f) {
61          assertFalse(f.isDone());
62          assertFalse(f.isCancelled());
63 <        assertTrue(f.toString().contains("[Not completed]"));
63 >        assertTrue(f.toString().contains("Not completed"));
64          try {
65              assertNull(f.getNow(null));
66          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 57 | Line 73 | public class CompletableFutureTest exten
73      }
74  
75      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
76 <        try {
77 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
76 >        checkTimedGet(f, value);
77 >
78          try {
79              assertEquals(value, f.join());
80          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 75 | Line 90 | public class CompletableFutureTest exten
90          assertTrue(f.toString().contains("[Completed normally]"));
91      }
92  
93 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
94 <        try {
95 <            f.get(LONG_DELAY_MS, MILLISECONDS);
96 <            shouldThrow();
97 <        } catch (ExecutionException success) {
98 <            assertTrue(success.getCause() instanceof CFException);
99 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
100 <        try {
101 <            f.join();
102 <            shouldThrow();
103 <        } catch (CompletionException success) {
104 <            assertTrue(success.getCause() instanceof CFException);
105 <        }
106 <        try {
107 <            f.getNow(null);
108 <            shouldThrow();
109 <        } catch (CompletionException success) {
95 <            assertTrue(success.getCause() instanceof CFException);
93 >    /**
94 >     * Returns the "raw" internal exceptional completion of f,
95 >     * without any additional wrapping with CompletionException.
96 >     */
97 >    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
98 >        // handle (and whenComplete) can distinguish between "direct"
99 >        // and "wrapped" exceptional completion
100 >        return f.handle((U u, Throwable t) -> t).join();
101 >    }
102 >
103 >    void checkCompletedExceptionally(CompletableFuture<?> f,
104 >                                     boolean wrapped,
105 >                                     Consumer<Throwable> checker) {
106 >        Throwable cause = exceptionalCompletion(f);
107 >        if (wrapped) {
108 >            assertTrue(cause instanceof CompletionException);
109 >            cause = cause.getCause();
110          }
111 <        try {
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 <    }
111 >        checker.accept(cause);
112  
113 <    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 <                                                      Throwable ex) {
113 >        long startTime = System.nanoTime();
114          try {
115              f.get(LONG_DELAY_MS, MILLISECONDS);
116              shouldThrow();
117          } catch (ExecutionException success) {
118 <            assertSame(ex, success.getCause());
118 >            assertSame(cause, success.getCause());
119          } catch (Throwable fail) { threadUnexpectedException(fail); }
120 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
121 +
122          try {
123              f.join();
124              shouldThrow();
125          } catch (CompletionException success) {
126 <            assertSame(ex, success.getCause());
127 <        }
126 >            assertSame(cause, success.getCause());
127 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
128 >
129          try {
130              f.getNow(null);
131              shouldThrow();
132          } catch (CompletionException success) {
133 <            assertSame(ex, success.getCause());
134 <        }
133 >            assertSame(cause, success.getCause());
134 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
135 >
136          try {
137              f.get();
138              shouldThrow();
139          } catch (ExecutionException success) {
140 <            assertSame(ex, success.getCause());
140 >            assertSame(cause, success.getCause());
141          } catch (Throwable fail) { threadUnexpectedException(fail); }
142  
135        assertTrue(f.isDone());
143          assertFalse(f.isCancelled());
144 +        assertTrue(f.isDone());
145 +        assertTrue(f.isCompletedExceptionally());
146          assertTrue(f.toString().contains("[Completed exceptionally]"));
147      }
148  
149 <    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
150 <                                                Throwable ex) {
151 <        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); }
149 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
150 >        checkCompletedExceptionally(f, true,
151 >            (t) -> assertTrue(t instanceof CFException));
152      }
153  
154 <    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
155 <        checkCompletedExceptionallyWithRootCause(f, ex);
156 <        try {
157 <            CompletableFuture<Throwable> spy = f.handle
158 <                ((U u, Throwable t) -> t);
159 <            assertSame(ex, spy.join());
160 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
154 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
155 >        checkCompletedExceptionally(f, true,
156 >            (t) -> assertTrue(t instanceof CancellationException));
157 >    }
158 >
159 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
160 >        checkCompletedExceptionally(f, false,
161 >            (t) -> assertTrue(t instanceof TimeoutException));
162 >    }
163 >
164 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
165 >                                            Throwable ex) {
166 >        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
167 >    }
168 >
169 >    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
170 >        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
171      }
172  
173      void checkCancelled(CompletableFuture<?> f) {
174 +        long startTime = System.nanoTime();
175          try {
176              f.get(LONG_DELAY_MS, MILLISECONDS);
177              shouldThrow();
178          } catch (CancellationException success) {
179          } catch (Throwable fail) { threadUnexpectedException(fail); }
180 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
181 +
182          try {
183              f.join();
184              shouldThrow();
# Line 176 | Line 192 | public class CompletableFutureTest exten
192              shouldThrow();
193          } catch (CancellationException success) {
194          } 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    }
195  
196 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
197 <        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); }
196 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
197 >
198          assertTrue(f.isDone());
211        assertFalse(f.isCancelled());
199          assertTrue(f.isCompletedExceptionally());
200 +        assertTrue(f.isCancelled());
201          assertTrue(f.toString().contains("[Completed exceptionally]"));
202      }
203  
# Line 257 | Line 245 | public class CompletableFutureTest exten
245      {
246          CompletableFuture<Integer> f = new CompletableFuture<>();
247          checkIncomplete(f);
248 <        assertTrue(f.cancel(true));
249 <        assertTrue(f.cancel(true));
248 >        assertTrue(f.cancel(mayInterruptIfRunning));
249 >        assertTrue(f.cancel(mayInterruptIfRunning));
250 >        assertTrue(f.cancel(!mayInterruptIfRunning));
251          checkCancelled(f);
252      }}
253  
# Line 471 | Line 460 | public class CompletableFutureTest exten
460      class FailingSupplier extends CheckedAction
461          implements Supplier<Integer>
462      {
463 <        FailingSupplier(ExecutionMode m) { super(m); }
463 >        final CFException ex;
464 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
465          public Integer get() {
466              invoked();
467 <            throw new CFException();
467 >            throw ex;
468          }
469      }
470  
471      class FailingConsumer extends CheckedIntegerAction
472          implements Consumer<Integer>
473      {
474 <        FailingConsumer(ExecutionMode m) { super(m); }
474 >        final CFException ex;
475 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
476          public void accept(Integer x) {
477              invoked();
478              value = x;
479 <            throw new CFException();
479 >            throw ex;
480          }
481      }
482  
483      class FailingBiConsumer extends CheckedIntegerAction
484          implements BiConsumer<Integer, Integer>
485      {
486 <        FailingBiConsumer(ExecutionMode m) { super(m); }
486 >        final CFException ex;
487 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
488          public void accept(Integer x, Integer y) {
489              invoked();
490              value = subtract(x, y);
491 <            throw new CFException();
491 >            throw ex;
492          }
493      }
494  
495      class FailingFunction extends CheckedIntegerAction
496          implements Function<Integer, Integer>
497      {
498 <        FailingFunction(ExecutionMode m) { super(m); }
498 >        final CFException ex;
499 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
500          public Integer apply(Integer x) {
501              invoked();
502              value = x;
503 <            throw new CFException();
503 >            throw ex;
504          }
505      }
506  
507      class FailingBiFunction extends CheckedIntegerAction
508          implements BiFunction<Integer, Integer, Integer>
509      {
510 <        FailingBiFunction(ExecutionMode m) { super(m); }
510 >        final CFException ex;
511 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
512          public Integer apply(Integer x, Integer y) {
513              invoked();
514              value = subtract(x, y);
515 <            throw new CFException();
515 >            throw ex;
516          }
517      }
518  
519      class FailingRunnable extends CheckedAction implements Runnable {
520 <        FailingRunnable(ExecutionMode m) { super(m); }
520 >        final CFException ex;
521 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
522          public void run() {
523              invoked();
524 <            throw new CFException();
524 >            throw ex;
525          }
526      }
527  
533
528      class CompletableFutureInc extends CheckedIntegerAction
529          implements Function<Integer, CompletableFuture<Integer>>
530      {
# Line 547 | Line 541 | public class CompletableFutureTest exten
541      class FailingCompletableFutureFunction extends CheckedIntegerAction
542          implements Function<Integer, CompletableFuture<Integer>>
543      {
544 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
544 >        final CFException ex;
545 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
546          public CompletableFuture<Integer> apply(Integer x) {
547              invoked();
548              value = x;
549 <            throw new CFException();
549 >            throw ex;
550 >        }
551 >    }
552 >
553 >    static class CountingRejectingExecutor implements Executor {
554 >        final RejectedExecutionException ex = new RejectedExecutionException();
555 >        final AtomicInteger count = new AtomicInteger(0);
556 >        public void execute(Runnable r) {
557 >            count.getAndIncrement();
558 >            throw ex;
559          }
560      }
561  
# Line 569 | Line 573 | public class CompletableFutureTest exten
573          }
574      }
575  
576 +    static final boolean defaultExecutorIsCommonPool
577 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
578 +
579      /**
580       * Permits the testing of parallel code for the 3 different
581       * execution modes without copy/pasting all the test methods.
582       */
583      enum ExecutionMode {
584 <        DEFAULT {
584 >        SYNC {
585              public void checkExecutionMode() {
586                  assertFalse(ThreadExecutor.startedCurrentThread());
587                  assertNull(ForkJoinTask.getPool());
# Line 650 | Line 657 | public class CompletableFutureTest exten
657  
658          ASYNC {
659              public void checkExecutionMode() {
660 <                assertSame(ForkJoinPool.commonPool(),
661 <                           ForkJoinTask.getPool());
660 >                assertEquals(defaultExecutorIsCommonPool,
661 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
662              }
663              public CompletableFuture<Void> runAsync(Runnable a) {
664                  return CompletableFuture.runAsync(a);
# Line 850 | Line 857 | public class CompletableFutureTest exten
857          if (!createIncomplete) assertTrue(f.complete(v1));
858          final CompletableFuture<Integer> g = f.exceptionally
859              ((Throwable t) -> {
853                // Should not be called
860                  a.getAndIncrement();
861 <                throw new AssertionError();
861 >                threadFail("should not be called");
862 >                return null;            // unreached
863              });
864          if (createIncomplete) assertTrue(f.complete(v1));
865  
# Line 875 | Line 882 | public class CompletableFutureTest exten
882          if (!createIncomplete) f.completeExceptionally(ex);
883          final CompletableFuture<Integer> g = f.exceptionally
884              ((Throwable t) -> {
885 <                ExecutionMode.DEFAULT.checkExecutionMode();
885 >                ExecutionMode.SYNC.checkExecutionMode();
886                  threadAssertSame(t, ex);
887                  a.getAndIncrement();
888                  return v1;
# Line 886 | Line 893 | public class CompletableFutureTest exten
893          assertEquals(1, a.get());
894      }}
895  
896 +    /**
897 +     * If an "exceptionally action" throws an exception, it completes
898 +     * exceptionally with that exception
899 +     */
900      public void testExceptionally_exceptionalCompletionActionFailed() {
901          for (boolean createIncomplete : new boolean[] { true, false })
891        for (Integer v1 : new Integer[] { 1, null })
902      {
903          final AtomicInteger a = new AtomicInteger(0);
904          final CFException ex1 = new CFException();
# Line 897 | Line 907 | public class CompletableFutureTest exten
907          if (!createIncomplete) f.completeExceptionally(ex1);
908          final CompletableFuture<Integer> g = f.exceptionally
909              ((Throwable t) -> {
910 <                ExecutionMode.DEFAULT.checkExecutionMode();
910 >                ExecutionMode.SYNC.checkExecutionMode();
911                  threadAssertSame(t, ex1);
912                  a.getAndIncrement();
913                  throw ex2;
# Line 905 | Line 915 | public class CompletableFutureTest exten
915          if (createIncomplete) f.completeExceptionally(ex1);
916  
917          checkCompletedWithWrappedException(g, ex2);
918 +        checkCompletedExceptionally(f, ex1);
919          assertEquals(1, a.get());
920      }}
921  
# Line 912 | Line 923 | public class CompletableFutureTest exten
923       * whenComplete action executes on normal completion, propagating
924       * source result.
925       */
926 <    public void testWhenComplete_normalCompletion1() {
926 >    public void testWhenComplete_normalCompletion() {
927          for (ExecutionMode m : ExecutionMode.values())
928          for (boolean createIncomplete : new boolean[] { true, false })
929          for (Integer v1 : new Integer[] { 1, null })
# Line 922 | Line 933 | public class CompletableFutureTest exten
933          if (!createIncomplete) assertTrue(f.complete(v1));
934          final CompletableFuture<Integer> g = m.whenComplete
935              (f,
936 <             (Integer x, Throwable t) -> {
936 >             (Integer result, Throwable t) -> {
937                  m.checkExecutionMode();
938 <                threadAssertSame(x, v1);
938 >                threadAssertSame(result, v1);
939                  threadAssertNull(t);
940                  a.getAndIncrement();
941              });
# Line 942 | Line 953 | public class CompletableFutureTest exten
953      public void testWhenComplete_exceptionalCompletion() {
954          for (ExecutionMode m : ExecutionMode.values())
955          for (boolean createIncomplete : new boolean[] { true, false })
945        for (Integer v1 : new Integer[] { 1, null })
956      {
957          final AtomicInteger a = new AtomicInteger(0);
958          final CFException ex = new CFException();
# Line 950 | Line 960 | public class CompletableFutureTest exten
960          if (!createIncomplete) f.completeExceptionally(ex);
961          final CompletableFuture<Integer> g = m.whenComplete
962              (f,
963 <             (Integer x, Throwable t) -> {
963 >             (Integer result, Throwable t) -> {
964                  m.checkExecutionMode();
965 <                threadAssertNull(x);
965 >                threadAssertNull(result);
966                  threadAssertSame(t, ex);
967                  a.getAndIncrement();
968              });
# Line 977 | Line 987 | public class CompletableFutureTest exten
987          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
988          final CompletableFuture<Integer> g = m.whenComplete
989              (f,
990 <             (Integer x, Throwable t) -> {
990 >             (Integer result, Throwable t) -> {
991                  m.checkExecutionMode();
992 <                threadAssertNull(x);
992 >                threadAssertNull(result);
993                  threadAssertTrue(t instanceof CancellationException);
994                  a.getAndIncrement();
995              });
# Line 994 | Line 1004 | public class CompletableFutureTest exten
1004       * If a whenComplete action throws an exception when triggered by
1005       * a normal completion, it completes exceptionally
1006       */
1007 <    public void testWhenComplete_actionFailed() {
1007 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1008          for (boolean createIncomplete : new boolean[] { true, false })
1009          for (ExecutionMode m : ExecutionMode.values())
1010          for (Integer v1 : new Integer[] { 1, null })
# Line 1005 | Line 1015 | public class CompletableFutureTest exten
1015          if (!createIncomplete) assertTrue(f.complete(v1));
1016          final CompletableFuture<Integer> g = m.whenComplete
1017              (f,
1018 <             (Integer x, Throwable t) -> {
1018 >             (Integer result, Throwable t) -> {
1019                  m.checkExecutionMode();
1020 <                threadAssertSame(x, v1);
1020 >                threadAssertSame(result, v1);
1021                  threadAssertNull(t);
1022                  a.getAndIncrement();
1023                  throw ex;
# Line 1022 | Line 1032 | public class CompletableFutureTest exten
1032      /**
1033       * If a whenComplete action throws an exception when triggered by
1034       * a source completion that also throws an exception, the source
1035 <     * exception takes precedence.
1035 >     * exception takes precedence (unlike handle)
1036       */
1037 <    public void testWhenComplete_actionFailedSourceFailed() {
1037 >    public void testWhenComplete_sourceFailedActionFailed() {
1038          for (boolean createIncomplete : new boolean[] { true, false })
1039          for (ExecutionMode m : ExecutionMode.values())
1030        for (Integer v1 : new Integer[] { 1, null })
1040      {
1041          final AtomicInteger a = new AtomicInteger(0);
1042          final CFException ex1 = new CFException();
# Line 1037 | Line 1046 | public class CompletableFutureTest exten
1046          if (!createIncomplete) f.completeExceptionally(ex1);
1047          final CompletableFuture<Integer> g = m.whenComplete
1048              (f,
1049 <             (Integer x, Throwable t) -> {
1049 >             (Integer result, Throwable t) -> {
1050                  m.checkExecutionMode();
1051                  threadAssertSame(t, ex1);
1052 <                threadAssertNull(x);
1052 >                threadAssertNull(result);
1053                  a.getAndIncrement();
1054                  throw ex2;
1055              });
# Line 1048 | Line 1057 | public class CompletableFutureTest exten
1057  
1058          checkCompletedWithWrappedException(g, ex1);
1059          checkCompletedExceptionally(f, ex1);
1060 +        if (testImplementationDetails) {
1061 +            assertEquals(1, ex1.getSuppressed().length);
1062 +            assertSame(ex2, ex1.getSuppressed()[0]);
1063 +        }
1064          assertEquals(1, a.get());
1065      }}
1066  
# Line 1065 | Line 1078 | public class CompletableFutureTest exten
1078          if (!createIncomplete) assertTrue(f.complete(v1));
1079          final CompletableFuture<Integer> g = m.handle
1080              (f,
1081 <             (Integer x, Throwable t) -> {
1081 >             (Integer result, Throwable t) -> {
1082                  m.checkExecutionMode();
1083 <                threadAssertSame(x, v1);
1083 >                threadAssertSame(result, v1);
1084                  threadAssertNull(t);
1085                  a.getAndIncrement();
1086                  return inc(v1);
# Line 1094 | Line 1107 | public class CompletableFutureTest exten
1107          if (!createIncomplete) f.completeExceptionally(ex);
1108          final CompletableFuture<Integer> g = m.handle
1109              (f,
1110 <             (Integer x, Throwable t) -> {
1110 >             (Integer result, Throwable t) -> {
1111                  m.checkExecutionMode();
1112 <                threadAssertNull(x);
1112 >                threadAssertNull(result);
1113                  threadAssertSame(t, ex);
1114                  a.getAndIncrement();
1115                  return v1;
# Line 1123 | Line 1136 | public class CompletableFutureTest exten
1136          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1137          final CompletableFuture<Integer> g = m.handle
1138              (f,
1139 <             (Integer x, Throwable t) -> {
1139 >             (Integer result, Throwable t) -> {
1140                  m.checkExecutionMode();
1141 <                threadAssertNull(x);
1141 >                threadAssertNull(result);
1142                  threadAssertTrue(t instanceof CancellationException);
1143                  a.getAndIncrement();
1144                  return v1;
# Line 1138 | Line 1151 | public class CompletableFutureTest exten
1151      }}
1152  
1153      /**
1154 <     * handle result completes exceptionally if action does
1154 >     * If a "handle action" throws an exception when triggered by
1155 >     * a normal completion, it completes exceptionally
1156       */
1157 <    public void testHandle_sourceFailedActionFailed() {
1157 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1158          for (ExecutionMode m : ExecutionMode.values())
1159          for (boolean createIncomplete : new boolean[] { true, false })
1160 +        for (Integer v1 : new Integer[] { 1, null })
1161      {
1162          final CompletableFuture<Integer> f = new CompletableFuture<>();
1163          final AtomicInteger a = new AtomicInteger(0);
1164 <        final CFException ex1 = new CFException();
1165 <        final CFException ex2 = new CFException();
1151 <        if (!createIncomplete) f.completeExceptionally(ex1);
1164 >        final CFException ex = new CFException();
1165 >        if (!createIncomplete) assertTrue(f.complete(v1));
1166          final CompletableFuture<Integer> g = m.handle
1167              (f,
1168 <             (Integer x, Throwable t) -> {
1168 >             (Integer result, Throwable t) -> {
1169                  m.checkExecutionMode();
1170 <                threadAssertNull(x);
1171 <                threadAssertSame(ex1, t);
1170 >                threadAssertSame(result, v1);
1171 >                threadAssertNull(t);
1172                  a.getAndIncrement();
1173 <                throw ex2;
1173 >                throw ex;
1174              });
1175 <        if (createIncomplete) f.completeExceptionally(ex1);
1175 >        if (createIncomplete) assertTrue(f.complete(v1));
1176  
1177 <        checkCompletedWithWrappedException(g, ex2);
1178 <        checkCompletedExceptionally(f, ex1);
1177 >        checkCompletedWithWrappedException(g, ex);
1178 >        checkCompletedNormally(f, v1);
1179          assertEquals(1, a.get());
1180      }}
1181  
1182 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1183 <        for (ExecutionMode m : ExecutionMode.values())
1182 >    /**
1183 >     * If a "handle action" throws an exception when triggered by
1184 >     * a source completion that also throws an exception, the action
1185 >     * exception takes precedence (unlike whenComplete)
1186 >     */
1187 >    public void testHandle_sourceFailedActionFailed() {
1188          for (boolean createIncomplete : new boolean[] { true, false })
1189 <        for (Integer v1 : new Integer[] { 1, null })
1189 >        for (ExecutionMode m : ExecutionMode.values())
1190      {
1173        final CompletableFuture<Integer> f = new CompletableFuture<>();
1191          final AtomicInteger a = new AtomicInteger(0);
1192 <        final CFException ex = new CFException();
1193 <        if (!createIncomplete) assertTrue(f.complete(v1));
1192 >        final CFException ex1 = new CFException();
1193 >        final CFException ex2 = new CFException();
1194 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1195 >
1196 >        if (!createIncomplete) f.completeExceptionally(ex1);
1197          final CompletableFuture<Integer> g = m.handle
1198              (f,
1199 <             (Integer x, Throwable t) -> {
1199 >             (Integer result, Throwable t) -> {
1200                  m.checkExecutionMode();
1201 <                threadAssertSame(x, v1);
1202 <                threadAssertNull(t);
1201 >                threadAssertNull(result);
1202 >                threadAssertSame(ex1, t);
1203                  a.getAndIncrement();
1204 <                throw ex;
1204 >                throw ex2;
1205              });
1206 <        if (createIncomplete) assertTrue(f.complete(v1));
1206 >        if (createIncomplete) f.completeExceptionally(ex1);
1207  
1208 <        checkCompletedWithWrappedException(g, ex);
1209 <        checkCompletedNormally(f, v1);
1208 >        checkCompletedWithWrappedException(g, ex2);
1209 >        checkCompletedExceptionally(f, ex1);
1210          assertEquals(1, a.get());
1211      }}
1212  
# Line 1219 | Line 1239 | public class CompletableFutureTest exten
1239      {
1240          final FailingRunnable r = new FailingRunnable(m);
1241          final CompletableFuture<Void> f = m.runAsync(r);
1242 <        checkCompletedWithWrappedCFException(f);
1242 >        checkCompletedWithWrappedException(f, r.ex);
1243          r.assertInvoked();
1244      }}
1245  
1246 +    public void testRunAsync_rejectingExecutor() {
1247 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1248 +        try {
1249 +            CompletableFuture.runAsync(() -> {}, e);
1250 +            shouldThrow();
1251 +        } catch (Throwable t) {
1252 +            assertSame(e.ex, t);
1253 +        }
1254 +
1255 +        assertEquals(1, e.count.get());
1256 +    }
1257 +
1258      /**
1259       * supplyAsync completes with result of supplier
1260       */
# Line 1253 | Line 1285 | public class CompletableFutureTest exten
1285      {
1286          FailingSupplier r = new FailingSupplier(m);
1287          CompletableFuture<Integer> f = m.supplyAsync(r);
1288 <        checkCompletedWithWrappedCFException(f);
1288 >        checkCompletedWithWrappedException(f, r.ex);
1289          r.assertInvoked();
1290      }}
1291  
1292 +    public void testSupplyAsync_rejectingExecutor() {
1293 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1294 +        try {
1295 +            CompletableFuture.supplyAsync(() -> null, e);
1296 +            shouldThrow();
1297 +        } catch (Throwable t) {
1298 +            assertSame(e.ex, t);
1299 +        }
1300 +
1301 +        assertEquals(1, e.count.get());
1302 +    }
1303 +
1304      // seq completion methods
1305  
1306      /**
# Line 1264 | Line 1308 | public class CompletableFutureTest exten
1308       */
1309      public void testThenRun_normalCompletion() {
1310          for (ExecutionMode m : ExecutionMode.values())
1267        for (boolean createIncomplete : new boolean[] { true, false })
1311          for (Integer v1 : new Integer[] { 1, null })
1312      {
1313          final CompletableFuture<Integer> f = new CompletableFuture<>();
1314 <        final Noop r = new Noop(m);
1315 <        if (!createIncomplete) assertTrue(f.complete(v1));
1273 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1274 <        if (createIncomplete) {
1275 <            checkIncomplete(g);
1276 <            assertTrue(f.complete(v1));
1277 <        }
1314 >        final Noop[] rs = new Noop[6];
1315 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1316  
1317 <        checkCompletedNormally(g, null);
1317 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1318 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1319 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1320 >        checkIncomplete(h0);
1321 >        checkIncomplete(h1);
1322 >        checkIncomplete(h2);
1323 >        assertTrue(f.complete(v1));
1324 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1325 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1326 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1327 >
1328 >        checkCompletedNormally(h0, null);
1329 >        checkCompletedNormally(h1, null);
1330 >        checkCompletedNormally(h2, null);
1331 >        checkCompletedNormally(h3, null);
1332 >        checkCompletedNormally(h4, null);
1333 >        checkCompletedNormally(h5, null);
1334          checkCompletedNormally(f, v1);
1335 <        r.assertInvoked();
1335 >        for (Noop r : rs) r.assertInvoked();
1336      }}
1337  
1338      /**
# Line 1287 | Line 1341 | public class CompletableFutureTest exten
1341       */
1342      public void testThenRun_exceptionalCompletion() {
1343          for (ExecutionMode m : ExecutionMode.values())
1290        for (boolean createIncomplete : new boolean[] { true, false })
1344      {
1345          final CFException ex = new CFException();
1346          final CompletableFuture<Integer> f = new CompletableFuture<>();
1347 <        final Noop r = new Noop(m);
1348 <        if (!createIncomplete) f.completeExceptionally(ex);
1296 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1297 <        if (createIncomplete) {
1298 <            checkIncomplete(g);
1299 <            f.completeExceptionally(ex);
1300 <        }
1347 >        final Noop[] rs = new Noop[6];
1348 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1349  
1350 <        checkCompletedWithWrappedException(g, ex);
1350 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1351 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1352 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1353 >        checkIncomplete(h0);
1354 >        checkIncomplete(h1);
1355 >        checkIncomplete(h2);
1356 >        assertTrue(f.completeExceptionally(ex));
1357 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1358 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1359 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1360 >
1361 >        checkCompletedWithWrappedException(h0, ex);
1362 >        checkCompletedWithWrappedException(h1, ex);
1363 >        checkCompletedWithWrappedException(h2, ex);
1364 >        checkCompletedWithWrappedException(h3, ex);
1365 >        checkCompletedWithWrappedException(h4, ex);
1366 >        checkCompletedWithWrappedException(h5, ex);
1367          checkCompletedExceptionally(f, ex);
1368 <        r.assertNotInvoked();
1368 >        for (Noop r : rs) r.assertNotInvoked();
1369      }}
1370  
1371      /**
# Line 1309 | Line 1373 | public class CompletableFutureTest exten
1373       */
1374      public void testThenRun_sourceCancelled() {
1375          for (ExecutionMode m : ExecutionMode.values())
1312        for (boolean createIncomplete : new boolean[] { true, false })
1376          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1377      {
1378          final CompletableFuture<Integer> f = new CompletableFuture<>();
1379 <        final Noop r = new Noop(m);
1380 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1318 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1319 <        if (createIncomplete) {
1320 <            checkIncomplete(g);
1321 <            assertTrue(f.cancel(mayInterruptIfRunning));
1322 <        }
1379 >        final Noop[] rs = new Noop[6];
1380 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1381  
1382 <        checkCompletedWithWrappedCancellationException(g);
1382 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1383 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1384 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1385 >        checkIncomplete(h0);
1386 >        checkIncomplete(h1);
1387 >        checkIncomplete(h2);
1388 >        assertTrue(f.cancel(mayInterruptIfRunning));
1389 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1390 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1391 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1392 >
1393 >        checkCompletedWithWrappedCancellationException(h0);
1394 >        checkCompletedWithWrappedCancellationException(h1);
1395 >        checkCompletedWithWrappedCancellationException(h2);
1396 >        checkCompletedWithWrappedCancellationException(h3);
1397 >        checkCompletedWithWrappedCancellationException(h4);
1398 >        checkCompletedWithWrappedCancellationException(h5);
1399          checkCancelled(f);
1400 <        r.assertNotInvoked();
1400 >        for (Noop r : rs) r.assertNotInvoked();
1401      }}
1402  
1403      /**
# Line 1331 | Line 1405 | public class CompletableFutureTest exten
1405       */
1406      public void testThenRun_actionFailed() {
1407          for (ExecutionMode m : ExecutionMode.values())
1334        for (boolean createIncomplete : new boolean[] { true, false })
1408          for (Integer v1 : new Integer[] { 1, null })
1409      {
1410          final CompletableFuture<Integer> f = new CompletableFuture<>();
1411 <        final FailingRunnable r = new FailingRunnable(m);
1412 <        if (!createIncomplete) assertTrue(f.complete(v1));
1340 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1341 <        if (createIncomplete) {
1342 <            checkIncomplete(g);
1343 <            assertTrue(f.complete(v1));
1344 <        }
1411 >        final FailingRunnable[] rs = new FailingRunnable[6];
1412 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1413  
1414 <        checkCompletedWithWrappedCFException(g);
1414 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1415 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1416 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1417 >        assertTrue(f.complete(v1));
1418 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1419 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1420 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1421 >
1422 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1423 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1424 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1425 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1426 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1427 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1428          checkCompletedNormally(f, v1);
1429      }}
1430  
# Line 1352 | Line 1433 | public class CompletableFutureTest exten
1433       */
1434      public void testThenApply_normalCompletion() {
1435          for (ExecutionMode m : ExecutionMode.values())
1355        for (boolean createIncomplete : new boolean[] { true, false })
1436          for (Integer v1 : new Integer[] { 1, null })
1437      {
1438          final CompletableFuture<Integer> f = new CompletableFuture<>();
1439 <        final IncFunction r = new IncFunction(m);
1440 <        if (!createIncomplete) assertTrue(f.complete(v1));
1361 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1362 <        if (createIncomplete) {
1363 <            checkIncomplete(g);
1364 <            assertTrue(f.complete(v1));
1365 <        }
1439 >        final IncFunction[] rs = new IncFunction[4];
1440 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1441  
1442 <        checkCompletedNormally(g, inc(v1));
1442 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1443 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1444 >        checkIncomplete(h0);
1445 >        checkIncomplete(h1);
1446 >        assertTrue(f.complete(v1));
1447 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1448 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1449 >
1450 >        checkCompletedNormally(h0, inc(v1));
1451 >        checkCompletedNormally(h1, inc(v1));
1452 >        checkCompletedNormally(h2, inc(v1));
1453 >        checkCompletedNormally(h3, inc(v1));
1454          checkCompletedNormally(f, v1);
1455 <        r.assertValue(inc(v1));
1455 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1456      }}
1457  
1458      /**
# Line 1375 | Line 1461 | public class CompletableFutureTest exten
1461       */
1462      public void testThenApply_exceptionalCompletion() {
1463          for (ExecutionMode m : ExecutionMode.values())
1378        for (boolean createIncomplete : new boolean[] { true, false })
1464      {
1465          final CFException ex = new CFException();
1466          final CompletableFuture<Integer> f = new CompletableFuture<>();
1467 <        final IncFunction r = new IncFunction(m);
1468 <        if (!createIncomplete) f.completeExceptionally(ex);
1384 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1385 <        if (createIncomplete) {
1386 <            checkIncomplete(g);
1387 <            f.completeExceptionally(ex);
1388 <        }
1467 >        final IncFunction[] rs = new IncFunction[4];
1468 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1469  
1470 <        checkCompletedWithWrappedException(g, ex);
1470 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1471 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1472 >        assertTrue(f.completeExceptionally(ex));
1473 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1474 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1475 >
1476 >        checkCompletedWithWrappedException(h0, ex);
1477 >        checkCompletedWithWrappedException(h1, ex);
1478 >        checkCompletedWithWrappedException(h2, ex);
1479 >        checkCompletedWithWrappedException(h3, ex);
1480          checkCompletedExceptionally(f, ex);
1481 <        r.assertNotInvoked();
1481 >        for (IncFunction r : rs) r.assertNotInvoked();
1482      }}
1483  
1484      /**
# Line 1397 | Line 1486 | public class CompletableFutureTest exten
1486       */
1487      public void testThenApply_sourceCancelled() {
1488          for (ExecutionMode m : ExecutionMode.values())
1400        for (boolean createIncomplete : new boolean[] { true, false })
1489          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490      {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final IncFunction r = new IncFunction(m);
1493 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1406 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1407 <        if (createIncomplete) {
1408 <            checkIncomplete(g);
1409 <            assertTrue(f.cancel(mayInterruptIfRunning));
1410 <        }
1492 >        final IncFunction[] rs = new IncFunction[4];
1493 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1494  
1495 <        checkCompletedWithWrappedCancellationException(g);
1495 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1496 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1497 >        assertTrue(f.cancel(mayInterruptIfRunning));
1498 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1499 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1500 >
1501 >        checkCompletedWithWrappedCancellationException(h0);
1502 >        checkCompletedWithWrappedCancellationException(h1);
1503 >        checkCompletedWithWrappedCancellationException(h2);
1504 >        checkCompletedWithWrappedCancellationException(h3);
1505          checkCancelled(f);
1506 <        r.assertNotInvoked();
1506 >        for (IncFunction r : rs) r.assertNotInvoked();
1507      }}
1508  
1509      /**
# Line 1419 | Line 1511 | public class CompletableFutureTest exten
1511       */
1512      public void testThenApply_actionFailed() {
1513          for (ExecutionMode m : ExecutionMode.values())
1422        for (boolean createIncomplete : new boolean[] { true, false })
1514          for (Integer v1 : new Integer[] { 1, null })
1515      {
1516          final CompletableFuture<Integer> f = new CompletableFuture<>();
1517 <        final FailingFunction r = new FailingFunction(m);
1518 <        if (!createIncomplete) assertTrue(f.complete(v1));
1519 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1520 <        if (createIncomplete) {
1521 <            checkIncomplete(g);
1522 <            assertTrue(f.complete(v1));
1523 <        }
1517 >        final FailingFunction[] rs = new FailingFunction[4];
1518 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1519 >
1520 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1521 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1522 >        assertTrue(f.complete(v1));
1523 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1524 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1525  
1526 <        checkCompletedWithWrappedCFException(g);
1526 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1527 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1528 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1529 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1530          checkCompletedNormally(f, v1);
1531      }}
1532  
# Line 1440 | Line 1535 | public class CompletableFutureTest exten
1535       */
1536      public void testThenAccept_normalCompletion() {
1537          for (ExecutionMode m : ExecutionMode.values())
1443        for (boolean createIncomplete : new boolean[] { true, false })
1538          for (Integer v1 : new Integer[] { 1, null })
1539      {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541 <        final NoopConsumer r = new NoopConsumer(m);
1542 <        if (!createIncomplete) assertTrue(f.complete(v1));
1449 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1450 <        if (createIncomplete) {
1451 <            checkIncomplete(g);
1452 <            assertTrue(f.complete(v1));
1453 <        }
1541 >        final NoopConsumer[] rs = new NoopConsumer[4];
1542 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1543  
1544 <        checkCompletedNormally(g, null);
1545 <        r.assertValue(v1);
1544 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1545 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1546 >        checkIncomplete(h0);
1547 >        checkIncomplete(h1);
1548 >        assertTrue(f.complete(v1));
1549 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1550 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1551 >
1552 >        checkCompletedNormally(h0, null);
1553 >        checkCompletedNormally(h1, null);
1554 >        checkCompletedNormally(h2, null);
1555 >        checkCompletedNormally(h3, null);
1556          checkCompletedNormally(f, v1);
1557 +        for (NoopConsumer r : rs) r.assertValue(v1);
1558      }}
1559  
1560      /**
# Line 1463 | Line 1563 | public class CompletableFutureTest exten
1563       */
1564      public void testThenAccept_exceptionalCompletion() {
1565          for (ExecutionMode m : ExecutionMode.values())
1466        for (boolean createIncomplete : new boolean[] { true, false })
1566      {
1567          final CFException ex = new CFException();
1568          final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final NoopConsumer r = new NoopConsumer(m);
1570 <        if (!createIncomplete) f.completeExceptionally(ex);
1472 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1473 <        if (createIncomplete) {
1474 <            checkIncomplete(g);
1475 <            f.completeExceptionally(ex);
1476 <        }
1569 >        final NoopConsumer[] rs = new NoopConsumer[4];
1570 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1571  
1572 <        checkCompletedWithWrappedException(g, ex);
1572 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1573 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1574 >        assertTrue(f.completeExceptionally(ex));
1575 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1576 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1577 >
1578 >        checkCompletedWithWrappedException(h0, ex);
1579 >        checkCompletedWithWrappedException(h1, ex);
1580 >        checkCompletedWithWrappedException(h2, ex);
1581 >        checkCompletedWithWrappedException(h3, ex);
1582          checkCompletedExceptionally(f, ex);
1583 <        r.assertNotInvoked();
1583 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1584      }}
1585  
1586      /**
# Line 1485 | Line 1588 | public class CompletableFutureTest exten
1588       */
1589      public void testThenAccept_sourceCancelled() {
1590          for (ExecutionMode m : ExecutionMode.values())
1488        for (boolean createIncomplete : new boolean[] { true, false })
1591          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1592      {
1593          final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        final NoopConsumer r = new NoopConsumer(m);
1595 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1494 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1495 <        if (createIncomplete) {
1496 <            checkIncomplete(g);
1497 <            assertTrue(f.cancel(mayInterruptIfRunning));
1498 <        }
1594 >        final NoopConsumer[] rs = new NoopConsumer[4];
1595 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1596  
1597 <        checkCompletedWithWrappedCancellationException(g);
1597 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1598 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1599 >        assertTrue(f.cancel(mayInterruptIfRunning));
1600 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1601 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1602 >
1603 >        checkCompletedWithWrappedCancellationException(h0);
1604 >        checkCompletedWithWrappedCancellationException(h1);
1605 >        checkCompletedWithWrappedCancellationException(h2);
1606 >        checkCompletedWithWrappedCancellationException(h3);
1607          checkCancelled(f);
1608 <        r.assertNotInvoked();
1608 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1609      }}
1610  
1611      /**
# Line 1507 | Line 1613 | public class CompletableFutureTest exten
1613       */
1614      public void testThenAccept_actionFailed() {
1615          for (ExecutionMode m : ExecutionMode.values())
1510        for (boolean createIncomplete : new boolean[] { true, false })
1616          for (Integer v1 : new Integer[] { 1, null })
1617      {
1618          final CompletableFuture<Integer> f = new CompletableFuture<>();
1619 <        final FailingConsumer r = new FailingConsumer(m);
1620 <        if (!createIncomplete) f.complete(v1);
1621 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1622 <        if (createIncomplete) {
1623 <            checkIncomplete(g);
1624 <            f.complete(v1);
1625 <        }
1619 >        final FailingConsumer[] rs = new FailingConsumer[4];
1620 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1621 >
1622 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1623 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1624 >        assertTrue(f.complete(v1));
1625 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1626 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1627  
1628 <        checkCompletedWithWrappedCFException(g);
1628 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1629 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1630 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1631 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1632          checkCompletedNormally(f, v1);
1633      }}
1634  
# Line 1535 | Line 1644 | public class CompletableFutureTest exten
1644      {
1645          final CompletableFuture<Integer> f = new CompletableFuture<>();
1646          final CompletableFuture<Integer> g = new CompletableFuture<>();
1647 <        final SubtractFunction r1 = new SubtractFunction(m);
1648 <        final SubtractFunction r2 = new SubtractFunction(m);
1540 <        final SubtractFunction r3 = new SubtractFunction(m);
1647 >        final SubtractFunction[] rs = new SubtractFunction[6];
1648 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1649  
1650          final CompletableFuture<Integer> fst =  fFirst ? f : g;
1651          final CompletableFuture<Integer> snd = !fFirst ? f : g;
1652          final Integer w1 =  fFirst ? v1 : v2;
1653          final Integer w2 = !fFirst ? v1 : v2;
1654  
1655 <        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1655 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1656 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1657          assertTrue(fst.complete(w1));
1658 <        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1659 <        checkIncomplete(h1);
1660 <        checkIncomplete(h2);
1661 <        r1.assertNotInvoked();
1662 <        r2.assertNotInvoked();
1658 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1659 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1660 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1661 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1662 >        checkCompletedNormally(h1, subtract(w1, w1));
1663 >        checkCompletedNormally(h3, subtract(w1, w1));
1664 >        rs[1].assertValue(subtract(w1, w1));
1665 >        rs[3].assertValue(subtract(w1, w1));
1666          assertTrue(snd.complete(w2));
1667 <        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1667 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1668  
1669 <        checkCompletedNormally(h1, subtract(v1, v2));
1669 >        checkCompletedNormally(h0, subtract(v1, v2));
1670          checkCompletedNormally(h2, subtract(v1, v2));
1671 <        checkCompletedNormally(h3, subtract(v1, v2));
1672 <        r1.assertValue(subtract(v1, v2));
1673 <        r2.assertValue(subtract(v1, v2));
1674 <        r3.assertValue(subtract(v1, v2));
1671 >        checkCompletedNormally(h4, subtract(v1, v2));
1672 >        rs[0].assertValue(subtract(v1, v2));
1673 >        rs[2].assertValue(subtract(v1, v2));
1674 >        rs[4].assertValue(subtract(v1, v2));
1675 >
1676          checkCompletedNormally(f, v1);
1677          checkCompletedNormally(g, v2);
1678      }}
# Line 1677 | Line 1790 | public class CompletableFutureTest exten
1790          assertTrue(snd.complete(w2));
1791          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1792  
1793 <        checkCompletedWithWrappedCFException(h1);
1794 <        checkCompletedWithWrappedCFException(h2);
1795 <        checkCompletedWithWrappedCFException(h3);
1793 >        checkCompletedWithWrappedException(h1, r1.ex);
1794 >        checkCompletedWithWrappedException(h2, r2.ex);
1795 >        checkCompletedWithWrappedException(h3, r3.ex);
1796 >        r1.assertInvoked();
1797 >        r2.assertInvoked();
1798 >        r3.assertInvoked();
1799          checkCompletedNormally(f, v1);
1800          checkCompletedNormally(g, v2);
1801      }}
# Line 1838 | Line 1954 | public class CompletableFutureTest exten
1954          assertTrue(snd.complete(w2));
1955          final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1956  
1957 <        checkCompletedWithWrappedCFException(h1);
1958 <        checkCompletedWithWrappedCFException(h2);
1959 <        checkCompletedWithWrappedCFException(h3);
1957 >        checkCompletedWithWrappedException(h1, r1.ex);
1958 >        checkCompletedWithWrappedException(h2, r2.ex);
1959 >        checkCompletedWithWrappedException(h3, r3.ex);
1960 >        r1.assertInvoked();
1961 >        r2.assertInvoked();
1962 >        r3.assertInvoked();
1963          checkCompletedNormally(f, v1);
1964          checkCompletedNormally(g, v2);
1965      }}
# Line 1851 | Line 1970 | public class CompletableFutureTest exten
1970       */
1971      public void testRunAfterBoth_normalCompletion() {
1972          for (ExecutionMode m : ExecutionMode.values())
1854        for (boolean createIncomplete : new boolean[] { true, false })
1973          for (boolean fFirst : new boolean[] { true, false })
1974          for (Integer v1 : new Integer[] { 1, null })
1975          for (Integer v2 : new Integer[] { 2, null })
1976      {
1977          final CompletableFuture<Integer> f = new CompletableFuture<>();
1978          final CompletableFuture<Integer> g = new CompletableFuture<>();
1979 <        final Noop r = new Noop(m);
1979 >        final Noop r1 = new Noop(m);
1980 >        final Noop r2 = new Noop(m);
1981 >        final Noop r3 = new Noop(m);
1982  
1983 <        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1984 <        if (!createIncomplete)
1985 <            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1986 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1867 <        if (createIncomplete) {
1868 <            checkIncomplete(h);
1869 <            r.assertNotInvoked();
1870 <            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1871 <        }
1983 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1984 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1985 >        final Integer w1 =  fFirst ? v1 : v2;
1986 >        final Integer w2 = !fFirst ? v1 : v2;
1987  
1988 <        checkCompletedNormally(h, null);
1989 <        r.assertInvoked();
1988 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1989 >        assertTrue(fst.complete(w1));
1990 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1991 >        checkIncomplete(h1);
1992 >        checkIncomplete(h2);
1993 >        r1.assertNotInvoked();
1994 >        r2.assertNotInvoked();
1995 >        assertTrue(snd.complete(w2));
1996 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1997 >
1998 >        checkCompletedNormally(h1, null);
1999 >        checkCompletedNormally(h2, null);
2000 >        checkCompletedNormally(h3, null);
2001 >        r1.assertInvoked();
2002 >        r2.assertInvoked();
2003 >        r3.assertInvoked();
2004          checkCompletedNormally(f, v1);
2005          checkCompletedNormally(g, v2);
2006      }}
# Line 1880 | Line 2009 | public class CompletableFutureTest exten
2009       * runAfterBoth result completes exceptionally after exceptional
2010       * completion of either source
2011       */
2012 <    public void testRunAfterBoth_exceptionalCompletion() {
2012 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2013          for (ExecutionMode m : ExecutionMode.values())
1885        for (boolean createIncomplete : new boolean[] { true, false })
2014          for (boolean fFirst : new boolean[] { true, false })
2015 +        for (boolean failFirst : new boolean[] { true, false })
2016          for (Integer v1 : new Integer[] { 1, null })
2017      {
2018          final CompletableFuture<Integer> f = new CompletableFuture<>();
2019          final CompletableFuture<Integer> g = new CompletableFuture<>();
2020          final CFException ex = new CFException();
2021 <        final Noop r = new Noop(m);
2021 >        final Noop r1 = new Noop(m);
2022 >        final Noop r2 = new Noop(m);
2023 >        final Noop r3 = new Noop(m);
2024  
2025 <        assertTrue((fFirst ? f : g).complete(v1));
2026 <        if (!createIncomplete)
2027 <            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
2028 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2029 <        if (createIncomplete) {
2030 <            checkIncomplete(h);
2031 <            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
2032 <        }
2025 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2026 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2027 >        final Callable<Boolean> complete1 = failFirst ?
2028 >            () -> fst.completeExceptionally(ex) :
2029 >            () -> fst.complete(v1);
2030 >        final Callable<Boolean> complete2 = failFirst ?
2031 >            () -> snd.complete(v1) :
2032 >            () -> snd.completeExceptionally(ex);
2033  
2034 <        checkCompletedWithWrappedException(h, ex);
2035 <        r.assertNotInvoked();
2036 <        checkCompletedNormally(fFirst ? f : g, v1);
2037 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
2034 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2035 >        assertTrue(complete1.call());
2036 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2037 >        checkIncomplete(h1);
2038 >        checkIncomplete(h2);
2039 >        assertTrue(complete2.call());
2040 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2041 >
2042 >        checkCompletedWithWrappedException(h1, ex);
2043 >        checkCompletedWithWrappedException(h2, ex);
2044 >        checkCompletedWithWrappedException(h3, ex);
2045 >        r1.assertNotInvoked();
2046 >        r2.assertNotInvoked();
2047 >        r3.assertNotInvoked();
2048 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2049 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2050      }}
2051  
2052      /**
2053       * runAfterBoth result completes exceptionally if either source cancelled
2054       */
2055 <    public void testRunAfterBoth_sourceCancelled() {
2055 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2056          for (ExecutionMode m : ExecutionMode.values())
2057          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1915        for (boolean createIncomplete : new boolean[] { true, false })
2058          for (boolean fFirst : new boolean[] { true, false })
2059 +        for (boolean failFirst : new boolean[] { true, false })
2060          for (Integer v1 : new Integer[] { 1, null })
2061      {
2062          final CompletableFuture<Integer> f = new CompletableFuture<>();
2063          final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 <        final Noop r = new Noop(m);
2064 >        final Noop r1 = new Noop(m);
2065 >        final Noop r2 = new Noop(m);
2066 >        final Noop r3 = new Noop(m);
2067  
2068 <        assertTrue((fFirst ? f : g).complete(v1));
2069 <        if (!createIncomplete)
2070 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2071 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2072 <        if (createIncomplete) {
2073 <            checkIncomplete(h);
2074 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2075 <        }
2068 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2069 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2070 >        final Callable<Boolean> complete1 = failFirst ?
2071 >            () -> fst.cancel(mayInterruptIfRunning) :
2072 >            () -> fst.complete(v1);
2073 >        final Callable<Boolean> complete2 = failFirst ?
2074 >            () -> snd.complete(v1) :
2075 >            () -> snd.cancel(mayInterruptIfRunning);
2076  
2077 <        checkCompletedWithWrappedCancellationException(h);
2078 <        checkCancelled(!fFirst ? f : g);
2079 <        r.assertNotInvoked();
2080 <        checkCompletedNormally(fFirst ? f : g, v1);
2077 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2078 >        assertTrue(complete1.call());
2079 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2080 >        checkIncomplete(h1);
2081 >        checkIncomplete(h2);
2082 >        assertTrue(complete2.call());
2083 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2084 >
2085 >        checkCompletedWithWrappedCancellationException(h1);
2086 >        checkCompletedWithWrappedCancellationException(h2);
2087 >        checkCompletedWithWrappedCancellationException(h3);
2088 >        r1.assertNotInvoked();
2089 >        r2.assertNotInvoked();
2090 >        r3.assertNotInvoked();
2091 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2092 >        checkCancelled(failFirst ? fst : snd);
2093      }}
2094  
2095      /**
# Line 1948 | Line 2105 | public class CompletableFutureTest exten
2105          final CompletableFuture<Integer> g = new CompletableFuture<>();
2106          final FailingRunnable r1 = new FailingRunnable(m);
2107          final FailingRunnable r2 = new FailingRunnable(m);
2108 +        final FailingRunnable r3 = new FailingRunnable(m);
2109 +
2110 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2111 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2112 +        final Integer w1 =  fFirst ? v1 : v2;
2113 +        final Integer w2 = !fFirst ? v1 : v2;
2114  
2115 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2116 <        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
2117 <        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
2118 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2115 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2116 >        assertTrue(fst.complete(w1));
2117 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2118 >        assertTrue(snd.complete(w2));
2119 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2120  
2121 <        checkCompletedWithWrappedCFException(h1);
2122 <        checkCompletedWithWrappedCFException(h2);
2121 >        checkCompletedWithWrappedException(h1, r1.ex);
2122 >        checkCompletedWithWrappedException(h2, r2.ex);
2123 >        checkCompletedWithWrappedException(h3, r3.ex);
2124 >        r1.assertInvoked();
2125 >        r2.assertInvoked();
2126 >        r3.assertInvoked();
2127          checkCompletedNormally(f, v1);
2128          checkCompletedNormally(g, v2);
2129      }}
# Line 2242 | Line 2410 | public class CompletableFutureTest exten
2410          f.complete(v1);
2411          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2412          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2413 <        checkCompletedWithWrappedCFException(h0);
2414 <        checkCompletedWithWrappedCFException(h1);
2415 <        checkCompletedWithWrappedCFException(h2);
2416 <        checkCompletedWithWrappedCFException(h3);
2413 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2414 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2415 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2416 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2417          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2418  
2419          g.complete(v2);
# Line 2254 | Line 2422 | public class CompletableFutureTest exten
2422          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2423          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2424  
2425 <        checkCompletedWithWrappedCFException(h4);
2425 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2426          assertTrue(Objects.equals(v1, rs[4].value) ||
2427                     Objects.equals(v2, rs[4].value));
2428 <        checkCompletedWithWrappedCFException(h5);
2428 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2429          assertTrue(Objects.equals(v1, rs[5].value) ||
2430                     Objects.equals(v2, rs[5].value));
2431  
# Line 2501 | Line 2669 | public class CompletableFutureTest exten
2669          f.complete(v1);
2670          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2671          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2672 <        checkCompletedWithWrappedCFException(h0);
2673 <        checkCompletedWithWrappedCFException(h1);
2674 <        checkCompletedWithWrappedCFException(h2);
2675 <        checkCompletedWithWrappedCFException(h3);
2672 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2673 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2674 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2675 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2676          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2677  
2678          g.complete(v2);
# Line 2513 | Line 2681 | public class CompletableFutureTest exten
2681          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2682          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2683  
2684 <        checkCompletedWithWrappedCFException(h4);
2684 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2685          assertTrue(Objects.equals(v1, rs[4].value) ||
2686                     Objects.equals(v2, rs[4].value));
2687 <        checkCompletedWithWrappedCFException(h5);
2687 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2688          assertTrue(Objects.equals(v1, rs[5].value) ||
2689                     Objects.equals(v2, rs[5].value));
2690  
# Line 2756 | Line 2924 | public class CompletableFutureTest exten
2924          assertTrue(f.complete(v1));
2925          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2926          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2927 <        checkCompletedWithWrappedCFException(h0);
2928 <        checkCompletedWithWrappedCFException(h1);
2929 <        checkCompletedWithWrappedCFException(h2);
2930 <        checkCompletedWithWrappedCFException(h3);
2927 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2928 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2929 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2930 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2931          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2932          assertTrue(g.complete(v2));
2933          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2934          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2935 <        checkCompletedWithWrappedCFException(h4);
2936 <        checkCompletedWithWrappedCFException(h5);
2935 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2936 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2937  
2938          checkCompletedNormally(f, v1);
2939          checkCompletedNormally(g, v2);
# Line 2826 | Line 2994 | public class CompletableFutureTest exten
2994          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2995          if (createIncomplete) assertTrue(f.complete(v1));
2996  
2997 <        checkCompletedWithWrappedCFException(g);
2997 >        checkCompletedWithWrappedException(g, r.ex);
2998          checkCompletedNormally(f, v1);
2999      }}
3000  
# Line 2851 | Line 3019 | public class CompletableFutureTest exten
3019          checkCancelled(f);
3020      }}
3021  
3022 +    /**
3023 +     * thenCompose result completes exceptionally if the result of the action does
3024 +     */
3025 +    public void testThenCompose_actionReturnsFailingFuture() {
3026 +        for (ExecutionMode m : ExecutionMode.values())
3027 +        for (int order = 0; order < 6; order++)
3028 +        for (Integer v1 : new Integer[] { 1, null })
3029 +    {
3030 +        final CFException ex = new CFException();
3031 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3032 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3033 +        final CompletableFuture<Integer> h;
3034 +        // Test all permutations of orders
3035 +        switch (order) {
3036 +        case 0:
3037 +            assertTrue(f.complete(v1));
3038 +            assertTrue(g.completeExceptionally(ex));
3039 +            h = m.thenCompose(f, (x -> g));
3040 +            break;
3041 +        case 1:
3042 +            assertTrue(f.complete(v1));
3043 +            h = m.thenCompose(f, (x -> g));
3044 +            assertTrue(g.completeExceptionally(ex));
3045 +            break;
3046 +        case 2:
3047 +            assertTrue(g.completeExceptionally(ex));
3048 +            assertTrue(f.complete(v1));
3049 +            h = m.thenCompose(f, (x -> g));
3050 +            break;
3051 +        case 3:
3052 +            assertTrue(g.completeExceptionally(ex));
3053 +            h = m.thenCompose(f, (x -> g));
3054 +            assertTrue(f.complete(v1));
3055 +            break;
3056 +        case 4:
3057 +            h = m.thenCompose(f, (x -> g));
3058 +            assertTrue(f.complete(v1));
3059 +            assertTrue(g.completeExceptionally(ex));
3060 +            break;
3061 +        case 5:
3062 +            h = m.thenCompose(f, (x -> g));
3063 +            assertTrue(f.complete(v1));
3064 +            assertTrue(g.completeExceptionally(ex));
3065 +            break;
3066 +        default: throw new AssertionError();
3067 +        }
3068 +
3069 +        checkCompletedExceptionally(g, ex);
3070 +        checkCompletedWithWrappedException(h, ex);
3071 +        checkCompletedNormally(f, v1);
3072 +    }}
3073 +
3074      // other static methods
3075  
3076      /**
# Line 2867 | Line 3087 | public class CompletableFutureTest exten
3087       * when all components complete normally
3088       */
3089      public void testAllOf_normal() throws Exception {
3090 <        for (int k = 1; k < 20; ++k) {
3090 >        for (int k = 1; k < 10; k++) {
3091              CompletableFuture<Integer>[] fs
3092                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3093 <            for (int i = 0; i < k; ++i)
3093 >            for (int i = 0; i < k; i++)
3094                  fs[i] = new CompletableFuture<>();
3095              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3096 <            for (int i = 0; i < k; ++i) {
3096 >            for (int i = 0; i < k; i++) {
3097                  checkIncomplete(f);
3098                  checkIncomplete(CompletableFuture.allOf(fs));
3099                  fs[i].complete(one);
# Line 2883 | Line 3103 | public class CompletableFutureTest exten
3103          }
3104      }
3105  
3106 <    public void testAllOf_backwards() throws Exception {
3107 <        for (int k = 1; k < 20; ++k) {
3106 >    public void testAllOf_normal_backwards() throws Exception {
3107 >        for (int k = 1; k < 10; k++) {
3108              CompletableFuture<Integer>[] fs
3109                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3110 <            for (int i = 0; i < k; ++i)
3110 >            for (int i = 0; i < k; i++)
3111                  fs[i] = new CompletableFuture<>();
3112              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3113              for (int i = k - 1; i >= 0; i--) {
# Line 2900 | Line 3120 | public class CompletableFutureTest exten
3120          }
3121      }
3122  
3123 +    public void testAllOf_exceptional() throws Exception {
3124 +        for (int k = 1; k < 10; k++) {
3125 +            CompletableFuture<Integer>[] fs
3126 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3127 +            CFException ex = new CFException();
3128 +            for (int i = 0; i < k; i++)
3129 +                fs[i] = new CompletableFuture<>();
3130 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3131 +            for (int i = 0; i < k; i++) {
3132 +                checkIncomplete(f);
3133 +                checkIncomplete(CompletableFuture.allOf(fs));
3134 +                if (i != k / 2) {
3135 +                    fs[i].complete(i);
3136 +                    checkCompletedNormally(fs[i], i);
3137 +                } else {
3138 +                    fs[i].completeExceptionally(ex);
3139 +                    checkCompletedExceptionally(fs[i], ex);
3140 +                }
3141 +            }
3142 +            checkCompletedWithWrappedException(f, ex);
3143 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3144 +        }
3145 +    }
3146 +
3147      /**
3148       * anyOf(no component futures) returns an incomplete future
3149       */
3150      public void testAnyOf_empty() throws Exception {
3151 +        for (Integer v1 : new Integer[] { 1, null })
3152 +    {
3153          CompletableFuture<Object> f = CompletableFuture.anyOf();
3154          checkIncomplete(f);
3155 <    }
3155 >
3156 >        f.complete(v1);
3157 >        checkCompletedNormally(f, v1);
3158 >    }}
3159  
3160      /**
3161       * anyOf returns a future completed normally with a value when
3162       * a component future does
3163       */
3164      public void testAnyOf_normal() throws Exception {
3165 <        for (int k = 0; k < 10; ++k) {
3165 >        for (int k = 0; k < 10; k++) {
3166              CompletableFuture[] fs = new CompletableFuture[k];
3167 <            for (int i = 0; i < k; ++i)
3167 >            for (int i = 0; i < k; i++)
3168                  fs[i] = new CompletableFuture<>();
3169              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3170              checkIncomplete(f);
3171 <            for (int i = 0; i < k; ++i) {
3172 <                fs[i].complete(one);
3173 <                checkCompletedNormally(f, one);
3174 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3171 >            for (int i = 0; i < k; i++) {
3172 >                fs[i].complete(i);
3173 >                checkCompletedNormally(f, 0);
3174 >                int x = (int) CompletableFuture.anyOf(fs).join();
3175 >                assertTrue(0 <= x && x <= i);
3176 >            }
3177 >        }
3178 >    }
3179 >    public void testAnyOf_normal_backwards() throws Exception {
3180 >        for (int k = 0; k < 10; k++) {
3181 >            CompletableFuture[] fs = new CompletableFuture[k];
3182 >            for (int i = 0; i < k; i++)
3183 >                fs[i] = new CompletableFuture<>();
3184 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3185 >            checkIncomplete(f);
3186 >            for (int i = k - 1; i >= 0; i--) {
3187 >                fs[i].complete(i);
3188 >                checkCompletedNormally(f, k - 1);
3189 >                int x = (int) CompletableFuture.anyOf(fs).join();
3190 >                assertTrue(i <= x && x <= k - 1);
3191              }
3192          }
3193      }
# Line 2931 | Line 3196 | public class CompletableFutureTest exten
3196       * anyOf result completes exceptionally when any component does.
3197       */
3198      public void testAnyOf_exceptional() throws Exception {
3199 <        for (int k = 0; k < 10; ++k) {
3199 >        for (int k = 0; k < 10; k++) {
3200              CompletableFuture[] fs = new CompletableFuture[k];
3201 <            for (int i = 0; i < k; ++i)
3201 >            CFException[] exs = new CFException[k];
3202 >            for (int i = 0; i < k; i++) {
3203                  fs[i] = new CompletableFuture<>();
3204 +                exs[i] = new CFException();
3205 +            }
3206              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3207              checkIncomplete(f);
3208 <            for (int i = 0; i < k; ++i) {
3209 <                fs[i].completeExceptionally(new CFException());
3210 <                checkCompletedWithWrappedCFException(f);
3208 >            for (int i = 0; i < k; i++) {
3209 >                fs[i].completeExceptionally(exs[i]);
3210 >                checkCompletedWithWrappedException(f, exs[0]);
3211 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3212 >            }
3213 >        }
3214 >    }
3215 >
3216 >    public void testAnyOf_exceptional_backwards() throws Exception {
3217 >        for (int k = 0; k < 10; k++) {
3218 >            CompletableFuture[] fs = new CompletableFuture[k];
3219 >            CFException[] exs = new CFException[k];
3220 >            for (int i = 0; i < k; i++) {
3221 >                fs[i] = new CompletableFuture<>();
3222 >                exs[i] = new CFException();
3223 >            }
3224 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3225 >            checkIncomplete(f);
3226 >            for (int i = k - 1; i >= 0; i--) {
3227 >                fs[i].completeExceptionally(exs[i]);
3228 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3229                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3230              }
3231          }
# Line 2952 | Line 3238 | public class CompletableFutureTest exten
3238          CompletableFuture<Integer> f = new CompletableFuture<>();
3239          CompletableFuture<Integer> g = new CompletableFuture<>();
3240          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2955        CompletableFuture<?> h;
3241          ThreadExecutor exec = new ThreadExecutor();
3242  
3243          Runnable[] throwingActions = {
3244              () -> CompletableFuture.supplyAsync(null),
3245              () -> CompletableFuture.supplyAsync(null, exec),
3246 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3246 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3247  
3248              () -> CompletableFuture.runAsync(null),
3249              () -> CompletableFuture.runAsync(null, exec),
# Line 3049 | Line 3334 | public class CompletableFutureTest exten
3334              () -> CompletableFuture.anyOf(null, f),
3335  
3336              () -> f.obtrudeException(null),
3337 +
3338 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3339 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3340 +            () -> CompletableFuture.delayedExecutor(1L, null),
3341 +
3342 +            () -> f.orTimeout(1L, null),
3343 +            () -> f.completeOnTimeout(42, 1L, null),
3344 +
3345 +            () -> CompletableFuture.failedFuture(null),
3346 +            () -> CompletableFuture.failedStage(null),
3347          };
3348  
3349          assertThrows(NullPointerException.class, throwingActions);
# Line 3056 | Line 3351 | public class CompletableFutureTest exten
3351      }
3352  
3353      /**
3354 +     * Test submissions to an executor that rejects all tasks.
3355 +     */
3356 +    public void testRejectingExecutor() {
3357 +        for (Integer v : new Integer[] { 1, null }) {
3358 +
3359 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3360 +
3361 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3362 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3363 +
3364 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3365 +
3366 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3367 +        srcs.add(complete);
3368 +        srcs.add(incomplete);
3369 +
3370 +        for (CompletableFuture<Integer> src : srcs) {
3371 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3372 +            fs.add(src.thenRunAsync(() -> {}, e));
3373 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3374 +            fs.add(src.thenApplyAsync((z) -> z, e));
3375 +
3376 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3377 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3378 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3379 +
3380 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3381 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3382 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3383 +
3384 +            fs.add(src.thenComposeAsync((z) -> null, e));
3385 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3386 +            fs.add(src.handleAsync((z, t) -> null, e));
3387 +
3388 +            for (CompletableFuture<?> future : fs) {
3389 +                if (src.isDone())
3390 +                    checkCompletedWithWrappedException(future, e.ex);
3391 +                else
3392 +                    checkIncomplete(future);
3393 +            }
3394 +            futures.addAll(fs);
3395 +        }
3396 +
3397 +        {
3398 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3399 +
3400 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3401 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3402 +
3403 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3404 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3405 +
3406 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3407 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3408 +
3409 +            for (CompletableFuture<?> future : fs)
3410 +                checkIncomplete(future);
3411 +            futures.addAll(fs);
3412 +        }
3413 +
3414 +        {
3415 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3416 +
3417 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3418 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3419 +
3420 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3421 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3422 +
3423 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3424 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3425 +
3426 +            for (CompletableFuture<?> future : fs)
3427 +                checkCompletedWithWrappedException(future, e.ex);
3428 +            futures.addAll(fs);
3429 +        }
3430 +
3431 +        incomplete.complete(v);
3432 +
3433 +        for (CompletableFuture<?> future : futures)
3434 +            checkCompletedWithWrappedException(future, e.ex);
3435 +
3436 +        assertEquals(futures.size(), e.count.get());
3437 +
3438 +        }
3439 +    }
3440 +
3441 +    /**
3442 +     * Test submissions to an executor that rejects all tasks, but
3443 +     * should never be invoked because the dependent future is
3444 +     * explicitly completed.
3445 +     */
3446 +    public void testRejectingExecutorNeverInvoked() {
3447 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3448 +
3449 +        for (Integer v : new Integer[] { 1, null }) {
3450 +
3451 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3452 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3453 +
3454 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3455 +
3456 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3457 +        srcs.add(complete);
3458 +        srcs.add(incomplete);
3459 +
3460 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3461 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3462 +        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3463 +        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3464 +
3465 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3466 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3467 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3468 +
3469 +        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3470 +        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3471 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3472 +
3473 +        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3474 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3475 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3476 +
3477 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3478 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3479 +
3480 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3481 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3482 +
3483 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3484 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3485 +
3486 +        for (CompletableFuture<?> future : fs)
3487 +            checkIncomplete(future);
3488 +
3489 +        for (CompletableFuture<?> future : fs)
3490 +            future.complete(null);
3491 +
3492 +        incomplete.complete(v);
3493 +
3494 +        for (CompletableFuture<?> future : fs)
3495 +            checkCompletedNormally(future, null);
3496 +
3497 +        assertEquals(0, e.count.get());
3498 +
3499 +        }
3500 +    }
3501 +
3502 +    /**
3503       * toCompletableFuture returns this CompletableFuture.
3504       */
3505      public void testToCompletableFuture() {
# Line 3063 | Line 3507 | public class CompletableFutureTest exten
3507          assertSame(f, f.toCompletableFuture());
3508      }
3509  
3510 < //     public void testRunAfterEither_resultDeterminedAtTimeOfCreation() {
3511 < //         for (ExecutionMode m : ExecutionMode.values())
3512 < //         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3513 < //         for (Integer v1 : new Integer[] { 1, null })
3514 < //     {
3515 < //         final CompletableFuture<Integer> f = new CompletableFuture<>();
3516 < //         final CompletableFuture<Integer> g = new CompletableFuture<>();
3517 < //         final Noop[] rs = new Noop[2];
3518 < //         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
3519 < //         f.complete(v1);
3520 < //         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3521 < //         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3522 < //         assertTrue(g.cancel(mayInterruptIfRunning));
3523 < //         checkCompletedNormally(h0, null);
3524 < //         checkCompletedNormally(h1, null);
3525 < //         for (Noop r : rs) r.assertInvoked();
3526 < //     }}
3510 >    // jdk9
3511 >
3512 >    /**
3513 >     * newIncompleteFuture returns an incomplete CompletableFuture
3514 >     */
3515 >    public void testNewIncompleteFuture() {
3516 >        for (Integer v1 : new Integer[] { 1, null })
3517 >    {
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 >        checkIncomplete(g);
3525 >        g.complete(v1);
3526 >        checkCompletedNormally(g, v1);
3527 >        assertSame(g.getClass(), CompletableFuture.class);
3528 >    }}
3529 >
3530 >    /**
3531 >     * completedStage returns a completed CompletionStage
3532 >     */
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 >    }
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 >     * completeAsync completes exceptionally if given supplier throws
3668 >     */
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 >        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 >    /**
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 >     * completeOnTimeout completes with given value if not complete
3743 >     */
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 >        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 >        checkCompletedNormally(g, v1);
3778 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3779 >    }}
3780 >
3781 >    /**
3782 >     * delayedExecutor returns an executor that delays submission
3783 >     */
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())
3849 >    {
3850 >        final CFException ex = new CFException();
3851 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3852 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3853 >
3854 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3855 >            = new ArrayList<>();
3856 >
3857 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3858 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3859 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3860 >
3861 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3862 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3863 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3864 >
3865 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3866 >        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3867 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3868 >        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3869 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3870 >        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3871 >
3872 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3873 >
3874 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3875 >
3876 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3877 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3878 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3879 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3880 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3881 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3882 >
3883 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3884 >                 fun : funs) {
3885 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3886 >            f.completeExceptionally(ex);
3887 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3888 >            checkCompletedWithWrappedException(src, ex);
3889 >            CompletableFuture<?> dep = fun.apply(src);
3890 >            checkCompletedWithWrappedException(dep, ex);
3891 >            assertSame(resultOf(src), resultOf(dep));
3892 >        }
3893 >
3894 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3895 >                 fun : funs) {
3896 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3897 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3898 >            CompletableFuture<?> dep = fun.apply(src);
3899 >            f.completeExceptionally(ex);
3900 >            checkCompletedWithWrappedException(src, ex);
3901 >            checkCompletedWithWrappedException(dep, ex);
3902 >            assertSame(resultOf(src), resultOf(dep));
3903 >        }
3904 >
3905 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3906 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3907 >                 fun : funs) {
3908 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3909 >            f.cancel(mayInterruptIfRunning);
3910 >            checkCancelled(f);
3911 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3912 >            checkCompletedWithWrappedCancellationException(src);
3913 >            CompletableFuture<?> dep = fun.apply(src);
3914 >            checkCompletedWithWrappedCancellationException(dep);
3915 >            assertSame(resultOf(src), resultOf(dep));
3916 >        }
3917 >
3918 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3919 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3920 >                 fun : funs) {
3921 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3922 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3923 >            CompletableFuture<?> dep = fun.apply(src);
3924 >            f.cancel(mayInterruptIfRunning);
3925 >            checkCancelled(f);
3926 >            checkCompletedWithWrappedCancellationException(src);
3927 >            checkCompletedWithWrappedCancellationException(dep);
3928 >            assertSame(resultOf(src), resultOf(dep));
3929 >        }
3930 >    }}
3931 >
3932 >    /**
3933 >     * Minimal completion stages throw UOE for all non-CompletionStage methods
3934 >     */
3935 >    public void testMinimalCompletionStage_minimality() {
3936 >        if (!testImplementationDetails) return;
3937 >        Function<Method, String> toSignature =
3938 >            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3939 >        Predicate<Method> isNotStatic =
3940 >            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3941 >        List<Method> minimalMethods =
3942 >            Stream.of(Object.class, CompletionStage.class)
3943 >            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3944 >            .filter(isNotStatic)
3945 >            .collect(Collectors.toList());
3946 >        // Methods from CompletableFuture permitted NOT to throw UOE
3947 >        String[] signatureWhitelist = {
3948 >            "newIncompleteFuture[]",
3949 >            "defaultExecutor[]",
3950 >            "minimalCompletionStage[]",
3951 >            "copy[]",
3952 >        };
3953 >        Set<String> permittedMethodSignatures =
3954 >            Stream.concat(minimalMethods.stream().map(toSignature),
3955 >                          Stream.of(signatureWhitelist))
3956 >            .collect(Collectors.toSet());
3957 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3958 >            .filter(isNotStatic)
3959 >            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3960 >            .collect(Collectors.toList());
3961 >
3962 >        CompletionStage<Integer> minimalStage =
3963 >            new CompletableFuture<Integer>().minimalCompletionStage();
3964 >
3965 >        List<Method> bugs = new ArrayList<>();
3966 >        for (Method method : allMethods) {
3967 >            Class<?>[] parameterTypes = method.getParameterTypes();
3968 >            Object[] args = new Object[parameterTypes.length];
3969 >            // Manufacture boxed primitives for primitive params
3970 >            for (int i = 0; i < args.length; i++) {
3971 >                Class<?> type = parameterTypes[i];
3972 >                if (parameterTypes[i] == boolean.class)
3973 >                    args[i] = false;
3974 >                else if (parameterTypes[i] == int.class)
3975 >                    args[i] = 0;
3976 >                else if (parameterTypes[i] == long.class)
3977 >                    args[i] = 0L;
3978 >            }
3979 >            try {
3980 >                method.invoke(minimalStage, args);
3981 >                bugs.add(method);
3982 >            }
3983 >            catch (java.lang.reflect.InvocationTargetException expected) {
3984 >                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3985 >                    bugs.add(method);
3986 >                    // expected.getCause().printStackTrace();
3987 >                }
3988 >            }
3989 >            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3990 >        }
3991 >        if (!bugs.isEmpty())
3992 >            throw new Error("Methods did not throw UOE: " + bugs.toString());
3993 >    }
3994 >
3995 >    static class Monad {
3996 >        static class ZeroException extends RuntimeException {
3997 >            public ZeroException() { super("monadic zero"); }
3998 >        }
3999 >        // "return", "unit"
4000 >        static <T> CompletableFuture<T> unit(T value) {
4001 >            return completedFuture(value);
4002 >        }
4003 >        // monadic zero ?
4004 >        static <T> CompletableFuture<T> zero() {
4005 >            return failedFuture(new ZeroException());
4006 >        }
4007 >        // >=>
4008 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
4009 >            (Function<T, CompletableFuture<U>> f,
4010 >             Function<U, CompletableFuture<V>> g) {
4011 >            return (x) -> f.apply(x).thenCompose(g);
4012 >        }
4013 >
4014 >        static void assertZero(CompletableFuture<?> f) {
4015 >            try {
4016 >                f.getNow(null);
4017 >                throw new AssertionFailedError("should throw");
4018 >            } catch (CompletionException success) {
4019 >                assertTrue(success.getCause() instanceof ZeroException);
4020 >            }
4021 >        }
4022 >
4023 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
4024 >                                           CompletableFuture<T> g) {
4025 >            T fval = null, gval = null;
4026 >            Throwable fex = null, gex = null;
4027 >
4028 >            try { fval = f.get(); }
4029 >            catch (ExecutionException ex) { fex = ex.getCause(); }
4030 >            catch (Throwable ex) { fex = ex; }
4031 >
4032 >            try { gval = g.get(); }
4033 >            catch (ExecutionException ex) { gex = ex.getCause(); }
4034 >            catch (Throwable ex) { gex = ex; }
4035 >
4036 >            if (fex != null || gex != null)
4037 >                assertSame(fex.getClass(), gex.getClass());
4038 >            else
4039 >                assertEquals(fval, gval);
4040 >        }
4041 >
4042 >        static class PlusFuture<T> extends CompletableFuture<T> {
4043 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4044 >        }
4045 >
4046 >        /** Implements "monadic plus". */
4047 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4048 >                                             CompletableFuture<? extends T> g) {
4049 >            PlusFuture<T> plus = new PlusFuture<T>();
4050 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4051 >                try {
4052 >                    if (ex == null) {
4053 >                        if (plus.complete(result))
4054 >                            if (plus.firstFailure.get() != null)
4055 >                                plus.firstFailure.set(null);
4056 >                    }
4057 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4058 >                        if (plus.isDone())
4059 >                            plus.firstFailure.set(null);
4060 >                    }
4061 >                    else {
4062 >                        // first failure has precedence
4063 >                        Throwable first = plus.firstFailure.getAndSet(null);
4064 >
4065 >                        // may fail with "Self-suppression not permitted"
4066 >                        try { first.addSuppressed(ex); }
4067 >                        catch (Exception ignored) {}
4068 >
4069 >                        plus.completeExceptionally(first);
4070 >                    }
4071 >                } catch (Throwable unexpected) {
4072 >                    plus.completeExceptionally(unexpected);
4073 >                }
4074 >            };
4075 >            f.whenComplete(action);
4076 >            g.whenComplete(action);
4077 >            return plus;
4078 >        }
4079 >    }
4080 >
4081 >    /**
4082 >     * CompletableFuture is an additive monad - sort of.
4083 >     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4084 >     */
4085 >    public void testAdditiveMonad() throws Throwable {
4086 >        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4087 >        CompletableFuture<Long> zero = Monad.zero();
4088 >
4089 >        // Some mutually non-commutative functions
4090 >        Function<Long, CompletableFuture<Long>> triple
4091 >            = (x) -> Monad.unit(3 * x);
4092 >        Function<Long, CompletableFuture<Long>> inc
4093 >            = (x) -> Monad.unit(x + 1);
4094 >
4095 >        // unit is a right identity: m >>= unit === m
4096 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4097 >                                 inc.apply(5L));
4098 >        // unit is a left identity: (unit x) >>= f === f x
4099 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4100 >                                 inc.apply(5L));
4101 >
4102 >        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4103 >        Monad.assertFutureEquals(
4104 >            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4105 >            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4106 >
4107 >        // The case for CompletableFuture as an additive monad is weaker...
4108 >
4109 >        // zero is a monadic zero
4110 >        Monad.assertZero(zero);
4111 >
4112 >        // left zero: zero >>= f === zero
4113 >        Monad.assertZero(zero.thenCompose(inc));
4114 >        // right zero: f >>= (\x -> zero) === zero
4115 >        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4116 >
4117 >        // f plus zero === f
4118 >        Monad.assertFutureEquals(Monad.unit(5L),
4119 >                                 Monad.plus(Monad.unit(5L), zero));
4120 >        // zero plus f === f
4121 >        Monad.assertFutureEquals(Monad.unit(5L),
4122 >                                 Monad.plus(zero, Monad.unit(5L)));
4123 >        // zero plus zero === zero
4124 >        Monad.assertZero(Monad.plus(zero, zero));
4125 >        {
4126 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4127 >                                                   Monad.unit(8L));
4128 >            // non-determinism
4129 >            assertTrue(f.get() == 5L || f.get() == 8L);
4130 >        }
4131 >
4132 >        CompletableFuture<Long> godot = new CompletableFuture<>();
4133 >        // f plus godot === f (doesn't wait for godot)
4134 >        Monad.assertFutureEquals(Monad.unit(5L),
4135 >                                 Monad.plus(Monad.unit(5L), godot));
4136 >        // godot plus f === f (doesn't wait for godot)
4137 >        Monad.assertFutureEquals(Monad.unit(5L),
4138 >                                 Monad.plus(godot, Monad.unit(5L)));
4139 >    }
4140 >
4141 >    /**
4142 >     * A single CompletableFuture with many dependents.
4143 >     * A demo of scalability - runtime is O(n).
4144 >     */
4145 >    public void testManyDependents() throws Throwable {
4146 >        final int n = 1_000;
4147 >        final CompletableFuture<Void> head = new CompletableFuture<>();
4148 >        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4149 >        final AtomicInteger count = new AtomicInteger(0);
4150 >        for (int i = 0; i < n; i++) {
4151 >            head.thenRun(() -> count.getAndIncrement());
4152 >            head.thenAccept((x) -> count.getAndIncrement());
4153 >            head.thenApply((x) -> count.getAndIncrement());
4154 >
4155 >            head.runAfterBoth(complete, () -> count.getAndIncrement());
4156 >            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4157 >            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4158 >            complete.runAfterBoth(head, () -> count.getAndIncrement());
4159 >            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4160 >            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4161 >
4162 >            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4163 >            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4164 >            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4165 >            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4166 >            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4167 >            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4168 >        }
4169 >        head.complete(null);
4170 >        assertEquals(5 * 3 * n, count.get());
4171 >    }
4172 >
4173 >    /** ant -Dvmoptions=-Xmx8m -Djsr166.tckTestClass=CompletableFutureTest tck */
4174 >    public void testCoCompletionGarbage() throws Throwable {
4175 >        // final int n = 3_000_000;
4176 >        final int n = 100;
4177 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4178 >        CompletableFuture<Integer> f;
4179 >        for (int i = 0; i < n; i++) {
4180 >            f = new CompletableFuture<>();
4181 >            f.runAfterEither(incomplete, () -> {});
4182 >            f.complete(null);
4183 >
4184 >            f = new CompletableFuture<>();
4185 >            f.acceptEither(incomplete, (x) -> {});
4186 >            f.complete(null);
4187 >
4188 >            f = new CompletableFuture<>();
4189 >            f.applyToEither(incomplete, (x) -> x);
4190 >            f.complete(null);
4191 >
4192 >            f = new CompletableFuture<>();
4193 >            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4194 >            f.complete(null);
4195 >        }
4196 >
4197 >        for (int i = 0; i < n; i++) {
4198 >            f = new CompletableFuture<>();
4199 >            incomplete.runAfterEither(f, () -> {});
4200 >            f.complete(null);
4201 >
4202 >            f = new CompletableFuture<>();
4203 >            incomplete.acceptEither(f, (x) -> {});
4204 >            f.complete(null);
4205 >
4206 >            f = new CompletableFuture<>();
4207 >            incomplete.applyToEither(f, (x) -> x);
4208 >            f.complete(null);
4209 >
4210 >            f = new CompletableFuture<>();
4211 >            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4212 >            f.complete(null);
4213 >        }
4214 >    }
4215 >
4216 > //     static <U> U join(CompletionStage<U> stage) {
4217 > //         CompletableFuture<U> f = new CompletableFuture<>();
4218 > //         stage.whenComplete((v, ex) -> {
4219 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4220 > //         });
4221 > //         return f.join();
4222 > //     }
4223 >
4224 > //     static <U> boolean isDone(CompletionStage<U> stage) {
4225 > //         CompletableFuture<U> f = new CompletableFuture<>();
4226 > //         stage.whenComplete((v, ex) -> {
4227 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4228 > //         });
4229 > //         return f.isDone();
4230 > //     }
4231 >
4232 > //     static <U> U join2(CompletionStage<U> stage) {
4233 > //         return stage.toCompletableFuture().copy().join();
4234 > //     }
4235 >
4236 > //     static <U> boolean isDone2(CompletionStage<U> stage) {
4237 > //         return stage.toCompletableFuture().copy().isDone();
4238 > //     }
4239  
4240   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines