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.104 by jsr166, Thu Sep 3 14:17:25 2015 UTC vs.
Revision 1.163 by jsr166, Sun Jul 3 18:33:17 2016 UTC

# Line 7 | Line 7
7  
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;
25   import java.util.concurrent.CancellationException;
26   import java.util.concurrent.CompletableFuture;
# Line 20 | Line 30 | import java.util.concurrent.ExecutionExc
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;
# Line 28 | Line 39 | import java.util.function.BiConsumer;
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  
# Line 77 | Line 90 | public class CompletableFutureTest exten
90          assertTrue(f.toString().contains("[Completed normally]"));
91      }
92  
93 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
94 <        long startTime = System.nanoTime();
95 <        long timeoutMillis = LONG_DELAY_MS;
96 <        try {
97 <            f.get(timeoutMillis, MILLISECONDS);
98 <            shouldThrow();
99 <        } catch (ExecutionException success) {
100 <            assertTrue(success.getCause() instanceof CFException);
101 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
102 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
103 <
104 <        try {
105 <            f.join();
106 <            shouldThrow();
107 <        } catch (CompletionException success) {
108 <            assertTrue(success.getCause() instanceof CFException);
109 <        }
97 <        try {
98 <            f.getNow(null);
99 <            shouldThrow();
100 <        } catch (CompletionException success) {
101 <            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 {
104 <            f.get();
105 <            shouldThrow();
106 <        } catch (ExecutionException success) {
107 <            assertTrue(success.getCause() instanceof CFException);
108 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
109 <        assertTrue(f.isDone());
110 <        assertFalse(f.isCancelled());
111 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
112 <    }
111 >        checker.accept(cause);
112  
114    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
115                                                      Throwable ex) {
113          long startTime = System.nanoTime();
117        long timeoutMillis = LONG_DELAY_MS;
114          try {
115 <            f.get(timeoutMillis, MILLISECONDS);
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) < timeoutMillis/2);
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  
145        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 checkCompletedExceptionallyWithTimeout(CompletableFuture<U> f) {
150 <        long startTime = System.nanoTime();
151 <        long timeoutMillis = LONG_DELAY_MS;
152 <        try {
154 <            f.get(timeoutMillis, MILLISECONDS);
155 <            shouldThrow();
156 <        } catch (ExecutionException ex) {
157 <            assertTrue(ex.getCause() instanceof TimeoutException);
158 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
159 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
160 <
161 <        try {
162 <            f.join();
163 <            shouldThrow();
164 <        } catch (Throwable ex) {
165 <            assertTrue(ex.getCause() instanceof TimeoutException);
166 <        }
167 <
168 <        try {
169 <            f.getNow(null);
170 <            shouldThrow();
171 <        } catch (Throwable ex) {
172 <            assertTrue(ex.getCause() instanceof TimeoutException);
173 <        }
149 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
150 >        checkCompletedExceptionally(f, true,
151 >            (t) -> assertTrue(t instanceof CFException));
152 >    }
153  
154 <        try {
155 <            f.get();
156 <            shouldThrow();
157 <        } catch (ExecutionException ex) {
179 <            assertTrue(ex.getCause() instanceof TimeoutException);
180 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
154 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
155 >        checkCompletedExceptionally(f, true,
156 >            (t) -> assertTrue(t instanceof CancellationException));
157 >    }
158  
159 <        assertTrue(f.isDone());
160 <        assertFalse(f.isCancelled());
161 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
159 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
160 >        checkCompletedExceptionally(f, false,
161 >            (t) -> assertTrue(t instanceof TimeoutException));
162      }
163  
164 <    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
165 <                                                Throwable ex) {
166 <        checkCompletedExceptionallyWithRootCause(f, ex);
190 <        try {
191 <            CompletableFuture<Throwable> spy = f.handle
192 <                ((U u, Throwable t) -> t);
193 <            assertTrue(spy.join() instanceof CompletionException);
194 <            assertSame(ex, spy.join().getCause());
195 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
164 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
165 >                                            Throwable ex) {
166 >        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
167      }
168  
169 <    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
170 <        checkCompletedExceptionallyWithRootCause(f, ex);
200 <        try {
201 <            CompletableFuture<Throwable> spy = f.handle
202 <                ((U u, Throwable t) -> t);
203 <            assertSame(ex, spy.join());
204 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
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();
209        long timeoutMillis = LONG_DELAY_MS;
175          try {
176 <            f.get(timeoutMillis, MILLISECONDS);
176 >            f.get(LONG_DELAY_MS, MILLISECONDS);
177              shouldThrow();
178          } catch (CancellationException success) {
179          } catch (Throwable fail) { threadUnexpectedException(fail); }
180 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
180 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
181  
182          try {
183              f.join();
# Line 227 | Line 192 | public class CompletableFutureTest exten
192              shouldThrow();
193          } catch (CancellationException success) {
194          } catch (Throwable fail) { threadUnexpectedException(fail); }
230        assertTrue(f.isDone());
231        assertTrue(f.isCompletedExceptionally());
232        assertTrue(f.isCancelled());
233        assertTrue(f.toString().contains("[Completed exceptionally]"));
234    }
195  
196 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
237 <        long startTime = System.nanoTime();
238 <        long timeoutMillis = LONG_DELAY_MS;
239 <        try {
240 <            f.get(timeoutMillis, MILLISECONDS);
241 <            shouldThrow();
242 <        } catch (ExecutionException success) {
243 <            assertTrue(success.getCause() instanceof CancellationException);
244 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
245 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
196 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
197  
247        try {
248            f.join();
249            shouldThrow();
250        } catch (CompletionException success) {
251            assertTrue(success.getCause() instanceof CancellationException);
252        }
253        try {
254            f.getNow(null);
255            shouldThrow();
256        } catch (CompletionException success) {
257            assertTrue(success.getCause() instanceof CancellationException);
258        }
259        try {
260            f.get();
261            shouldThrow();
262        } catch (ExecutionException success) {
263            assertTrue(success.getCause() instanceof CancellationException);
264        } catch (Throwable fail) { threadUnexpectedException(fail); }
198          assertTrue(f.isDone());
266        assertFalse(f.isCancelled());
199          assertTrue(f.isCompletedExceptionally());
200 +        assertTrue(f.isCancelled());
201          assertTrue(f.toString().contains("[Completed exceptionally]"));
202      }
203  
# Line 527 | 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  
# Line 602 | 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 908 | Line 857 | public class CompletableFutureTest exten
857          if (!createIncomplete) assertTrue(f.complete(v1));
858          final CompletableFuture<Integer> g = f.exceptionally
859              ((Throwable t) -> {
911                // 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 944 | 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 })
902      {
# Line 962 | 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 969 | 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 979 | 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 1006 | 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 1033 | 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 1050 | 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 1061 | 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 1078 | 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())
1040      {
# Line 1092 | 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 1103 | 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 1120 | 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 1149 | 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 1178 | 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 1193 | 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();
1206 <        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      {
1228        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 1274 | 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 1308 | 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 1430 | Line 1419 | public class CompletableFutureTest exten
1419          final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1420          final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1421  
1422 <        checkCompletedWithWrappedCFException(h0);
1423 <        checkCompletedWithWrappedCFException(h1);
1424 <        checkCompletedWithWrappedCFException(h2);
1425 <        checkCompletedWithWrappedCFException(h3);
1426 <        checkCompletedWithWrappedCFException(h4);
1427 <        checkCompletedWithWrappedCFException(h5);
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 1534 | Line 1523 | public class CompletableFutureTest exten
1523          final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1524          final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1525  
1526 <        checkCompletedWithWrappedCFException(h0);
1527 <        checkCompletedWithWrappedCFException(h1);
1528 <        checkCompletedWithWrappedCFException(h2);
1529 <        checkCompletedWithWrappedCFException(h3);
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 1636 | Line 1625 | public class CompletableFutureTest exten
1625          final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1626          final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1627  
1628 <        checkCompletedWithWrappedCFException(h0);
1629 <        checkCompletedWithWrappedCFException(h1);
1630 <        checkCompletedWithWrappedCFException(h2);
1631 <        checkCompletedWithWrappedCFException(h3);
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 1801 | 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();
# Line 1965 | 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();
# Line 2129 | Line 2118 | public class CompletableFutureTest exten
2118          assertTrue(snd.complete(w2));
2119          final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2120  
2121 <        checkCompletedWithWrappedCFException(h1);
2122 <        checkCompletedWithWrappedCFException(h2);
2123 <        checkCompletedWithWrappedCFException(h3);
2121 >        checkCompletedWithWrappedException(h1, r1.ex);
2122 >        checkCompletedWithWrappedException(h2, r2.ex);
2123 >        checkCompletedWithWrappedException(h3, r3.ex);
2124          r1.assertInvoked();
2125          r2.assertInvoked();
2126          r3.assertInvoked();
# Line 2421 | 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 2433 | 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 2680 | 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 2692 | 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 2711 | Line 2700 | public class CompletableFutureTest exten
2700          for (ExecutionMode m : ExecutionMode.values())
2701          for (Integer v1 : new Integer[] { 1, null })
2702          for (Integer v2 : new Integer[] { 2, null })
2703 +        for (boolean pushNop : new boolean[] { true, false })
2704      {
2705          final CompletableFuture<Integer> f = new CompletableFuture<>();
2706          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2723 | Line 2713 | public class CompletableFutureTest exten
2713          checkIncomplete(h1);
2714          rs[0].assertNotInvoked();
2715          rs[1].assertNotInvoked();
2716 +        if (pushNop) {          // ad hoc test of intra-completion interference
2717 +            m.thenRun(f, () -> {});
2718 +            m.thenRun(g, () -> {});
2719 +        }
2720          f.complete(v1);
2721          checkCompletedNormally(h0, null);
2722          checkCompletedNormally(h1, null);
# Line 2935 | Line 2929 | public class CompletableFutureTest exten
2929          assertTrue(f.complete(v1));
2930          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2931          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2932 <        checkCompletedWithWrappedCFException(h0);
2933 <        checkCompletedWithWrappedCFException(h1);
2934 <        checkCompletedWithWrappedCFException(h2);
2935 <        checkCompletedWithWrappedCFException(h3);
2932 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2933 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2934 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2935 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2936          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2937          assertTrue(g.complete(v2));
2938          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2939          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2940 <        checkCompletedWithWrappedCFException(h4);
2941 <        checkCompletedWithWrappedCFException(h5);
2940 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2941 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2942  
2943          checkCompletedNormally(f, v1);
2944          checkCompletedNormally(g, v2);
# Line 3005 | Line 2999 | public class CompletableFutureTest exten
2999          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3000          if (createIncomplete) assertTrue(f.complete(v1));
3001  
3002 <        checkCompletedWithWrappedCFException(g);
3002 >        checkCompletedWithWrappedException(g, r.ex);
3003          checkCompletedNormally(f, v1);
3004      }}
3005  
# Line 3114 | Line 3108 | public class CompletableFutureTest exten
3108          }
3109      }
3110  
3111 <    public void testAllOf_backwards() throws Exception {
3111 >    public void testAllOf_normal_backwards() throws Exception {
3112          for (int k = 1; k < 10; k++) {
3113              CompletableFuture<Integer>[] fs
3114                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
# Line 3142 | Line 3136 | public class CompletableFutureTest exten
3136              for (int i = 0; i < k; i++) {
3137                  checkIncomplete(f);
3138                  checkIncomplete(CompletableFuture.allOf(fs));
3139 <                if (i != k/2) {
3139 >                if (i != k / 2) {
3140                      fs[i].complete(i);
3141                      checkCompletedNormally(fs[i], i);
3142                  } else {
# Line 3333 | Line 3327 | public class CompletableFutureTest exten
3327              () -> f.exceptionally(null),
3328  
3329              () -> f.handle(null),
3330 +
3331              () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3332              () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3333              () -> CompletableFuture.allOf(f, null),
# Line 3344 | Line 3339 | public class CompletableFutureTest exten
3339              () -> CompletableFuture.anyOf(null, f),
3340  
3341              () -> f.obtrudeException(null),
3342 +
3343 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3344 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3345 +            () -> CompletableFuture.delayedExecutor(1L, null),
3346 +
3347 +            () -> f.orTimeout(1L, null),
3348 +            () -> f.completeOnTimeout(42, 1L, null),
3349 +
3350 +            () -> CompletableFuture.failedFuture(null),
3351 +            () -> CompletableFuture.failedStage(null),
3352          };
3353  
3354          assertThrows(NullPointerException.class, throwingActions);
# Line 3351 | Line 3356 | public class CompletableFutureTest exten
3356      }
3357  
3358      /**
3359 +     * Test submissions to an executor that rejects all tasks.
3360 +     */
3361 +    public void testRejectingExecutor() {
3362 +        for (Integer v : new Integer[] { 1, null })
3363 +    {
3364 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3365 +
3366 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3367 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3368 +
3369 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3370 +
3371 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3372 +        srcs.add(complete);
3373 +        srcs.add(incomplete);
3374 +
3375 +        for (CompletableFuture<Integer> src : srcs) {
3376 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3377 +            fs.add(src.thenRunAsync(() -> {}, e));
3378 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3379 +            fs.add(src.thenApplyAsync((z) -> z, e));
3380 +
3381 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3382 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3383 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3384 +
3385 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3386 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3387 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3388 +
3389 +            fs.add(src.thenComposeAsync((z) -> null, e));
3390 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3391 +            fs.add(src.handleAsync((z, t) -> null, e));
3392 +
3393 +            for (CompletableFuture<?> future : fs) {
3394 +                if (src.isDone())
3395 +                    checkCompletedWithWrappedException(future, e.ex);
3396 +                else
3397 +                    checkIncomplete(future);
3398 +            }
3399 +            futures.addAll(fs);
3400 +        }
3401 +
3402 +        {
3403 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3404 +
3405 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3406 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3407 +
3408 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3409 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3410 +
3411 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3412 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3413 +
3414 +            for (CompletableFuture<?> future : fs)
3415 +                checkIncomplete(future);
3416 +            futures.addAll(fs);
3417 +        }
3418 +
3419 +        {
3420 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3421 +
3422 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3423 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3424 +
3425 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3426 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3427 +
3428 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3429 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3430 +
3431 +            for (CompletableFuture<?> future : fs)
3432 +                checkCompletedWithWrappedException(future, e.ex);
3433 +            futures.addAll(fs);
3434 +        }
3435 +
3436 +        incomplete.complete(v);
3437 +
3438 +        for (CompletableFuture<?> future : futures)
3439 +            checkCompletedWithWrappedException(future, e.ex);
3440 +
3441 +        assertEquals(futures.size(), e.count.get());
3442 +    }}
3443 +
3444 +    /**
3445 +     * Test submissions to an executor that rejects all tasks, but
3446 +     * should never be invoked because the dependent future is
3447 +     * explicitly completed.
3448 +     */
3449 +    public void testRejectingExecutorNeverInvoked() {
3450 +        for (Integer v : new Integer[] { 1, null })
3451 +    {
3452 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3453 +
3454 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3455 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3456 +
3457 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3458 +
3459 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3460 +        srcs.add(complete);
3461 +        srcs.add(incomplete);
3462 +
3463 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3464 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3465 +        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3466 +        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3467 +
3468 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3469 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3470 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3471 +
3472 +        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3473 +        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3474 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3475 +
3476 +        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3477 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3478 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3479 +
3480 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3481 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3482 +
3483 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3484 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3485 +
3486 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3487 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3488 +
3489 +        for (CompletableFuture<?> future : fs)
3490 +            checkIncomplete(future);
3491 +
3492 +        for (CompletableFuture<?> future : fs)
3493 +            future.complete(null);
3494 +
3495 +        incomplete.complete(v);
3496 +
3497 +        for (CompletableFuture<?> future : fs)
3498 +            checkCompletedNormally(future, null);
3499 +
3500 +        assertEquals(0, e.count.get());
3501 +    }}
3502 +
3503 +    /**
3504       * toCompletableFuture returns this CompletableFuture.
3505       */
3506      public void testToCompletableFuture() {
# Line 3364 | Line 3514 | public class CompletableFutureTest exten
3514       * newIncompleteFuture returns an incomplete CompletableFuture
3515       */
3516      public void testNewIncompleteFuture() {
3517 +        for (Integer v1 : new Integer[] { 1, null })
3518 +    {
3519          CompletableFuture<Integer> f = new CompletableFuture<>();
3520          CompletableFuture<Integer> g = f.newIncompleteFuture();
3521          checkIncomplete(f);
3522          checkIncomplete(g);
3523 <    }
3523 >        f.complete(v1);
3524 >        checkCompletedNormally(f, v1);
3525 >        checkIncomplete(g);
3526 >        g.complete(v1);
3527 >        checkCompletedNormally(g, v1);
3528 >        assertSame(g.getClass(), CompletableFuture.class);
3529 >    }}
3530  
3531      /**
3532       * completedStage returns a completed CompletionStage
3533       */
3534      public void testCompletedStage() {
3535 <        AtomicInteger x = new AtomicInteger();
3535 >        AtomicInteger x = new AtomicInteger(0);
3536          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3537          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3538          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
# Line 3384 | Line 3542 | public class CompletableFutureTest exten
3542  
3543      /**
3544       * defaultExecutor by default returns the commonPool if
3545 <     * it supports at least one thread.
3545 >     * it supports more than one thread.
3546       */
3547      public void testDefaultExecutor() {
3548          CompletableFuture<Integer> f = new CompletableFuture<>();
3549          Executor e = f.defaultExecutor();
3550 <        Executor c =  ForkJoinPool.commonPool();
3551 <        if (ForkJoinPool.getCommonPoolParallelism() > 0)
3550 >        Executor c = ForkJoinPool.commonPool();
3551 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3552              assertSame(e, c);
3553 +        else
3554 +            assertNotSame(e, c);
3555      }
3556  
3557      /**
# Line 3401 | Line 3561 | public class CompletableFutureTest exten
3561      public void testFailedFuture() {
3562          CFException ex = new CFException();
3563          CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3564 <        checkCompletedExceptionallyWithRootCause(f, ex);
3564 >        checkCompletedExceptionally(f, ex);
3565      }
3566  
3567      /**
3568       * failedFuture(null) throws NPE
3569       */
3570 <    public void testFailedFuture2() {
3570 >    public void testFailedFuture_null() {
3571          try {
3572              CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3573              shouldThrow();
# Line 3440 | Line 3600 | public class CompletableFutureTest exten
3600          CFException ex = new CFException();
3601          f.completeExceptionally(ex);
3602          checkCompletedExceptionally(f, ex);
3603 <        checkCompletedWithWrappedCFException(g);
3603 >        checkCompletedWithWrappedException(g, ex);
3604      }
3605  
3606      /**
# Line 3450 | Line 3610 | public class CompletableFutureTest exten
3610      public void testMinimalCompletionStage() {
3611          CompletableFuture<Integer> f = new CompletableFuture<>();
3612          CompletionStage<Integer> g = f.minimalCompletionStage();
3613 <        AtomicInteger x = new AtomicInteger();
3613 >        AtomicInteger x = new AtomicInteger(0);
3614          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3615          checkIncomplete(f);
3616          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
# Line 3467 | Line 3627 | public class CompletableFutureTest exten
3627      public void testMinimalCompletionStage2() {
3628          CompletableFuture<Integer> f = new CompletableFuture<>();
3629          CompletionStage<Integer> g = f.minimalCompletionStage();
3630 <        AtomicInteger x = new AtomicInteger();
3630 >        AtomicInteger x = new AtomicInteger(0);
3631          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3632          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3633          checkIncomplete(f);
# Line 3479 | Line 3639 | public class CompletableFutureTest exten
3639      }
3640  
3641      /**
3642 <     * failedStage returns a Completionstage completed
3642 >     * failedStage returns a CompletionStage completed
3643       * exceptionally with the given Exception
3644       */
3645      public void testFailedStage() {
3646          CFException ex = new CFException();
3647          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3648 <        AtomicInteger x = new AtomicInteger();
3648 >        AtomicInteger x = new AtomicInteger(0);
3649          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3650          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3651          assertEquals(x.get(), 0);
3652 <        assertEquals(r.get().getCause(), ex);
3652 >        assertEquals(r.get(), ex);
3653      }
3654  
3655      /**
3656       * completeAsync completes with value of given supplier
3657       */
3658      public void testCompleteAsync() {
3659 +        for (Integer v1 : new Integer[] { 1, null })
3660 +    {
3661          CompletableFuture<Integer> f = new CompletableFuture<>();
3662 <        f.completeAsync(() -> 1);
3662 >        f.completeAsync(() -> v1);
3663          f.join();
3664 <        checkCompletedNormally(f, 1);
3665 <    }
3664 >        checkCompletedNormally(f, v1);
3665 >    }}
3666  
3667      /**
3668       * completeAsync completes exceptionally if given supplier throws
# Line 3512 | Line 3674 | public class CompletableFutureTest exten
3674          try {
3675              f.join();
3676              shouldThrow();
3677 <        } catch (Exception success) {}
3678 <        checkCompletedWithWrappedCFException(f);
3677 >        } catch (CompletionException success) {}
3678 >        checkCompletedWithWrappedException(f, ex);
3679      }
3680  
3681      /**
3682       * completeAsync with given executor completes with value of given supplier
3683       */
3684      public void testCompleteAsync3() {
3685 +        for (Integer v1 : new Integer[] { 1, null })
3686 +    {
3687          CompletableFuture<Integer> f = new CompletableFuture<>();
3688 <        f.completeAsync(() -> 1, new ThreadExecutor());
3689 <        f.join();
3690 <        checkCompletedNormally(f, 1);
3691 <    }
3688 >        ThreadExecutor executor = new ThreadExecutor();
3689 >        f.completeAsync(() -> v1, executor);
3690 >        assertSame(v1, f.join());
3691 >        checkCompletedNormally(f, v1);
3692 >        assertEquals(1, executor.count.get());
3693 >    }}
3694  
3695      /**
3696       * completeAsync with given executor completes exceptionally if
# Line 3533 | Line 3699 | public class CompletableFutureTest exten
3699      public void testCompleteAsync4() {
3700          CompletableFuture<Integer> f = new CompletableFuture<>();
3701          CFException ex = new CFException();
3702 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, new ThreadExecutor());
3702 >        ThreadExecutor executor = new ThreadExecutor();
3703 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3704          try {
3705              f.join();
3706              shouldThrow();
3707 <        } catch (Exception success) {}
3708 <        checkCompletedWithWrappedCFException(f);
3707 >        } catch (CompletionException success) {}
3708 >        checkCompletedWithWrappedException(f, ex);
3709 >        assertEquals(1, executor.count.get());
3710      }
3711  
3712      /**
3713 <     *  orTimeout completes with TimeoutException if not complete
3713 >     * orTimeout completes with TimeoutException if not complete
3714       */
3715 <    public void testOrTimeout() {
3715 >    public void testOrTimeout_timesOut() {
3716 >        long timeoutMillis = timeoutMillis();
3717          CompletableFuture<Integer> f = new CompletableFuture<>();
3718 <        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3719 <        checkCompletedExceptionallyWithTimeout(f);
3718 >        long startTime = System.nanoTime();
3719 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3720 >        checkCompletedWithTimeoutException(f);
3721 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3722      }
3723  
3724      /**
3725 <     *  orTimeout completes normally if completed before timeout
3725 >     * orTimeout completes normally if completed before timeout
3726       */
3727 <    public void testOrTimeout2() {
3727 >    public void testOrTimeout_completed() {
3728 >        for (Integer v1 : new Integer[] { 1, null })
3729 >    {
3730          CompletableFuture<Integer> f = new CompletableFuture<>();
3731 <        f.complete(1);
3732 <        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3733 <        checkCompletedNormally(f, 1);
3734 <    }
3731 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3732 >        long startTime = System.nanoTime();
3733 >        f.complete(v1);
3734 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3735 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3736 >        g.complete(v1);
3737 >        checkCompletedNormally(f, v1);
3738 >        checkCompletedNormally(g, v1);
3739 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3740 >    }}
3741  
3742      /**
3743 <     *  completeOnTimeout completes with given value if not complete
3743 >     * completeOnTimeout completes with given value if not complete
3744       */
3745 <    public void testCompleteOnTimeout() {
3746 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3747 <        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3569 <        f.join();
3570 <        checkCompletedNormally(f, -1);
3745 >    public void testCompleteOnTimeout_timesOut() {
3746 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3747 >                       () -> testCompleteOnTimeout_timesOut(null));
3748      }
3749  
3750      /**
3751 <     *  completeOnTimeout has no effect if completed within timeout
3751 >     * completeOnTimeout completes with given value if not complete
3752       */
3753 <    public void testCompleteOnTimeout2() {
3753 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3754 >        long timeoutMillis = timeoutMillis();
3755          CompletableFuture<Integer> f = new CompletableFuture<>();
3756 <        f.complete(1);
3757 <        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3758 <        checkCompletedNormally(f, 1);
3756 >        long startTime = System.nanoTime();
3757 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3758 >        assertSame(v, f.join());
3759 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3760 >        f.complete(99);         // should have no effect
3761 >        checkCompletedNormally(f, v);
3762      }
3763  
3764      /**
3765 <     * delayedExecutor returns an executor that delays submission
3765 >     * completeOnTimeout has no effect if completed within timeout
3766       */
3767 <    public void testDelayedExecutor() {
3768 <        long timeoutMillis = SMALL_DELAY_MS;
3769 <        Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3770 <                                                       MILLISECONDS);
3767 >    public void testCompleteOnTimeout_completed() {
3768 >        for (Integer v1 : new Integer[] { 1, null })
3769 >    {
3770 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3771 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3772          long startTime = System.nanoTime();
3773 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3774 <        assertNull(f.getNow(null));
3775 <        try {
3776 <            f.get(LONG_DELAY_MS, MILLISECONDS);
3777 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
3778 <        assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3779 <        checkCompletedNormally(f, 1);
3780 <    }
3773 >        f.complete(v1);
3774 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3775 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3776 >        g.complete(v1);
3777 >        checkCompletedNormally(f, v1);
3778 >        checkCompletedNormally(g, v1);
3779 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3780 >    }}
3781  
3782      /**
3783 <     * delayedExecutor for a given executor returns an executor that
3602 <     * delays submission
3783 >     * delayedExecutor returns an executor that delays submission
3784       */
3785 <    public void testDelayedExecutor2() {
3786 <        long timeoutMillis = SMALL_DELAY_MS;
3787 <        Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3788 <                                                       MILLISECONDS,
3789 <                                                       new ThreadExecutor());
3785 >    public void testDelayedExecutor() {
3786 >        testInParallel(() -> testDelayedExecutor(null, null),
3787 >                       () -> testDelayedExecutor(null, 1),
3788 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3789 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3790 >    }
3791 >
3792 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3793 >        long timeoutMillis = timeoutMillis();
3794 >        // Use an "unreasonably long" long timeout to catch lingering threads
3795 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3796 >        final Executor delayer, longDelayer;
3797 >        if (executor == null) {
3798 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3799 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3800 >        } else {
3801 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3802 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3803 >        }
3804          long startTime = System.nanoTime();
3805 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3806 <        assertNull(f.getNow(null));
3807 <        try {
3808 <            f.get(LONG_DELAY_MS, MILLISECONDS);
3809 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
3810 <        assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3811 <        checkCompletedNormally(f, 1);
3805 >        CompletableFuture<Integer> f =
3806 >            CompletableFuture.supplyAsync(() -> v, delayer);
3807 >        CompletableFuture<Integer> g =
3808 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3809 >
3810 >        assertNull(g.getNow(null));
3811 >
3812 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3813 >        long millisElapsed = millisElapsedSince(startTime);
3814 >        assertTrue(millisElapsed >= timeoutMillis);
3815 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3816 >
3817 >        checkCompletedNormally(f, v);
3818 >
3819 >        checkIncomplete(g);
3820 >        assertTrue(g.cancel(true));
3821      }
3822  
3823      //--- tests of implementation details; not part of official tck ---
3824  
3825      Object resultOf(CompletableFuture<?> f) {
3826 +        SecurityManager sm = System.getSecurityManager();
3827 +        if (sm != null) {
3828 +            try {
3829 +                System.setSecurityManager(null);
3830 +            } catch (SecurityException giveUp) {
3831 +                return "Reflection not available";
3832 +            }
3833 +        }
3834 +
3835          try {
3836              java.lang.reflect.Field resultField
3837                  = CompletableFuture.class.getDeclaredField("result");
3838              resultField.setAccessible(true);
3839              return resultField.get(f);
3840 <        } catch (Throwable t) { throw new AssertionError(t); }
3840 >        } catch (Throwable t) {
3841 >            throw new AssertionError(t);
3842 >        } finally {
3843 >            if (sm != null) System.setSecurityManager(sm);
3844 >        }
3845      }
3846  
3847      public void testExceptionPropagationReusesResultObject() {
# Line 3647 | Line 3864 | public class CompletableFutureTest exten
3864          funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3865  
3866          funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3867 +        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3868          funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3869 +        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3870          funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3871 +        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3872  
3873 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3873 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3874  
3875          funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3876  
3877 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3878          funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3879 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3880 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3881          funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3882 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3883  
3884          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3885                   fun : funs) {
# Line 3706 | Line 3930 | public class CompletableFutureTest exten
3930          }
3931      }}
3932  
3933 +    /**
3934 +     * Minimal completion stages throw UOE for all non-CompletionStage methods
3935 +     */
3936 +    public void testMinimalCompletionStage_minimality() {
3937 +        if (!testImplementationDetails) return;
3938 +        Function<Method, String> toSignature =
3939 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3940 +        Predicate<Method> isNotStatic =
3941 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3942 +        List<Method> minimalMethods =
3943 +            Stream.of(Object.class, CompletionStage.class)
3944 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3945 +            .filter(isNotStatic)
3946 +            .collect(Collectors.toList());
3947 +        // Methods from CompletableFuture permitted NOT to throw UOE
3948 +        String[] signatureWhitelist = {
3949 +            "newIncompleteFuture[]",
3950 +            "defaultExecutor[]",
3951 +            "minimalCompletionStage[]",
3952 +            "copy[]",
3953 +        };
3954 +        Set<String> permittedMethodSignatures =
3955 +            Stream.concat(minimalMethods.stream().map(toSignature),
3956 +                          Stream.of(signatureWhitelist))
3957 +            .collect(Collectors.toSet());
3958 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3959 +            .filter(isNotStatic)
3960 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3961 +            .collect(Collectors.toList());
3962 +
3963 +        CompletionStage<Integer> minimalStage =
3964 +            new CompletableFuture<Integer>().minimalCompletionStage();
3965 +
3966 +        List<Method> bugs = new ArrayList<>();
3967 +        for (Method method : allMethods) {
3968 +            Class<?>[] parameterTypes = method.getParameterTypes();
3969 +            Object[] args = new Object[parameterTypes.length];
3970 +            // Manufacture boxed primitives for primitive params
3971 +            for (int i = 0; i < args.length; i++) {
3972 +                Class<?> type = parameterTypes[i];
3973 +                if (parameterTypes[i] == boolean.class)
3974 +                    args[i] = false;
3975 +                else if (parameterTypes[i] == int.class)
3976 +                    args[i] = 0;
3977 +                else if (parameterTypes[i] == long.class)
3978 +                    args[i] = 0L;
3979 +            }
3980 +            try {
3981 +                method.invoke(minimalStage, args);
3982 +                bugs.add(method);
3983 +            }
3984 +            catch (java.lang.reflect.InvocationTargetException expected) {
3985 +                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3986 +                    bugs.add(method);
3987 +                    // expected.getCause().printStackTrace();
3988 +                }
3989 +            }
3990 +            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3991 +        }
3992 +        if (!bugs.isEmpty())
3993 +            throw new Error("Methods did not throw UOE: " + bugs.toString());
3994 +    }
3995 +
3996 +    static class Monad {
3997 +        static class ZeroException extends RuntimeException {
3998 +            public ZeroException() { super("monadic zero"); }
3999 +        }
4000 +        // "return", "unit"
4001 +        static <T> CompletableFuture<T> unit(T value) {
4002 +            return completedFuture(value);
4003 +        }
4004 +        // monadic zero ?
4005 +        static <T> CompletableFuture<T> zero() {
4006 +            return failedFuture(new ZeroException());
4007 +        }
4008 +        // >=>
4009 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4010 +            (Function<T, CompletableFuture<U>> f,
4011 +             Function<U, CompletableFuture<V>> g) {
4012 +            return (x) -> f.apply(x).thenCompose(g);
4013 +        }
4014 +
4015 +        static void assertZero(CompletableFuture<?> f) {
4016 +            try {
4017 +                f.getNow(null);
4018 +                throw new AssertionFailedError("should throw");
4019 +            } catch (CompletionException success) {
4020 +                assertTrue(success.getCause() instanceof ZeroException);
4021 +            }
4022 +        }
4023 +
4024 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4025 +                                           CompletableFuture<T> g) {
4026 +            T fval = null, gval = null;
4027 +            Throwable fex = null, gex = null;
4028 +
4029 +            try { fval = f.get(); }
4030 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4031 +            catch (Throwable ex) { fex = ex; }
4032 +
4033 +            try { gval = g.get(); }
4034 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4035 +            catch (Throwable ex) { gex = ex; }
4036 +
4037 +            if (fex != null || gex != null)
4038 +                assertSame(fex.getClass(), gex.getClass());
4039 +            else
4040 +                assertEquals(fval, gval);
4041 +        }
4042 +
4043 +        static class PlusFuture<T> extends CompletableFuture<T> {
4044 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4045 +        }
4046 +
4047 +        /** Implements "monadic plus". */
4048 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4049 +                                             CompletableFuture<? extends T> g) {
4050 +            PlusFuture<T> plus = new PlusFuture<T>();
4051 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4052 +                try {
4053 +                    if (ex == null) {
4054 +                        if (plus.complete(result))
4055 +                            if (plus.firstFailure.get() != null)
4056 +                                plus.firstFailure.set(null);
4057 +                    }
4058 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4059 +                        if (plus.isDone())
4060 +                            plus.firstFailure.set(null);
4061 +                    }
4062 +                    else {
4063 +                        // first failure has precedence
4064 +                        Throwable first = plus.firstFailure.getAndSet(null);
4065 +
4066 +                        // may fail with "Self-suppression not permitted"
4067 +                        try { first.addSuppressed(ex); }
4068 +                        catch (Exception ignored) {}
4069 +
4070 +                        plus.completeExceptionally(first);
4071 +                    }
4072 +                } catch (Throwable unexpected) {
4073 +                    plus.completeExceptionally(unexpected);
4074 +                }
4075 +            };
4076 +            f.whenComplete(action);
4077 +            g.whenComplete(action);
4078 +            return plus;
4079 +        }
4080 +    }
4081 +
4082 +    /**
4083 +     * CompletableFuture is an additive monad - sort of.
4084 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4085 +     */
4086 +    public void testAdditiveMonad() throws Throwable {
4087 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4088 +        CompletableFuture<Long> zero = Monad.zero();
4089 +
4090 +        // Some mutually non-commutative functions
4091 +        Function<Long, CompletableFuture<Long>> triple
4092 +            = (x) -> Monad.unit(3 * x);
4093 +        Function<Long, CompletableFuture<Long>> inc
4094 +            = (x) -> Monad.unit(x + 1);
4095 +
4096 +        // unit is a right identity: m >>= unit === m
4097 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4098 +                                 inc.apply(5L));
4099 +        // unit is a left identity: (unit x) >>= f === f x
4100 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4101 +                                 inc.apply(5L));
4102 +
4103 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4104 +        Monad.assertFutureEquals(
4105 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4106 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4107 +
4108 +        // The case for CompletableFuture as an additive monad is weaker...
4109 +
4110 +        // zero is a monadic zero
4111 +        Monad.assertZero(zero);
4112 +
4113 +        // left zero: zero >>= f === zero
4114 +        Monad.assertZero(zero.thenCompose(inc));
4115 +        // right zero: f >>= (\x -> zero) === zero
4116 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4117 +
4118 +        // f plus zero === f
4119 +        Monad.assertFutureEquals(Monad.unit(5L),
4120 +                                 Monad.plus(Monad.unit(5L), zero));
4121 +        // zero plus f === f
4122 +        Monad.assertFutureEquals(Monad.unit(5L),
4123 +                                 Monad.plus(zero, Monad.unit(5L)));
4124 +        // zero plus zero === zero
4125 +        Monad.assertZero(Monad.plus(zero, zero));
4126 +        {
4127 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4128 +                                                   Monad.unit(8L));
4129 +            // non-determinism
4130 +            assertTrue(f.get() == 5L || f.get() == 8L);
4131 +        }
4132 +
4133 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4134 +        // f plus godot === f (doesn't wait for godot)
4135 +        Monad.assertFutureEquals(Monad.unit(5L),
4136 +                                 Monad.plus(Monad.unit(5L), godot));
4137 +        // godot plus f === f (doesn't wait for godot)
4138 +        Monad.assertFutureEquals(Monad.unit(5L),
4139 +                                 Monad.plus(godot, Monad.unit(5L)));
4140 +    }
4141 +
4142 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4143 +    public void testRecursiveChains() throws Throwable {
4144 +        for (ExecutionMode m : ExecutionMode.values())
4145 +        for (boolean addDeadEnds : new boolean[] { true, false })
4146 +    {
4147 +        final int val = 42;
4148 +        final int n = expensiveTests ? 1_000 : 2;
4149 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4150 +        CompletableFuture<Integer> tail = head;
4151 +        for (int i = 0; i < n; i++) {
4152 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4153 +            tail = m.thenApply(tail, v -> v + 1);
4154 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4155 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4156 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4157 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4158 +        }
4159 +        head.complete(val);
4160 +        assertEquals(val + 3 * n, (int) tail.join());
4161 +    }}
4162 +
4163 +    /**
4164 +     * A single CompletableFuture with many dependents.
4165 +     * A demo of scalability - runtime is O(n).
4166 +     */
4167 +    public void testManyDependents() throws Throwable {
4168 +        final int n = expensiveTests ? 1_000_000 : 10;
4169 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4170 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4171 +        final AtomicInteger count = new AtomicInteger(0);
4172 +        for (int i = 0; i < n; i++) {
4173 +            head.thenRun(() -> count.getAndIncrement());
4174 +            head.thenAccept((x) -> count.getAndIncrement());
4175 +            head.thenApply((x) -> count.getAndIncrement());
4176 +
4177 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4178 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4179 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4180 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4181 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4182 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4183 +
4184 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4185 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4186 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4187 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4188 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4189 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4190 +        }
4191 +        head.complete(null);
4192 +        assertEquals(5 * 3 * n, count.get());
4193 +    }
4194 +
4195 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4196 +    public void testCoCompletionGarbageRetention() throws Throwable {
4197 +        final int n = expensiveTests ? 1_000_000 : 10;
4198 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4199 +        CompletableFuture<Integer> f;
4200 +        for (int i = 0; i < n; i++) {
4201 +            f = new CompletableFuture<>();
4202 +            f.runAfterEither(incomplete, () -> {});
4203 +            f.complete(null);
4204 +
4205 +            f = new CompletableFuture<>();
4206 +            f.acceptEither(incomplete, (x) -> {});
4207 +            f.complete(null);
4208 +
4209 +            f = new CompletableFuture<>();
4210 +            f.applyToEither(incomplete, (x) -> x);
4211 +            f.complete(null);
4212 +
4213 +            f = new CompletableFuture<>();
4214 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4215 +            f.complete(null);
4216 +        }
4217 +
4218 +        for (int i = 0; i < n; i++) {
4219 +            f = new CompletableFuture<>();
4220 +            incomplete.runAfterEither(f, () -> {});
4221 +            f.complete(null);
4222 +
4223 +            f = new CompletableFuture<>();
4224 +            incomplete.acceptEither(f, (x) -> {});
4225 +            f.complete(null);
4226 +
4227 +            f = new CompletableFuture<>();
4228 +            incomplete.applyToEither(f, (x) -> x);
4229 +            f.complete(null);
4230 +
4231 +            f = new CompletableFuture<>();
4232 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4233 +            f.complete(null);
4234 +        }
4235 +    }
4236 +
4237 +    /*
4238 +     * Tests below currently fail in stress mode due to memory retention.
4239 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck
4240 +     */
4241 +
4242 +    /** Checks for garbage retention with anyOf. */
4243 +    public void testAnyOfGarbageRetention() throws Throwable {
4244 +        for (Integer v : new Integer[] { 1, null })
4245 +    {
4246 +        final int n = expensiveTests ? 100_000 : 10;
4247 +        CompletableFuture<Integer>[] fs
4248 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4249 +        for (int i = 0; i < fs.length; i++)
4250 +            fs[i] = new CompletableFuture<>();
4251 +        fs[fs.length - 1].complete(v);
4252 +        for (int i = 0; i < n; i++)
4253 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4254 +    }}
4255 +
4256 +    /** Checks for garbage retention with allOf. */
4257 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4258 +        final int n = expensiveTests ? 100_000 : 10;
4259 +        CompletableFuture<Integer>[] fs
4260 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4261 +        for (int i = 0; i < fs.length; i++)
4262 +            fs[i] = new CompletableFuture<>();
4263 +        for (int i = 0; i < n; i++)
4264 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4265 +    }
4266 +
4267 + //     static <U> U join(CompletionStage<U> stage) {
4268 + //         CompletableFuture<U> f = new CompletableFuture<>();
4269 + //         stage.whenComplete((v, ex) -> {
4270 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4271 + //         });
4272 + //         return f.join();
4273 + //     }
4274 +
4275 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4276 + //         CompletableFuture<U> f = new CompletableFuture<>();
4277 + //         stage.whenComplete((v, ex) -> {
4278 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4279 + //         });
4280 + //         return f.isDone();
4281 + //     }
4282 +
4283 + //     static <U> U join2(CompletionStage<U> stage) {
4284 + //         return stage.toCompletableFuture().copy().join();
4285 + //     }
4286 +
4287 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4288 + //         return stage.toCompletableFuture().copy().isDone();
4289 + //     }
4290 +
4291   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines