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.105 by dl, Thu Sep 3 16:30:05 2015 UTC vs.
Revision 1.146 by jsr166, Mon Apr 11 06:31:42 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 28 | Line 38 | import java.util.function.BiConsumer;
38   import java.util.function.BiFunction;
39   import java.util.function.Consumer;
40   import java.util.function.Function;
41 + import java.util.function.Predicate;
42   import java.util.function.Supplier;
43  
44 + import junit.framework.AssertionFailedError;
45   import junit.framework.Test;
46   import junit.framework.TestSuite;
47  
# Line 77 | Line 89 | public class CompletableFutureTest exten
89          assertTrue(f.toString().contains("[Completed normally]"));
90      }
91  
92 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
93 <        long startTime = System.nanoTime();
94 <        long timeoutMillis = LONG_DELAY_MS;
95 <        try {
96 <            f.get(timeoutMillis, MILLISECONDS);
97 <            shouldThrow();
98 <        } catch (ExecutionException success) {
99 <            assertTrue(success.getCause() instanceof CFException);
100 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
101 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
102 <
103 <        try {
104 <            f.join();
105 <            shouldThrow();
106 <        } catch (CompletionException success) {
107 <            assertTrue(success.getCause() instanceof CFException);
108 <        }
97 <        try {
98 <            f.getNow(null);
99 <            shouldThrow();
100 <        } catch (CompletionException success) {
101 <            assertTrue(success.getCause() instanceof CFException);
92 >    /**
93 >     * Returns the "raw" internal exceptional completion of f,
94 >     * without any additional wrapping with CompletionException.
95 >     */
96 >    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
97 >        // handle (and whenComplete) can distinguish between "direct"
98 >        // and "wrapped" exceptional completion
99 >        return f.handle((U u, Throwable t) -> t).join();
100 >    }
101 >
102 >    void checkCompletedExceptionally(CompletableFuture<?> f,
103 >                                     boolean wrapped,
104 >                                     Consumer<Throwable> checker) {
105 >        Throwable cause = exceptionalCompletion(f);
106 >        if (wrapped) {
107 >            assertTrue(cause instanceof CompletionException);
108 >            cause = cause.getCause();
109          }
110 <        try {
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 <    }
110 >        checker.accept(cause);
111  
114    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
115                                                      Throwable ex) {
112          long startTime = System.nanoTime();
117        long timeoutMillis = LONG_DELAY_MS;
113          try {
114 <            f.get(timeoutMillis, MILLISECONDS);
114 >            f.get(LONG_DELAY_MS, MILLISECONDS);
115              shouldThrow();
116          } catch (ExecutionException success) {
117 <            assertSame(ex, success.getCause());
117 >            assertSame(cause, success.getCause());
118          } catch (Throwable fail) { threadUnexpectedException(fail); }
119 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
119 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
120  
121          try {
122              f.join();
123              shouldThrow();
124          } catch (CompletionException success) {
125 <            assertSame(ex, success.getCause());
126 <        }
125 >            assertSame(cause, success.getCause());
126 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
127 >
128          try {
129              f.getNow(null);
130              shouldThrow();
131          } catch (CompletionException success) {
132 <            assertSame(ex, success.getCause());
133 <        }
132 >            assertSame(cause, success.getCause());
133 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
134 >
135          try {
136              f.get();
137              shouldThrow();
138          } catch (ExecutionException success) {
139 <            assertSame(ex, success.getCause());
139 >            assertSame(cause, success.getCause());
140          } catch (Throwable fail) { threadUnexpectedException(fail); }
141  
145        assertTrue(f.isDone());
142          assertFalse(f.isCancelled());
143 +        assertTrue(f.isDone());
144 +        assertTrue(f.isCompletedExceptionally());
145          assertTrue(f.toString().contains("[Completed exceptionally]"));
146      }
147  
148 <    <U> void checkCompletedExceptionallyWithTimeout(CompletableFuture<U> f) {
149 <        long startTime = System.nanoTime();
150 <        long timeoutMillis = LONG_DELAY_MS;
151 <        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 <        }
148 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
149 >        checkCompletedExceptionally(f, true,
150 >            (t) -> assertTrue(t instanceof CFException));
151 >    }
152  
153 <        try {
154 <            f.get();
155 <            shouldThrow();
156 <        } catch (ExecutionException ex) {
179 <            assertTrue(ex.getCause() instanceof TimeoutException);
180 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
153 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
154 >        checkCompletedExceptionally(f, true,
155 >            (t) -> assertTrue(t instanceof CancellationException));
156 >    }
157  
158 <        assertTrue(f.isDone());
159 <        assertFalse(f.isCancelled());
160 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
158 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
159 >        checkCompletedExceptionally(f, false,
160 >            (t) -> assertTrue(t instanceof TimeoutException));
161      }
162  
163 <    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
164 <                                                Throwable ex) {
165 <        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); }
163 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
164 >                                            Throwable ex) {
165 >        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
166      }
167  
168 <    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
169 <        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); }
168 >    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
169 >        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
170      }
171  
172      void checkCancelled(CompletableFuture<?> f) {
173          long startTime = System.nanoTime();
209        long timeoutMillis = LONG_DELAY_MS;
174          try {
175 <            f.get(timeoutMillis, MILLISECONDS);
175 >            f.get(LONG_DELAY_MS, MILLISECONDS);
176              shouldThrow();
177          } catch (CancellationException success) {
178          } catch (Throwable fail) { threadUnexpectedException(fail); }
179 <        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
179 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
180  
181          try {
182              f.join();
# Line 227 | Line 191 | public class CompletableFutureTest exten
191              shouldThrow();
192          } catch (CancellationException success) {
193          } 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    }
194  
195 <    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);
195 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
196  
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); }
197          assertTrue(f.isDone());
266        assertFalse(f.isCancelled());
198          assertTrue(f.isCompletedExceptionally());
199 +        assertTrue(f.isCancelled());
200          assertTrue(f.toString().contains("[Completed exceptionally]"));
201      }
202  
# Line 908 | Line 840 | public class CompletableFutureTest exten
840          if (!createIncomplete) assertTrue(f.complete(v1));
841          final CompletableFuture<Integer> g = f.exceptionally
842              ((Throwable t) -> {
911                // Should not be called
843                  a.getAndIncrement();
844 <                throw new AssertionError();
844 >                threadFail("should not be called");
845 >                return null;            // unreached
846              });
847          if (createIncomplete) assertTrue(f.complete(v1));
848  
# Line 944 | Line 876 | public class CompletableFutureTest exten
876          assertEquals(1, a.get());
877      }}
878  
879 +    /**
880 +     * If an "exceptionally action" throws an exception, it completes
881 +     * exceptionally with that exception
882 +     */
883      public void testExceptionally_exceptionalCompletionActionFailed() {
884          for (boolean createIncomplete : new boolean[] { true, false })
885      {
# Line 962 | Line 898 | public class CompletableFutureTest exten
898          if (createIncomplete) f.completeExceptionally(ex1);
899  
900          checkCompletedWithWrappedException(g, ex2);
901 +        checkCompletedExceptionally(f, ex1);
902          assertEquals(1, a.get());
903      }}
904  
# Line 969 | Line 906 | public class CompletableFutureTest exten
906       * whenComplete action executes on normal completion, propagating
907       * source result.
908       */
909 <    public void testWhenComplete_normalCompletion1() {
909 >    public void testWhenComplete_normalCompletion() {
910          for (ExecutionMode m : ExecutionMode.values())
911          for (boolean createIncomplete : new boolean[] { true, false })
912          for (Integer v1 : new Integer[] { 1, null })
# Line 979 | Line 916 | public class CompletableFutureTest exten
916          if (!createIncomplete) assertTrue(f.complete(v1));
917          final CompletableFuture<Integer> g = m.whenComplete
918              (f,
919 <             (Integer x, Throwable t) -> {
919 >             (Integer result, Throwable t) -> {
920                  m.checkExecutionMode();
921 <                threadAssertSame(x, v1);
921 >                threadAssertSame(result, v1);
922                  threadAssertNull(t);
923                  a.getAndIncrement();
924              });
# Line 1006 | Line 943 | public class CompletableFutureTest exten
943          if (!createIncomplete) f.completeExceptionally(ex);
944          final CompletableFuture<Integer> g = m.whenComplete
945              (f,
946 <             (Integer x, Throwable t) -> {
946 >             (Integer result, Throwable t) -> {
947                  m.checkExecutionMode();
948 <                threadAssertNull(x);
948 >                threadAssertNull(result);
949                  threadAssertSame(t, ex);
950                  a.getAndIncrement();
951              });
# Line 1033 | Line 970 | public class CompletableFutureTest exten
970          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
971          final CompletableFuture<Integer> g = m.whenComplete
972              (f,
973 <             (Integer x, Throwable t) -> {
973 >             (Integer result, Throwable t) -> {
974                  m.checkExecutionMode();
975 <                threadAssertNull(x);
975 >                threadAssertNull(result);
976                  threadAssertTrue(t instanceof CancellationException);
977                  a.getAndIncrement();
978              });
# Line 1050 | Line 987 | public class CompletableFutureTest exten
987       * If a whenComplete action throws an exception when triggered by
988       * a normal completion, it completes exceptionally
989       */
990 <    public void testWhenComplete_actionFailed() {
990 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
991          for (boolean createIncomplete : new boolean[] { true, false })
992          for (ExecutionMode m : ExecutionMode.values())
993          for (Integer v1 : new Integer[] { 1, null })
# Line 1061 | Line 998 | public class CompletableFutureTest exten
998          if (!createIncomplete) assertTrue(f.complete(v1));
999          final CompletableFuture<Integer> g = m.whenComplete
1000              (f,
1001 <             (Integer x, Throwable t) -> {
1001 >             (Integer result, Throwable t) -> {
1002                  m.checkExecutionMode();
1003 <                threadAssertSame(x, v1);
1003 >                threadAssertSame(result, v1);
1004                  threadAssertNull(t);
1005                  a.getAndIncrement();
1006                  throw ex;
# Line 1078 | Line 1015 | public class CompletableFutureTest exten
1015      /**
1016       * If a whenComplete action throws an exception when triggered by
1017       * a source completion that also throws an exception, the source
1018 <     * exception takes precedence.
1018 >     * exception takes precedence (unlike handle)
1019       */
1020 <    public void testWhenComplete_actionFailedSourceFailed() {
1020 >    public void testWhenComplete_sourceFailedActionFailed() {
1021          for (boolean createIncomplete : new boolean[] { true, false })
1022          for (ExecutionMode m : ExecutionMode.values())
1023      {
# Line 1092 | Line 1029 | public class CompletableFutureTest exten
1029          if (!createIncomplete) f.completeExceptionally(ex1);
1030          final CompletableFuture<Integer> g = m.whenComplete
1031              (f,
1032 <             (Integer x, Throwable t) -> {
1032 >             (Integer result, Throwable t) -> {
1033                  m.checkExecutionMode();
1034                  threadAssertSame(t, ex1);
1035 <                threadAssertNull(x);
1035 >                threadAssertNull(result);
1036                  a.getAndIncrement();
1037                  throw ex2;
1038              });
# Line 1103 | Line 1040 | public class CompletableFutureTest exten
1040  
1041          checkCompletedWithWrappedException(g, ex1);
1042          checkCompletedExceptionally(f, ex1);
1043 +        if (testImplementationDetails) {
1044 +            assertEquals(1, ex1.getSuppressed().length);
1045 +            assertSame(ex2, ex1.getSuppressed()[0]);
1046 +        }
1047          assertEquals(1, a.get());
1048      }}
1049  
# Line 1120 | Line 1061 | public class CompletableFutureTest exten
1061          if (!createIncomplete) assertTrue(f.complete(v1));
1062          final CompletableFuture<Integer> g = m.handle
1063              (f,
1064 <             (Integer x, Throwable t) -> {
1064 >             (Integer result, Throwable t) -> {
1065                  m.checkExecutionMode();
1066 <                threadAssertSame(x, v1);
1066 >                threadAssertSame(result, v1);
1067                  threadAssertNull(t);
1068                  a.getAndIncrement();
1069                  return inc(v1);
# Line 1149 | Line 1090 | public class CompletableFutureTest exten
1090          if (!createIncomplete) f.completeExceptionally(ex);
1091          final CompletableFuture<Integer> g = m.handle
1092              (f,
1093 <             (Integer x, Throwable t) -> {
1093 >             (Integer result, Throwable t) -> {
1094                  m.checkExecutionMode();
1095 <                threadAssertNull(x);
1095 >                threadAssertNull(result);
1096                  threadAssertSame(t, ex);
1097                  a.getAndIncrement();
1098                  return v1;
# Line 1178 | Line 1119 | public class CompletableFutureTest exten
1119          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1120          final CompletableFuture<Integer> g = m.handle
1121              (f,
1122 <             (Integer x, Throwable t) -> {
1122 >             (Integer result, Throwable t) -> {
1123                  m.checkExecutionMode();
1124 <                threadAssertNull(x);
1124 >                threadAssertNull(result);
1125                  threadAssertTrue(t instanceof CancellationException);
1126                  a.getAndIncrement();
1127                  return v1;
# Line 1193 | Line 1134 | public class CompletableFutureTest exten
1134      }}
1135  
1136      /**
1137 <     * handle result completes exceptionally if action does
1137 >     * If a "handle action" throws an exception when triggered by
1138 >     * a normal completion, it completes exceptionally
1139       */
1140 <    public void testHandle_sourceFailedActionFailed() {
1140 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1141          for (ExecutionMode m : ExecutionMode.values())
1142          for (boolean createIncomplete : new boolean[] { true, false })
1143 +        for (Integer v1 : new Integer[] { 1, null })
1144      {
1145          final CompletableFuture<Integer> f = new CompletableFuture<>();
1146          final AtomicInteger a = new AtomicInteger(0);
1147 <        final CFException ex1 = new CFException();
1148 <        final CFException ex2 = new CFException();
1206 <        if (!createIncomplete) f.completeExceptionally(ex1);
1147 >        final CFException ex = new CFException();
1148 >        if (!createIncomplete) assertTrue(f.complete(v1));
1149          final CompletableFuture<Integer> g = m.handle
1150              (f,
1151 <             (Integer x, Throwable t) -> {
1151 >             (Integer result, Throwable t) -> {
1152                  m.checkExecutionMode();
1153 <                threadAssertNull(x);
1154 <                threadAssertSame(ex1, t);
1153 >                threadAssertSame(result, v1);
1154 >                threadAssertNull(t);
1155                  a.getAndIncrement();
1156 <                throw ex2;
1156 >                throw ex;
1157              });
1158 <        if (createIncomplete) f.completeExceptionally(ex1);
1158 >        if (createIncomplete) assertTrue(f.complete(v1));
1159  
1160 <        checkCompletedWithWrappedException(g, ex2);
1161 <        checkCompletedExceptionally(f, ex1);
1160 >        checkCompletedWithWrappedException(g, ex);
1161 >        checkCompletedNormally(f, v1);
1162          assertEquals(1, a.get());
1163      }}
1164  
1165 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1166 <        for (ExecutionMode m : ExecutionMode.values())
1165 >    /**
1166 >     * If a "handle action" throws an exception when triggered by
1167 >     * a source completion that also throws an exception, the action
1168 >     * exception takes precedence (unlike whenComplete)
1169 >     */
1170 >    public void testHandle_sourceFailedActionFailed() {
1171          for (boolean createIncomplete : new boolean[] { true, false })
1172 <        for (Integer v1 : new Integer[] { 1, null })
1172 >        for (ExecutionMode m : ExecutionMode.values())
1173      {
1228        final CompletableFuture<Integer> f = new CompletableFuture<>();
1174          final AtomicInteger a = new AtomicInteger(0);
1175 <        final CFException ex = new CFException();
1176 <        if (!createIncomplete) assertTrue(f.complete(v1));
1175 >        final CFException ex1 = new CFException();
1176 >        final CFException ex2 = new CFException();
1177 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 >
1179 >        if (!createIncomplete) f.completeExceptionally(ex1);
1180          final CompletableFuture<Integer> g = m.handle
1181              (f,
1182 <             (Integer x, Throwable t) -> {
1182 >             (Integer result, Throwable t) -> {
1183                  m.checkExecutionMode();
1184 <                threadAssertSame(x, v1);
1185 <                threadAssertNull(t);
1184 >                threadAssertNull(result);
1185 >                threadAssertSame(ex1, t);
1186                  a.getAndIncrement();
1187 <                throw ex;
1187 >                throw ex2;
1188              });
1189 <        if (createIncomplete) assertTrue(f.complete(v1));
1189 >        if (createIncomplete) f.completeExceptionally(ex1);
1190  
1191 <        checkCompletedWithWrappedException(g, ex);
1192 <        checkCompletedNormally(f, v1);
1191 >        checkCompletedWithWrappedException(g, ex2);
1192 >        checkCompletedExceptionally(f, ex1);
1193          assertEquals(1, a.get());
1194      }}
1195  
# Line 3142 | Line 3090 | public class CompletableFutureTest exten
3090              for (int i = 0; i < k; i++) {
3091                  checkIncomplete(f);
3092                  checkIncomplete(CompletableFuture.allOf(fs));
3093 <                if (i != k/2) {
3093 >                if (i != k / 2) {
3094                      fs[i].complete(i);
3095                      checkCompletedNormally(fs[i], i);
3096                  } else {
# Line 3333 | Line 3281 | public class CompletableFutureTest exten
3281              () -> f.exceptionally(null),
3282  
3283              () -> f.handle(null),
3284 +
3285              () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3286              () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3287              () -> CompletableFuture.allOf(f, null),
# Line 3344 | Line 3293 | public class CompletableFutureTest exten
3293              () -> CompletableFuture.anyOf(null, f),
3294  
3295              () -> f.obtrudeException(null),
3296 +
3297 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3298 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3299 +            () -> CompletableFuture.delayedExecutor(1L, null),
3300 +
3301 +            () -> f.orTimeout(1L, null),
3302 +            () -> f.completeOnTimeout(42, 1L, null),
3303 +
3304 +            () -> CompletableFuture.failedFuture(null),
3305 +            () -> CompletableFuture.failedStage(null),
3306          };
3307  
3308          assertThrows(NullPointerException.class, throwingActions);
# Line 3364 | Line 3323 | public class CompletableFutureTest exten
3323       * newIncompleteFuture returns an incomplete CompletableFuture
3324       */
3325      public void testNewIncompleteFuture() {
3326 +        for (Integer v1 : new Integer[] { 1, null })
3327 +    {
3328          CompletableFuture<Integer> f = new CompletableFuture<>();
3329          CompletableFuture<Integer> g = f.newIncompleteFuture();
3330          checkIncomplete(f);
3331          checkIncomplete(g);
3332 <    }
3332 >        f.complete(v1);
3333 >        checkCompletedNormally(f, v1);
3334 >        checkIncomplete(g);
3335 >        g.complete(v1);
3336 >        checkCompletedNormally(g, v1);
3337 >        assertSame(g.getClass(), CompletableFuture.class);
3338 >    }}
3339  
3340      /**
3341       * completedStage returns a completed CompletionStage
3342       */
3343      public void testCompletedStage() {
3344 <        AtomicInteger x = new AtomicInteger();
3344 >        AtomicInteger x = new AtomicInteger(0);
3345          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3346          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3347          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
# Line 3384 | Line 3351 | public class CompletableFutureTest exten
3351  
3352      /**
3353       * defaultExecutor by default returns the commonPool if
3354 <     * it supports at least one thread.
3354 >     * it supports more than one thread.
3355       */
3356      public void testDefaultExecutor() {
3357          CompletableFuture<Integer> f = new CompletableFuture<>();
3358          Executor e = f.defaultExecutor();
3359 <        Executor c =  ForkJoinPool.commonPool();
3359 >        Executor c = ForkJoinPool.commonPool();
3360          if (ForkJoinPool.getCommonPoolParallelism() > 1)
3361              assertSame(e, c);
3362 +        else
3363 +            assertNotSame(e, c);
3364      }
3365  
3366      /**
# Line 3401 | Line 3370 | public class CompletableFutureTest exten
3370      public void testFailedFuture() {
3371          CFException ex = new CFException();
3372          CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3373 <        checkCompletedExceptionallyWithRootCause(f, ex);
3373 >        checkCompletedExceptionally(f, ex);
3374      }
3375  
3376      /**
3377       * failedFuture(null) throws NPE
3378       */
3379 <    public void testFailedFuture2() {
3379 >    public void testFailedFuture_null() {
3380          try {
3381              CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3382              shouldThrow();
# Line 3440 | Line 3409 | public class CompletableFutureTest exten
3409          CFException ex = new CFException();
3410          f.completeExceptionally(ex);
3411          checkCompletedExceptionally(f, ex);
3412 <        checkCompletedWithWrappedCFException(g);
3412 >        checkCompletedWithWrappedException(g, ex);
3413      }
3414  
3415      /**
# Line 3450 | Line 3419 | public class CompletableFutureTest exten
3419      public void testMinimalCompletionStage() {
3420          CompletableFuture<Integer> f = new CompletableFuture<>();
3421          CompletionStage<Integer> g = f.minimalCompletionStage();
3422 <        AtomicInteger x = new AtomicInteger();
3422 >        AtomicInteger x = new AtomicInteger(0);
3423          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3424          checkIncomplete(f);
3425          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
# Line 3467 | Line 3436 | public class CompletableFutureTest exten
3436      public void testMinimalCompletionStage2() {
3437          CompletableFuture<Integer> f = new CompletableFuture<>();
3438          CompletionStage<Integer> g = f.minimalCompletionStage();
3439 <        AtomicInteger x = new AtomicInteger();
3439 >        AtomicInteger x = new AtomicInteger(0);
3440          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3441          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3442          checkIncomplete(f);
# Line 3479 | Line 3448 | public class CompletableFutureTest exten
3448      }
3449  
3450      /**
3451 <     * failedStage returns a Completionstage completed
3451 >     * failedStage returns a CompletionStage completed
3452       * exceptionally with the given Exception
3453       */
3454      public void testFailedStage() {
3455          CFException ex = new CFException();
3456          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3457 <        AtomicInteger x = new AtomicInteger();
3457 >        AtomicInteger x = new AtomicInteger(0);
3458          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3459          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3460          assertEquals(x.get(), 0);
3461 <        assertEquals(r.get().getCause(), ex);
3461 >        assertEquals(r.get(), ex);
3462      }
3463  
3464      /**
3465       * completeAsync completes with value of given supplier
3466       */
3467      public void testCompleteAsync() {
3468 +        for (Integer v1 : new Integer[] { 1, null })
3469 +    {
3470          CompletableFuture<Integer> f = new CompletableFuture<>();
3471 <        f.completeAsync(() -> 1);
3471 >        f.completeAsync(() -> v1);
3472          f.join();
3473 <        checkCompletedNormally(f, 1);
3474 <    }
3473 >        checkCompletedNormally(f, v1);
3474 >    }}
3475  
3476      /**
3477       * completeAsync completes exceptionally if given supplier throws
# Line 3512 | Line 3483 | public class CompletableFutureTest exten
3483          try {
3484              f.join();
3485              shouldThrow();
3486 <        } catch (Exception success) {}
3487 <        checkCompletedWithWrappedCFException(f);
3486 >        } catch (CompletionException success) {}
3487 >        checkCompletedWithWrappedException(f, ex);
3488      }
3489  
3490      /**
3491       * completeAsync with given executor completes with value of given supplier
3492       */
3493      public void testCompleteAsync3() {
3494 +        for (Integer v1 : new Integer[] { 1, null })
3495 +    {
3496          CompletableFuture<Integer> f = new CompletableFuture<>();
3497 <        f.completeAsync(() -> 1, new ThreadExecutor());
3498 <        f.join();
3499 <        checkCompletedNormally(f, 1);
3500 <    }
3497 >        ThreadExecutor executor = new ThreadExecutor();
3498 >        f.completeAsync(() -> v1, executor);
3499 >        assertSame(v1, f.join());
3500 >        checkCompletedNormally(f, v1);
3501 >        assertEquals(1, executor.count.get());
3502 >    }}
3503  
3504      /**
3505       * completeAsync with given executor completes exceptionally if
# Line 3533 | Line 3508 | public class CompletableFutureTest exten
3508      public void testCompleteAsync4() {
3509          CompletableFuture<Integer> f = new CompletableFuture<>();
3510          CFException ex = new CFException();
3511 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, new ThreadExecutor());
3511 >        ThreadExecutor executor = new ThreadExecutor();
3512 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3513          try {
3514              f.join();
3515              shouldThrow();
3516 <        } catch (Exception success) {}
3517 <        checkCompletedWithWrappedCFException(f);
3516 >        } catch (CompletionException success) {}
3517 >        checkCompletedWithWrappedException(f, ex);
3518 >        assertEquals(1, executor.count.get());
3519      }
3520  
3521      /**
3522 <     *  orTimeout completes with TimeoutException if not complete
3522 >     * orTimeout completes with TimeoutException if not complete
3523       */
3524 <    public void testOrTimeout() {
3524 >    public void testOrTimeout_timesOut() {
3525 >        long timeoutMillis = timeoutMillis();
3526          CompletableFuture<Integer> f = new CompletableFuture<>();
3527 <        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3528 <        checkCompletedExceptionallyWithTimeout(f);
3527 >        long startTime = System.nanoTime();
3528 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3529 >        checkCompletedWithTimeoutException(f);
3530 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3531      }
3532  
3533      /**
3534 <     *  orTimeout completes normally if completed before timeout
3534 >     * orTimeout completes normally if completed before timeout
3535       */
3536 <    public void testOrTimeout2() {
3536 >    public void testOrTimeout_completed() {
3537 >        for (Integer v1 : new Integer[] { 1, null })
3538 >    {
3539          CompletableFuture<Integer> f = new CompletableFuture<>();
3540 <        f.complete(1);
3541 <        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3542 <        checkCompletedNormally(f, 1);
3543 <    }
3540 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3541 >        long startTime = System.nanoTime();
3542 >        f.complete(v1);
3543 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3544 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3545 >        g.complete(v1);
3546 >        checkCompletedNormally(f, v1);
3547 >        checkCompletedNormally(g, v1);
3548 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3549 >    }}
3550  
3551      /**
3552 <     *  completeOnTimeout completes with given value if not complete
3552 >     * completeOnTimeout completes with given value if not complete
3553       */
3554 <    public void testCompleteOnTimeout() {
3555 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3556 <        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3569 <        f.join();
3570 <        checkCompletedNormally(f, -1);
3554 >    public void testCompleteOnTimeout_timesOut() {
3555 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3556 >                       () -> testCompleteOnTimeout_timesOut(null));
3557      }
3558  
3559      /**
3560 <     *  completeOnTimeout has no effect if completed within timeout
3560 >     * completeOnTimeout completes with given value if not complete
3561       */
3562 <    public void testCompleteOnTimeout2() {
3562 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3563 >        long timeoutMillis = timeoutMillis();
3564          CompletableFuture<Integer> f = new CompletableFuture<>();
3565 <        f.complete(1);
3566 <        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3567 <        checkCompletedNormally(f, 1);
3565 >        long startTime = System.nanoTime();
3566 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3567 >        assertSame(v, f.join());
3568 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3569 >        f.complete(99);         // should have no effect
3570 >        checkCompletedNormally(f, v);
3571      }
3572  
3573      /**
3574 <     * delayedExecutor returns an executor that delays submission
3574 >     * completeOnTimeout has no effect if completed within timeout
3575       */
3576 <    public void testDelayedExecutor() {
3577 <        long timeoutMillis = SMALL_DELAY_MS;
3578 <        Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3579 <                                                       MILLISECONDS);
3576 >    public void testCompleteOnTimeout_completed() {
3577 >        for (Integer v1 : new Integer[] { 1, null })
3578 >    {
3579 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3580 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3581          long startTime = System.nanoTime();
3582 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3583 <        assertNull(f.getNow(null));
3584 <        try {
3585 <            f.get(LONG_DELAY_MS, MILLISECONDS);
3586 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
3587 <        assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3588 <        checkCompletedNormally(f, 1);
3589 <    }
3582 >        f.complete(v1);
3583 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3584 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3585 >        g.complete(v1);
3586 >        checkCompletedNormally(f, v1);
3587 >        checkCompletedNormally(g, v1);
3588 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3589 >    }}
3590  
3591      /**
3592 <     * delayedExecutor for a given executor returns an executor that
3602 <     * delays submission
3592 >     * delayedExecutor returns an executor that delays submission
3593       */
3594 <    public void testDelayedExecutor2() {
3595 <        long timeoutMillis = SMALL_DELAY_MS;
3596 <        Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3597 <                                                       MILLISECONDS,
3598 <                                                       new ThreadExecutor());
3594 >    public void testDelayedExecutor() {
3595 >        testInParallel(() -> testDelayedExecutor(null, null),
3596 >                       () -> testDelayedExecutor(null, 1),
3597 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3598 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3599 >    }
3600 >
3601 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3602 >        long timeoutMillis = timeoutMillis();
3603 >        // Use an "unreasonably long" long timeout to catch lingering threads
3604 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3605 >        final Executor delayer, longDelayer;
3606 >        if (executor == null) {
3607 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3608 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3609 >        } else {
3610 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3611 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3612 >        }
3613          long startTime = System.nanoTime();
3614 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3615 <        assertNull(f.getNow(null));
3616 <        try {
3617 <            f.get(LONG_DELAY_MS, MILLISECONDS);
3618 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
3619 <        assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3620 <        checkCompletedNormally(f, 1);
3614 >        CompletableFuture<Integer> f =
3615 >            CompletableFuture.supplyAsync(() -> v, delayer);
3616 >        CompletableFuture<Integer> g =
3617 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3618 >
3619 >        assertNull(g.getNow(null));
3620 >
3621 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3622 >        long millisElapsed = millisElapsedSince(startTime);
3623 >        assertTrue(millisElapsed >= timeoutMillis);
3624 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3625 >
3626 >        checkCompletedNormally(f, v);
3627 >
3628 >        checkIncomplete(g);
3629 >        assertTrue(g.cancel(true));
3630      }
3631  
3632      //--- tests of implementation details; not part of official tck ---
# Line 3650 | Line 3663 | public class CompletableFutureTest exten
3663          funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3664          funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3665  
3666 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3666 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3667  
3668          funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3669  
# Line 3706 | Line 3719 | public class CompletableFutureTest exten
3719          }
3720      }}
3721  
3722 +    /**
3723 +     * Minimal completion stages throw UOE for all non-CompletionStage methods
3724 +     */
3725 +    public void testMinimalCompletionStage_minimality() {
3726 +        if (!testImplementationDetails) return;
3727 +        Function<Method, String> toSignature =
3728 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3729 +        Predicate<Method> isNotStatic =
3730 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3731 +        List<Method> minimalMethods =
3732 +            Stream.of(Object.class, CompletionStage.class)
3733 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3734 +            .filter(isNotStatic)
3735 +            .collect(Collectors.toList());
3736 +        // Methods from CompletableFuture permitted NOT to throw UOE
3737 +        String[] signatureWhitelist = {
3738 +            "newIncompleteFuture[]",
3739 +            "defaultExecutor[]",
3740 +            "minimalCompletionStage[]",
3741 +            "copy[]",
3742 +        };
3743 +        Set<String> permittedMethodSignatures =
3744 +            Stream.concat(minimalMethods.stream().map(toSignature),
3745 +                          Stream.of(signatureWhitelist))
3746 +            .collect(Collectors.toSet());
3747 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3748 +            .filter(isNotStatic)
3749 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3750 +            .collect(Collectors.toList());
3751 +
3752 +        CompletionStage<Integer> minimalStage =
3753 +            new CompletableFuture<Integer>().minimalCompletionStage();
3754 +
3755 +        List<Method> bugs = new ArrayList<>();
3756 +        for (Method method : allMethods) {
3757 +            Class<?>[] parameterTypes = method.getParameterTypes();
3758 +            Object[] args = new Object[parameterTypes.length];
3759 +            // Manufacture boxed primitives for primitive params
3760 +            for (int i = 0; i < args.length; i++) {
3761 +                Class<?> type = parameterTypes[i];
3762 +                if (parameterTypes[i] == boolean.class)
3763 +                    args[i] = false;
3764 +                else if (parameterTypes[i] == int.class)
3765 +                    args[i] = 0;
3766 +                else if (parameterTypes[i] == long.class)
3767 +                    args[i] = 0L;
3768 +            }
3769 +            try {
3770 +                method.invoke(minimalStage, args);
3771 +                bugs.add(method);
3772 +            }
3773 +            catch (java.lang.reflect.InvocationTargetException expected) {
3774 +                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3775 +                    bugs.add(method);
3776 +                    // expected.getCause().printStackTrace();
3777 +                }
3778 +            }
3779 +            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3780 +        }
3781 +        if (!bugs.isEmpty())
3782 +            throw new Error("Methods did not throw UOE: " + bugs.toString());
3783 +    }
3784 +
3785 +    static class Monad {
3786 +        static class ZeroException extends RuntimeException {
3787 +            public ZeroException() { super("monadic zero"); }
3788 +        }
3789 +        // "return", "unit"
3790 +        static <T> CompletableFuture<T> unit(T value) {
3791 +            return completedFuture(value);
3792 +        }
3793 +        // monadic zero ?
3794 +        static <T> CompletableFuture<T> zero() {
3795 +            return failedFuture(new ZeroException());
3796 +        }
3797 +        // >=>
3798 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
3799 +            (Function<T, CompletableFuture<U>> f,
3800 +             Function<U, CompletableFuture<V>> g) {
3801 +            return (x) -> f.apply(x).thenCompose(g);
3802 +        }
3803 +
3804 +        static void assertZero(CompletableFuture<?> f) {
3805 +            try {
3806 +                f.getNow(null);
3807 +                throw new AssertionFailedError("should throw");
3808 +            } catch (CompletionException success) {
3809 +                assertTrue(success.getCause() instanceof ZeroException);
3810 +            }
3811 +        }
3812 +
3813 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
3814 +                                           CompletableFuture<T> g) {
3815 +            T fval = null, gval = null;
3816 +            Throwable fex = null, gex = null;
3817 +
3818 +            try { fval = f.get(); }
3819 +            catch (ExecutionException ex) { fex = ex.getCause(); }
3820 +            catch (Throwable ex) { fex = ex; }
3821 +
3822 +            try { gval = g.get(); }
3823 +            catch (ExecutionException ex) { gex = ex.getCause(); }
3824 +            catch (Throwable ex) { gex = ex; }
3825 +
3826 +            if (fex != null || gex != null)
3827 +                assertSame(fex.getClass(), gex.getClass());
3828 +            else
3829 +                assertEquals(fval, gval);
3830 +        }
3831 +
3832 +        static class PlusFuture<T> extends CompletableFuture<T> {
3833 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
3834 +        }
3835 +
3836 +        /** Implements "monadic plus". */
3837 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
3838 +                                             CompletableFuture<? extends T> g) {
3839 +            PlusFuture<T> plus = new PlusFuture<T>();
3840 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
3841 +                try {
3842 +                    if (ex == null) {
3843 +                        if (plus.complete(result))
3844 +                            if (plus.firstFailure.get() != null)
3845 +                                plus.firstFailure.set(null);
3846 +                    }
3847 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
3848 +                        if (plus.isDone())
3849 +                            plus.firstFailure.set(null);
3850 +                    }
3851 +                    else {
3852 +                        // first failure has precedence
3853 +                        Throwable first = plus.firstFailure.getAndSet(null);
3854 +
3855 +                        // may fail with "Self-suppression not permitted"
3856 +                        try { first.addSuppressed(ex); }
3857 +                        catch (Exception ignored) {}
3858 +
3859 +                        plus.completeExceptionally(first);
3860 +                    }
3861 +                } catch (Throwable unexpected) {
3862 +                    plus.completeExceptionally(unexpected);
3863 +                }
3864 +            };
3865 +            f.whenComplete(action);
3866 +            g.whenComplete(action);
3867 +            return plus;
3868 +        }
3869 +    }
3870 +
3871 +    /**
3872 +     * CompletableFuture is an additive monad - sort of.
3873 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
3874 +     */
3875 +    public void testAdditiveMonad() throws Throwable {
3876 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
3877 +        CompletableFuture<Long> zero = Monad.zero();
3878 +
3879 +        // Some mutually non-commutative functions
3880 +        Function<Long, CompletableFuture<Long>> triple
3881 +            = (x) -> Monad.unit(3 * x);
3882 +        Function<Long, CompletableFuture<Long>> inc
3883 +            = (x) -> Monad.unit(x + 1);
3884 +
3885 +        // unit is a right identity: m >>= unit === m
3886 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
3887 +                                 inc.apply(5L));
3888 +        // unit is a left identity: (unit x) >>= f === f x
3889 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
3890 +                                 inc.apply(5L));
3891 +
3892 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
3893 +        Monad.assertFutureEquals(
3894 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
3895 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
3896 +
3897 +        // The case for CompletableFuture as an additive monad is weaker...
3898 +
3899 +        // zero is a monadic zero
3900 +        Monad.assertZero(zero);
3901 +
3902 +        // left zero: zero >>= f === zero
3903 +        Monad.assertZero(zero.thenCompose(inc));
3904 +        // right zero: f >>= (\x -> zero) === zero
3905 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
3906 +
3907 +        // f plus zero === f
3908 +        Monad.assertFutureEquals(Monad.unit(5L),
3909 +                                 Monad.plus(Monad.unit(5L), zero));
3910 +        // zero plus f === f
3911 +        Monad.assertFutureEquals(Monad.unit(5L),
3912 +                                 Monad.plus(zero, Monad.unit(5L)));
3913 +        // zero plus zero === zero
3914 +        Monad.assertZero(Monad.plus(zero, zero));
3915 +        {
3916 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
3917 +                                                   Monad.unit(8L));
3918 +            // non-determinism
3919 +            assertTrue(f.get() == 5L || f.get() == 8L);
3920 +        }
3921 +
3922 +        CompletableFuture<Long> godot = new CompletableFuture<>();
3923 +        // f plus godot === f (doesn't wait for godot)
3924 +        Monad.assertFutureEquals(Monad.unit(5L),
3925 +                                 Monad.plus(Monad.unit(5L), godot));
3926 +        // godot plus f === f (doesn't wait for godot)
3927 +        Monad.assertFutureEquals(Monad.unit(5L),
3928 +                                 Monad.plus(godot, Monad.unit(5L)));
3929 +    }
3930 +
3931 +    /**
3932 +     * A single CompletableFuture with many dependents.
3933 +     * A demo of scalability - runtime is O(n).
3934 +     */
3935 +    public void testManyDependents() throws Throwable {
3936 +        final int n = 1_000;
3937 +        final CompletableFuture<Void> head = new CompletableFuture<>();
3938 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
3939 +        final AtomicInteger count = new AtomicInteger(0);
3940 +        for (int i = 0; i < n; i++) {
3941 +            head.thenRun(() -> count.getAndIncrement());
3942 +            head.thenAccept((x) -> count.getAndIncrement());
3943 +            head.thenApply((x) -> count.getAndIncrement());
3944 +
3945 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
3946 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
3947 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
3948 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
3949 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
3950 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
3951 +
3952 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
3953 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
3954 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
3955 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
3956 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
3957 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
3958 +        }
3959 +        head.complete(null);
3960 +        assertEquals(5 * 3 * n, count.get());
3961 +    }
3962 +
3963 + //     static <U> U join(CompletionStage<U> stage) {
3964 + //         CompletableFuture<U> f = new CompletableFuture<>();
3965 + //         stage.whenComplete((v, ex) -> {
3966 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3967 + //         });
3968 + //         return f.join();
3969 + //     }
3970 +
3971 + //     static <U> boolean isDone(CompletionStage<U> stage) {
3972 + //         CompletableFuture<U> f = new CompletableFuture<>();
3973 + //         stage.whenComplete((v, ex) -> {
3974 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3975 + //         });
3976 + //         return f.isDone();
3977 + //     }
3978 +
3979 + //     static <U> U join2(CompletionStage<U> stage) {
3980 + //         return stage.toCompletableFuture().copy().join();
3981 + //     }
3982 +
3983 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
3984 + //         return stage.toCompletableFuture().copy().isDone();
3985 + //     }
3986 +
3987   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines