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.87 by jsr166, Mon Jun 16 21:14:16 2014 UTC vs.
Revision 1.151 by jsr166, Sun Jun 26 17:45:35 2016 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 > import static java.util.concurrent.CompletableFuture.completedFuture;
11 > import static java.util.concurrent.CompletableFuture.failedFuture;
12 >
13 > import java.lang.reflect.Method;
14 > import java.lang.reflect.Modifier;
15 >
16 > import java.util.stream.Collectors;
17 > import java.util.stream.Stream;
18 >
19 > import java.util.ArrayList;
20 > import java.util.Arrays;
21 > import java.util.List;
22 > import java.util.Objects;
23 > import java.util.Set;
24   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
25   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
26   import java.util.concurrent.CompletableFuture;
27   import java.util.concurrent.CompletionException;
28   import java.util.concurrent.CompletionStage;
29 + import java.util.concurrent.ExecutionException;
30 + import java.util.concurrent.Executor;
31   import java.util.concurrent.ForkJoinPool;
32   import java.util.concurrent.ForkJoinTask;
33   import java.util.concurrent.TimeoutException;
34 + import java.util.concurrent.TimeUnit;
35   import java.util.concurrent.atomic.AtomicInteger;
36 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 < import static java.util.concurrent.TimeUnit.SECONDS;
26 < import java.util.*;
27 < import java.util.function.Supplier;
28 < import java.util.function.Consumer;
36 > import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
30 import java.util.function.Function;
38   import java.util.function.BiFunction;
39 + import java.util.function.Consumer;
40 + import java.util.function.Function;
41 + import java.util.function.Predicate;
42 + import java.util.function.Supplier;
43 +
44 + import junit.framework.AssertionFailedError;
45 + import junit.framework.Test;
46 + import junit.framework.TestSuite;
47  
48   public class CompletableFutureTest extends JSR166TestCase {
49  
50      public static void main(String[] args) {
51 <        junit.textui.TestRunner.run(suite());
51 >        main(suite(), args);
52      }
53      public static Test suite() {
54          return new TestSuite(CompletableFutureTest.class);
# Line 44 | Line 59 | public class CompletableFutureTest exten
59      void checkIncomplete(CompletableFuture<?> f) {
60          assertFalse(f.isDone());
61          assertFalse(f.isCancelled());
62 <        assertTrue(f.toString().contains("[Not completed]"));
62 >        assertTrue(f.toString().contains("Not completed"));
63          try {
64              assertNull(f.getNow(null));
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 57 | Line 72 | public class CompletableFutureTest exten
72      }
73  
74      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
75 <        try {
76 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
75 >        checkTimedGet(f, value);
76 >
77          try {
78              assertEquals(value, f.join());
79          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 75 | Line 89 | public class CompletableFutureTest exten
89          assertTrue(f.toString().contains("[Completed normally]"));
90      }
91  
92 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
93 <        try {
94 <            f.get(LONG_DELAY_MS, MILLISECONDS);
95 <            shouldThrow();
96 <        } catch (ExecutionException success) {
97 <            assertTrue(success.getCause() instanceof CFException);
98 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
99 <        try {
100 <            f.join();
101 <            shouldThrow();
102 <        } catch (CompletionException success) {
103 <            assertTrue(success.getCause() instanceof CFException);
104 <        }
105 <        try {
106 <            f.getNow(null);
107 <            shouldThrow();
108 <        } catch (CompletionException success) {
95 <            assertTrue(success.getCause() instanceof CFException);
92 >    /**
93 >     * Returns the "raw" internal exceptional completion of f,
94 >     * without any additional wrapping with CompletionException.
95 >     */
96 >    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
97 >        // handle (and whenComplete) can distinguish between "direct"
98 >        // and "wrapped" exceptional completion
99 >        return f.handle((U u, Throwable t) -> t).join();
100 >    }
101 >
102 >    void checkCompletedExceptionally(CompletableFuture<?> f,
103 >                                     boolean wrapped,
104 >                                     Consumer<Throwable> checker) {
105 >        Throwable cause = exceptionalCompletion(f);
106 >        if (wrapped) {
107 >            assertTrue(cause instanceof CompletionException);
108 >            cause = cause.getCause();
109          }
110 <        try {
98 <            f.get();
99 <            shouldThrow();
100 <        } catch (ExecutionException success) {
101 <            assertTrue(success.getCause() instanceof CFException);
102 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
103 <        assertTrue(f.isDone());
104 <        assertFalse(f.isCancelled());
105 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
106 <    }
110 >        checker.accept(cause);
111  
112 <    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 <                                                      Throwable ex) {
112 >        long startTime = System.nanoTime();
113          try {
114              f.get(LONG_DELAY_MS, MILLISECONDS);
115              shouldThrow();
116          } catch (ExecutionException success) {
117 <            assertSame(ex, success.getCause());
117 >            assertSame(cause, success.getCause());
118          } catch (Throwable fail) { threadUnexpectedException(fail); }
119 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
120 +
121          try {
122              f.join();
123              shouldThrow();
124          } catch (CompletionException success) {
125 <            assertSame(ex, success.getCause());
126 <        }
125 >            assertSame(cause, success.getCause());
126 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
127 >
128          try {
129              f.getNow(null);
130              shouldThrow();
131          } catch (CompletionException success) {
132 <            assertSame(ex, success.getCause());
133 <        }
132 >            assertSame(cause, success.getCause());
133 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
134 >
135          try {
136              f.get();
137              shouldThrow();
138          } catch (ExecutionException success) {
139 <            assertSame(ex, success.getCause());
139 >            assertSame(cause, success.getCause());
140          } catch (Throwable fail) { threadUnexpectedException(fail); }
141  
135        assertTrue(f.isDone());
142          assertFalse(f.isCancelled());
143 +        assertTrue(f.isDone());
144 +        assertTrue(f.isCompletedExceptionally());
145          assertTrue(f.toString().contains("[Completed exceptionally]"));
146      }
147  
148 <    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
149 <                                                Throwable ex) {
150 <        checkCompletedExceptionallyWithRootCause(f, ex);
143 <        try {
144 <            CompletableFuture<Throwable> spy = f.handle
145 <                ((U u, Throwable t) -> t);
146 <            assertTrue(spy.join() instanceof CompletionException);
147 <            assertSame(ex, spy.join().getCause());
148 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
148 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
149 >        checkCompletedExceptionally(f, true,
150 >            (t) -> assertTrue(t instanceof CFException));
151      }
152  
153 <    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
154 <        checkCompletedExceptionallyWithRootCause(f, ex);
155 <        try {
156 <            CompletableFuture<Throwable> spy = f.handle
157 <                ((U u, Throwable t) -> t);
158 <            assertSame(ex, spy.join());
159 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
153 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
154 >        checkCompletedExceptionally(f, true,
155 >            (t) -> assertTrue(t instanceof CancellationException));
156 >    }
157 >
158 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
159 >        checkCompletedExceptionally(f, false,
160 >            (t) -> assertTrue(t instanceof TimeoutException));
161 >    }
162 >
163 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
164 >                                            Throwable ex) {
165 >        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
166 >    }
167 >
168 >    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
169 >        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
170      }
171  
172      void checkCancelled(CompletableFuture<?> f) {
173 +        long startTime = System.nanoTime();
174          try {
175              f.get(LONG_DELAY_MS, MILLISECONDS);
176              shouldThrow();
177          } catch (CancellationException success) {
178          } catch (Throwable fail) { threadUnexpectedException(fail); }
179 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
180 +
181          try {
182              f.join();
183              shouldThrow();
# Line 176 | Line 191 | public class CompletableFutureTest exten
191              shouldThrow();
192          } catch (CancellationException success) {
193          } catch (Throwable fail) { threadUnexpectedException(fail); }
179        assertTrue(f.isDone());
180        assertTrue(f.isCompletedExceptionally());
181        assertTrue(f.isCancelled());
182        assertTrue(f.toString().contains("[Completed exceptionally]"));
183    }
194  
195 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
196 <        try {
187 <            f.get(LONG_DELAY_MS, MILLISECONDS);
188 <            shouldThrow();
189 <        } catch (ExecutionException success) {
190 <            assertTrue(success.getCause() instanceof CancellationException);
191 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
192 <        try {
193 <            f.join();
194 <            shouldThrow();
195 <        } catch (CompletionException success) {
196 <            assertTrue(success.getCause() instanceof CancellationException);
197 <        }
198 <        try {
199 <            f.getNow(null);
200 <            shouldThrow();
201 <        } catch (CompletionException success) {
202 <            assertTrue(success.getCause() instanceof CancellationException);
203 <        }
204 <        try {
205 <            f.get();
206 <            shouldThrow();
207 <        } catch (ExecutionException success) {
208 <            assertTrue(success.getCause() instanceof CancellationException);
209 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
195 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
196 >
197          assertTrue(f.isDone());
211        assertFalse(f.isCancelled());
198          assertTrue(f.isCompletedExceptionally());
199 +        assertTrue(f.isCancelled());
200          assertTrue(f.toString().contains("[Completed exceptionally]"));
201      }
202  
# Line 257 | Line 244 | public class CompletableFutureTest exten
244      {
245          CompletableFuture<Integer> f = new CompletableFuture<>();
246          checkIncomplete(f);
247 <        assertTrue(f.cancel(true));
248 <        assertTrue(f.cancel(true));
247 >        assertTrue(f.cancel(mayInterruptIfRunning));
248 >        assertTrue(f.cancel(mayInterruptIfRunning));
249 >        assertTrue(f.cancel(!mayInterruptIfRunning));
250          checkCancelled(f);
251      }}
252  
# Line 471 | Line 459 | public class CompletableFutureTest exten
459      class FailingSupplier extends CheckedAction
460          implements Supplier<Integer>
461      {
462 <        FailingSupplier(ExecutionMode m) { super(m); }
462 >        final CFException ex;
463 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
464          public Integer get() {
465              invoked();
466 <            throw new CFException();
466 >            throw ex;
467          }
468      }
469  
470      class FailingConsumer extends CheckedIntegerAction
471          implements Consumer<Integer>
472      {
473 <        FailingConsumer(ExecutionMode m) { super(m); }
473 >        final CFException ex;
474 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
475          public void accept(Integer x) {
476              invoked();
477              value = x;
478 <            throw new CFException();
478 >            throw ex;
479          }
480      }
481  
482      class FailingBiConsumer extends CheckedIntegerAction
483          implements BiConsumer<Integer, Integer>
484      {
485 <        FailingBiConsumer(ExecutionMode m) { super(m); }
485 >        final CFException ex;
486 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
487          public void accept(Integer x, Integer y) {
488              invoked();
489              value = subtract(x, y);
490 <            throw new CFException();
490 >            throw ex;
491          }
492      }
493  
494      class FailingFunction extends CheckedIntegerAction
495          implements Function<Integer, Integer>
496      {
497 <        FailingFunction(ExecutionMode m) { super(m); }
497 >        final CFException ex;
498 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
499          public Integer apply(Integer x) {
500              invoked();
501              value = x;
502 <            throw new CFException();
502 >            throw ex;
503          }
504      }
505  
506      class FailingBiFunction extends CheckedIntegerAction
507          implements BiFunction<Integer, Integer, Integer>
508      {
509 <        FailingBiFunction(ExecutionMode m) { super(m); }
509 >        final CFException ex;
510 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
511          public Integer apply(Integer x, Integer y) {
512              invoked();
513              value = subtract(x, y);
514 <            throw new CFException();
514 >            throw ex;
515          }
516      }
517  
518      class FailingRunnable extends CheckedAction implements Runnable {
519 <        FailingRunnable(ExecutionMode m) { super(m); }
519 >        final CFException ex;
520 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
521          public void run() {
522              invoked();
523 <            throw new CFException();
523 >            throw ex;
524          }
525      }
526  
533
527      class CompletableFutureInc extends CheckedIntegerAction
528          implements Function<Integer, CompletableFuture<Integer>>
529      {
# Line 547 | Line 540 | public class CompletableFutureTest exten
540      class FailingCompletableFutureFunction extends CheckedIntegerAction
541          implements Function<Integer, CompletableFuture<Integer>>
542      {
543 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
543 >        final CFException ex;
544 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
545          public CompletableFuture<Integer> apply(Integer x) {
546              invoked();
547              value = x;
548 <            throw new CFException();
548 >            throw ex;
549          }
550      }
551  
# Line 569 | Line 563 | public class CompletableFutureTest exten
563          }
564      }
565  
566 +    static final boolean defaultExecutorIsCommonPool
567 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
568 +
569      /**
570       * Permits the testing of parallel code for the 3 different
571       * execution modes without copy/pasting all the test methods.
572       */
573      enum ExecutionMode {
574 <        DEFAULT {
574 >        SYNC {
575              public void checkExecutionMode() {
576                  assertFalse(ThreadExecutor.startedCurrentThread());
577                  assertNull(ForkJoinTask.getPool());
# Line 650 | Line 647 | public class CompletableFutureTest exten
647  
648          ASYNC {
649              public void checkExecutionMode() {
650 <                assertSame(ForkJoinPool.commonPool(),
651 <                           ForkJoinTask.getPool());
650 >                assertEquals(defaultExecutorIsCommonPool,
651 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
652              }
653              public CompletableFuture<Void> runAsync(Runnable a) {
654                  return CompletableFuture.runAsync(a);
# Line 850 | Line 847 | public class CompletableFutureTest exten
847          if (!createIncomplete) assertTrue(f.complete(v1));
848          final CompletableFuture<Integer> g = f.exceptionally
849              ((Throwable t) -> {
853                // Should not be called
850                  a.getAndIncrement();
851 <                throw new AssertionError();
851 >                threadFail("should not be called");
852 >                return null;            // unreached
853              });
854          if (createIncomplete) assertTrue(f.complete(v1));
855  
# Line 875 | Line 872 | public class CompletableFutureTest exten
872          if (!createIncomplete) f.completeExceptionally(ex);
873          final CompletableFuture<Integer> g = f.exceptionally
874              ((Throwable t) -> {
875 <                ExecutionMode.DEFAULT.checkExecutionMode();
875 >                ExecutionMode.SYNC.checkExecutionMode();
876                  threadAssertSame(t, ex);
877                  a.getAndIncrement();
878                  return v1;
# Line 886 | Line 883 | public class CompletableFutureTest exten
883          assertEquals(1, a.get());
884      }}
885  
886 +    /**
887 +     * If an "exceptionally action" throws an exception, it completes
888 +     * exceptionally with that exception
889 +     */
890      public void testExceptionally_exceptionalCompletionActionFailed() {
891          for (boolean createIncomplete : new boolean[] { true, false })
891        for (Integer v1 : new Integer[] { 1, null })
892      {
893          final AtomicInteger a = new AtomicInteger(0);
894          final CFException ex1 = new CFException();
# Line 897 | Line 897 | public class CompletableFutureTest exten
897          if (!createIncomplete) f.completeExceptionally(ex1);
898          final CompletableFuture<Integer> g = f.exceptionally
899              ((Throwable t) -> {
900 <                ExecutionMode.DEFAULT.checkExecutionMode();
900 >                ExecutionMode.SYNC.checkExecutionMode();
901                  threadAssertSame(t, ex1);
902                  a.getAndIncrement();
903                  throw ex2;
# Line 905 | Line 905 | public class CompletableFutureTest exten
905          if (createIncomplete) f.completeExceptionally(ex1);
906  
907          checkCompletedWithWrappedException(g, ex2);
908 +        checkCompletedExceptionally(f, ex1);
909          assertEquals(1, a.get());
910      }}
911  
# Line 912 | Line 913 | public class CompletableFutureTest exten
913       * whenComplete action executes on normal completion, propagating
914       * source result.
915       */
916 <    public void testWhenComplete_normalCompletion1() {
916 >    public void testWhenComplete_normalCompletion() {
917          for (ExecutionMode m : ExecutionMode.values())
918          for (boolean createIncomplete : new boolean[] { true, false })
919          for (Integer v1 : new Integer[] { 1, null })
# Line 922 | Line 923 | public class CompletableFutureTest exten
923          if (!createIncomplete) assertTrue(f.complete(v1));
924          final CompletableFuture<Integer> g = m.whenComplete
925              (f,
926 <             (Integer x, Throwable t) -> {
926 >             (Integer result, Throwable t) -> {
927                  m.checkExecutionMode();
928 <                threadAssertSame(x, v1);
928 >                threadAssertSame(result, v1);
929                  threadAssertNull(t);
930                  a.getAndIncrement();
931              });
# Line 942 | Line 943 | public class CompletableFutureTest exten
943      public void testWhenComplete_exceptionalCompletion() {
944          for (ExecutionMode m : ExecutionMode.values())
945          for (boolean createIncomplete : new boolean[] { true, false })
945        for (Integer v1 : new Integer[] { 1, null })
946      {
947          final AtomicInteger a = new AtomicInteger(0);
948          final CFException ex = new CFException();
# Line 950 | Line 950 | public class CompletableFutureTest exten
950          if (!createIncomplete) f.completeExceptionally(ex);
951          final CompletableFuture<Integer> g = m.whenComplete
952              (f,
953 <             (Integer x, Throwable t) -> {
953 >             (Integer result, Throwable t) -> {
954                  m.checkExecutionMode();
955 <                threadAssertNull(x);
955 >                threadAssertNull(result);
956                  threadAssertSame(t, ex);
957                  a.getAndIncrement();
958              });
# Line 977 | Line 977 | public class CompletableFutureTest exten
977          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978          final CompletableFuture<Integer> g = m.whenComplete
979              (f,
980 <             (Integer x, Throwable t) -> {
980 >             (Integer result, Throwable t) -> {
981                  m.checkExecutionMode();
982 <                threadAssertNull(x);
982 >                threadAssertNull(result);
983                  threadAssertTrue(t instanceof CancellationException);
984                  a.getAndIncrement();
985              });
# Line 994 | Line 994 | public class CompletableFutureTest exten
994       * If a whenComplete action throws an exception when triggered by
995       * a normal completion, it completes exceptionally
996       */
997 <    public void testWhenComplete_actionFailed() {
997 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
998          for (boolean createIncomplete : new boolean[] { true, false })
999          for (ExecutionMode m : ExecutionMode.values())
1000          for (Integer v1 : new Integer[] { 1, null })
# Line 1005 | Line 1005 | public class CompletableFutureTest exten
1005          if (!createIncomplete) assertTrue(f.complete(v1));
1006          final CompletableFuture<Integer> g = m.whenComplete
1007              (f,
1008 <             (Integer x, Throwable t) -> {
1008 >             (Integer result, Throwable t) -> {
1009                  m.checkExecutionMode();
1010 <                threadAssertSame(x, v1);
1010 >                threadAssertSame(result, v1);
1011                  threadAssertNull(t);
1012                  a.getAndIncrement();
1013                  throw ex;
# Line 1022 | Line 1022 | public class CompletableFutureTest exten
1022      /**
1023       * If a whenComplete action throws an exception when triggered by
1024       * a source completion that also throws an exception, the source
1025 <     * exception takes precedence.
1025 >     * exception takes precedence (unlike handle)
1026       */
1027 <    public void testWhenComplete_actionFailedSourceFailed() {
1027 >    public void testWhenComplete_sourceFailedActionFailed() {
1028          for (boolean createIncomplete : new boolean[] { true, false })
1029          for (ExecutionMode m : ExecutionMode.values())
1030        for (Integer v1 : new Integer[] { 1, null })
1030      {
1031          final AtomicInteger a = new AtomicInteger(0);
1032          final CFException ex1 = new CFException();
# Line 1037 | Line 1036 | public class CompletableFutureTest exten
1036          if (!createIncomplete) f.completeExceptionally(ex1);
1037          final CompletableFuture<Integer> g = m.whenComplete
1038              (f,
1039 <             (Integer x, Throwable t) -> {
1039 >             (Integer result, Throwable t) -> {
1040                  m.checkExecutionMode();
1041                  threadAssertSame(t, ex1);
1042 <                threadAssertNull(x);
1042 >                threadAssertNull(result);
1043                  a.getAndIncrement();
1044                  throw ex2;
1045              });
# Line 1048 | Line 1047 | public class CompletableFutureTest exten
1047  
1048          checkCompletedWithWrappedException(g, ex1);
1049          checkCompletedExceptionally(f, ex1);
1050 +        if (testImplementationDetails) {
1051 +            assertEquals(1, ex1.getSuppressed().length);
1052 +            assertSame(ex2, ex1.getSuppressed()[0]);
1053 +        }
1054          assertEquals(1, a.get());
1055      }}
1056  
# Line 1065 | Line 1068 | public class CompletableFutureTest exten
1068          if (!createIncomplete) assertTrue(f.complete(v1));
1069          final CompletableFuture<Integer> g = m.handle
1070              (f,
1071 <             (Integer x, Throwable t) -> {
1071 >             (Integer result, Throwable t) -> {
1072                  m.checkExecutionMode();
1073 <                threadAssertSame(x, v1);
1073 >                threadAssertSame(result, v1);
1074                  threadAssertNull(t);
1075                  a.getAndIncrement();
1076                  return inc(v1);
# Line 1094 | Line 1097 | public class CompletableFutureTest exten
1097          if (!createIncomplete) f.completeExceptionally(ex);
1098          final CompletableFuture<Integer> g = m.handle
1099              (f,
1100 <             (Integer x, Throwable t) -> {
1100 >             (Integer result, Throwable t) -> {
1101                  m.checkExecutionMode();
1102 <                threadAssertNull(x);
1102 >                threadAssertNull(result);
1103                  threadAssertSame(t, ex);
1104                  a.getAndIncrement();
1105                  return v1;
# Line 1123 | Line 1126 | public class CompletableFutureTest exten
1126          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1127          final CompletableFuture<Integer> g = m.handle
1128              (f,
1129 <             (Integer x, Throwable t) -> {
1129 >             (Integer result, Throwable t) -> {
1130                  m.checkExecutionMode();
1131 <                threadAssertNull(x);
1131 >                threadAssertNull(result);
1132                  threadAssertTrue(t instanceof CancellationException);
1133                  a.getAndIncrement();
1134                  return v1;
# Line 1138 | Line 1141 | public class CompletableFutureTest exten
1141      }}
1142  
1143      /**
1144 <     * handle result completes exceptionally if action does
1144 >     * If a "handle action" throws an exception when triggered by
1145 >     * a normal completion, it completes exceptionally
1146       */
1147 <    public void testHandle_sourceFailedActionFailed() {
1147 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1148          for (ExecutionMode m : ExecutionMode.values())
1149          for (boolean createIncomplete : new boolean[] { true, false })
1150 +        for (Integer v1 : new Integer[] { 1, null })
1151      {
1152          final CompletableFuture<Integer> f = new CompletableFuture<>();
1153          final AtomicInteger a = new AtomicInteger(0);
1154 <        final CFException ex1 = new CFException();
1155 <        final CFException ex2 = new CFException();
1151 <        if (!createIncomplete) f.completeExceptionally(ex1);
1154 >        final CFException ex = new CFException();
1155 >        if (!createIncomplete) assertTrue(f.complete(v1));
1156          final CompletableFuture<Integer> g = m.handle
1157              (f,
1158 <             (Integer x, Throwable t) -> {
1158 >             (Integer result, Throwable t) -> {
1159                  m.checkExecutionMode();
1160 <                threadAssertNull(x);
1161 <                threadAssertSame(ex1, t);
1160 >                threadAssertSame(result, v1);
1161 >                threadAssertNull(t);
1162                  a.getAndIncrement();
1163 <                throw ex2;
1163 >                throw ex;
1164              });
1165 <        if (createIncomplete) f.completeExceptionally(ex1);
1165 >        if (createIncomplete) assertTrue(f.complete(v1));
1166  
1167 <        checkCompletedWithWrappedException(g, ex2);
1168 <        checkCompletedExceptionally(f, ex1);
1167 >        checkCompletedWithWrappedException(g, ex);
1168 >        checkCompletedNormally(f, v1);
1169          assertEquals(1, a.get());
1170      }}
1171  
1172 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1173 <        for (ExecutionMode m : ExecutionMode.values())
1172 >    /**
1173 >     * If a "handle action" throws an exception when triggered by
1174 >     * a source completion that also throws an exception, the action
1175 >     * exception takes precedence (unlike whenComplete)
1176 >     */
1177 >    public void testHandle_sourceFailedActionFailed() {
1178          for (boolean createIncomplete : new boolean[] { true, false })
1179 <        for (Integer v1 : new Integer[] { 1, null })
1179 >        for (ExecutionMode m : ExecutionMode.values())
1180      {
1173        final CompletableFuture<Integer> f = new CompletableFuture<>();
1181          final AtomicInteger a = new AtomicInteger(0);
1182 <        final CFException ex = new CFException();
1183 <        if (!createIncomplete) assertTrue(f.complete(v1));
1182 >        final CFException ex1 = new CFException();
1183 >        final CFException ex2 = new CFException();
1184 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1185 >
1186 >        if (!createIncomplete) f.completeExceptionally(ex1);
1187          final CompletableFuture<Integer> g = m.handle
1188              (f,
1189 <             (Integer x, Throwable t) -> {
1189 >             (Integer result, Throwable t) -> {
1190                  m.checkExecutionMode();
1191 <                threadAssertSame(x, v1);
1192 <                threadAssertNull(t);
1191 >                threadAssertNull(result);
1192 >                threadAssertSame(ex1, t);
1193                  a.getAndIncrement();
1194 <                throw ex;
1194 >                throw ex2;
1195              });
1196 <        if (createIncomplete) assertTrue(f.complete(v1));
1196 >        if (createIncomplete) f.completeExceptionally(ex1);
1197  
1198 <        checkCompletedWithWrappedException(g, ex);
1199 <        checkCompletedNormally(f, v1);
1198 >        checkCompletedWithWrappedException(g, ex2);
1199 >        checkCompletedExceptionally(f, ex1);
1200          assertEquals(1, a.get());
1201      }}
1202  
# Line 1219 | Line 1229 | public class CompletableFutureTest exten
1229      {
1230          final FailingRunnable r = new FailingRunnable(m);
1231          final CompletableFuture<Void> f = m.runAsync(r);
1232 <        checkCompletedWithWrappedCFException(f);
1232 >        checkCompletedWithWrappedException(f, r.ex);
1233          r.assertInvoked();
1234      }}
1235  
# Line 1253 | Line 1263 | public class CompletableFutureTest exten
1263      {
1264          FailingSupplier r = new FailingSupplier(m);
1265          CompletableFuture<Integer> f = m.supplyAsync(r);
1266 <        checkCompletedWithWrappedCFException(f);
1266 >        checkCompletedWithWrappedException(f, r.ex);
1267          r.assertInvoked();
1268      }}
1269  
# Line 1264 | Line 1274 | public class CompletableFutureTest exten
1274       */
1275      public void testThenRun_normalCompletion() {
1276          for (ExecutionMode m : ExecutionMode.values())
1267        for (boolean createIncomplete : new boolean[] { true, false })
1277          for (Integer v1 : new Integer[] { 1, null })
1278      {
1279          final CompletableFuture<Integer> f = new CompletableFuture<>();
1280 <        final Noop r = new Noop(m);
1281 <        if (!createIncomplete) assertTrue(f.complete(v1));
1273 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1274 <        if (createIncomplete) {
1275 <            checkIncomplete(g);
1276 <            assertTrue(f.complete(v1));
1277 <        }
1280 >        final Noop[] rs = new Noop[6];
1281 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1282  
1283 <        checkCompletedNormally(g, null);
1283 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1284 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1285 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1286 >        checkIncomplete(h0);
1287 >        checkIncomplete(h1);
1288 >        checkIncomplete(h2);
1289 >        assertTrue(f.complete(v1));
1290 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1291 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1292 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1293 >
1294 >        checkCompletedNormally(h0, null);
1295 >        checkCompletedNormally(h1, null);
1296 >        checkCompletedNormally(h2, null);
1297 >        checkCompletedNormally(h3, null);
1298 >        checkCompletedNormally(h4, null);
1299 >        checkCompletedNormally(h5, null);
1300          checkCompletedNormally(f, v1);
1301 <        r.assertInvoked();
1301 >        for (Noop r : rs) r.assertInvoked();
1302      }}
1303  
1304      /**
# Line 1287 | Line 1307 | public class CompletableFutureTest exten
1307       */
1308      public void testThenRun_exceptionalCompletion() {
1309          for (ExecutionMode m : ExecutionMode.values())
1290        for (boolean createIncomplete : new boolean[] { true, false })
1310      {
1311          final CFException ex = new CFException();
1312          final CompletableFuture<Integer> f = new CompletableFuture<>();
1313 <        final Noop r = new Noop(m);
1314 <        if (!createIncomplete) f.completeExceptionally(ex);
1296 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1297 <        if (createIncomplete) {
1298 <            checkIncomplete(g);
1299 <            f.completeExceptionally(ex);
1300 <        }
1313 >        final Noop[] rs = new Noop[6];
1314 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1315  
1316 <        checkCompletedWithWrappedException(g, ex);
1316 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1317 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1318 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1319 >        checkIncomplete(h0);
1320 >        checkIncomplete(h1);
1321 >        checkIncomplete(h2);
1322 >        assertTrue(f.completeExceptionally(ex));
1323 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1324 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1325 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1326 >
1327 >        checkCompletedWithWrappedException(h0, ex);
1328 >        checkCompletedWithWrappedException(h1, ex);
1329 >        checkCompletedWithWrappedException(h2, ex);
1330 >        checkCompletedWithWrappedException(h3, ex);
1331 >        checkCompletedWithWrappedException(h4, ex);
1332 >        checkCompletedWithWrappedException(h5, ex);
1333          checkCompletedExceptionally(f, ex);
1334 <        r.assertNotInvoked();
1334 >        for (Noop r : rs) r.assertNotInvoked();
1335      }}
1336  
1337      /**
# Line 1309 | Line 1339 | public class CompletableFutureTest exten
1339       */
1340      public void testThenRun_sourceCancelled() {
1341          for (ExecutionMode m : ExecutionMode.values())
1312        for (boolean createIncomplete : new boolean[] { true, false })
1342          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1343      {
1344          final CompletableFuture<Integer> f = new CompletableFuture<>();
1345 <        final Noop r = new Noop(m);
1346 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1318 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1319 <        if (createIncomplete) {
1320 <            checkIncomplete(g);
1321 <            assertTrue(f.cancel(mayInterruptIfRunning));
1322 <        }
1345 >        final Noop[] rs = new Noop[6];
1346 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1347  
1348 <        checkCompletedWithWrappedCancellationException(g);
1348 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1349 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1350 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1351 >        checkIncomplete(h0);
1352 >        checkIncomplete(h1);
1353 >        checkIncomplete(h2);
1354 >        assertTrue(f.cancel(mayInterruptIfRunning));
1355 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1356 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1357 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1358 >
1359 >        checkCompletedWithWrappedCancellationException(h0);
1360 >        checkCompletedWithWrappedCancellationException(h1);
1361 >        checkCompletedWithWrappedCancellationException(h2);
1362 >        checkCompletedWithWrappedCancellationException(h3);
1363 >        checkCompletedWithWrappedCancellationException(h4);
1364 >        checkCompletedWithWrappedCancellationException(h5);
1365          checkCancelled(f);
1366 <        r.assertNotInvoked();
1366 >        for (Noop r : rs) r.assertNotInvoked();
1367      }}
1368  
1369      /**
# Line 1331 | Line 1371 | public class CompletableFutureTest exten
1371       */
1372      public void testThenRun_actionFailed() {
1373          for (ExecutionMode m : ExecutionMode.values())
1334        for (boolean createIncomplete : new boolean[] { true, false })
1374          for (Integer v1 : new Integer[] { 1, null })
1375      {
1376          final CompletableFuture<Integer> f = new CompletableFuture<>();
1377 <        final FailingRunnable r = new FailingRunnable(m);
1378 <        if (!createIncomplete) assertTrue(f.complete(v1));
1340 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1341 <        if (createIncomplete) {
1342 <            checkIncomplete(g);
1343 <            assertTrue(f.complete(v1));
1344 <        }
1377 >        final FailingRunnable[] rs = new FailingRunnable[6];
1378 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1379  
1380 <        checkCompletedWithWrappedCFException(g);
1380 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1381 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1382 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1383 >        assertTrue(f.complete(v1));
1384 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1385 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1386 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1387 >
1388 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1389 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1390 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1391 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1392 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1393 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1394          checkCompletedNormally(f, v1);
1395      }}
1396  
# Line 1352 | Line 1399 | public class CompletableFutureTest exten
1399       */
1400      public void testThenApply_normalCompletion() {
1401          for (ExecutionMode m : ExecutionMode.values())
1355        for (boolean createIncomplete : new boolean[] { true, false })
1402          for (Integer v1 : new Integer[] { 1, null })
1403      {
1404          final CompletableFuture<Integer> f = new CompletableFuture<>();
1405 <        final IncFunction r = new IncFunction(m);
1406 <        if (!createIncomplete) assertTrue(f.complete(v1));
1361 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1362 <        if (createIncomplete) {
1363 <            checkIncomplete(g);
1364 <            assertTrue(f.complete(v1));
1365 <        }
1405 >        final IncFunction[] rs = new IncFunction[4];
1406 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1407  
1408 <        checkCompletedNormally(g, inc(v1));
1408 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1409 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1410 >        checkIncomplete(h0);
1411 >        checkIncomplete(h1);
1412 >        assertTrue(f.complete(v1));
1413 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1414 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1415 >
1416 >        checkCompletedNormally(h0, inc(v1));
1417 >        checkCompletedNormally(h1, inc(v1));
1418 >        checkCompletedNormally(h2, inc(v1));
1419 >        checkCompletedNormally(h3, inc(v1));
1420          checkCompletedNormally(f, v1);
1421 <        r.assertValue(inc(v1));
1421 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1422      }}
1423  
1424      /**
# Line 1375 | Line 1427 | public class CompletableFutureTest exten
1427       */
1428      public void testThenApply_exceptionalCompletion() {
1429          for (ExecutionMode m : ExecutionMode.values())
1378        for (boolean createIncomplete : new boolean[] { true, false })
1430      {
1431          final CFException ex = new CFException();
1432          final CompletableFuture<Integer> f = new CompletableFuture<>();
1433 <        final IncFunction r = new IncFunction(m);
1434 <        if (!createIncomplete) f.completeExceptionally(ex);
1384 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1385 <        if (createIncomplete) {
1386 <            checkIncomplete(g);
1387 <            f.completeExceptionally(ex);
1388 <        }
1433 >        final IncFunction[] rs = new IncFunction[4];
1434 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1435  
1436 <        checkCompletedWithWrappedException(g, ex);
1436 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1437 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1438 >        assertTrue(f.completeExceptionally(ex));
1439 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1440 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1441 >
1442 >        checkCompletedWithWrappedException(h0, ex);
1443 >        checkCompletedWithWrappedException(h1, ex);
1444 >        checkCompletedWithWrappedException(h2, ex);
1445 >        checkCompletedWithWrappedException(h3, ex);
1446          checkCompletedExceptionally(f, ex);
1447 <        r.assertNotInvoked();
1447 >        for (IncFunction r : rs) r.assertNotInvoked();
1448      }}
1449  
1450      /**
# Line 1397 | Line 1452 | public class CompletableFutureTest exten
1452       */
1453      public void testThenApply_sourceCancelled() {
1454          for (ExecutionMode m : ExecutionMode.values())
1400        for (boolean createIncomplete : new boolean[] { true, false })
1455          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1456      {
1457          final CompletableFuture<Integer> f = new CompletableFuture<>();
1458 <        final IncFunction r = new IncFunction(m);
1459 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1406 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1407 <        if (createIncomplete) {
1408 <            checkIncomplete(g);
1409 <            assertTrue(f.cancel(mayInterruptIfRunning));
1410 <        }
1458 >        final IncFunction[] rs = new IncFunction[4];
1459 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1460  
1461 <        checkCompletedWithWrappedCancellationException(g);
1461 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1462 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1463 >        assertTrue(f.cancel(mayInterruptIfRunning));
1464 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1465 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1466 >
1467 >        checkCompletedWithWrappedCancellationException(h0);
1468 >        checkCompletedWithWrappedCancellationException(h1);
1469 >        checkCompletedWithWrappedCancellationException(h2);
1470 >        checkCompletedWithWrappedCancellationException(h3);
1471          checkCancelled(f);
1472 <        r.assertNotInvoked();
1472 >        for (IncFunction r : rs) r.assertNotInvoked();
1473      }}
1474  
1475      /**
# Line 1419 | Line 1477 | public class CompletableFutureTest exten
1477       */
1478      public void testThenApply_actionFailed() {
1479          for (ExecutionMode m : ExecutionMode.values())
1422        for (boolean createIncomplete : new boolean[] { true, false })
1480          for (Integer v1 : new Integer[] { 1, null })
1481      {
1482          final CompletableFuture<Integer> f = new CompletableFuture<>();
1483 <        final FailingFunction r = new FailingFunction(m);
1484 <        if (!createIncomplete) assertTrue(f.complete(v1));
1485 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1486 <        if (createIncomplete) {
1487 <            checkIncomplete(g);
1488 <            assertTrue(f.complete(v1));
1489 <        }
1483 >        final FailingFunction[] rs = new FailingFunction[4];
1484 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1485 >
1486 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1487 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1488 >        assertTrue(f.complete(v1));
1489 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1490 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1491  
1492 <        checkCompletedWithWrappedCFException(g);
1492 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1493 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1494 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1495 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1496          checkCompletedNormally(f, v1);
1497      }}
1498  
# Line 1440 | Line 1501 | public class CompletableFutureTest exten
1501       */
1502      public void testThenAccept_normalCompletion() {
1503          for (ExecutionMode m : ExecutionMode.values())
1443        for (boolean createIncomplete : new boolean[] { true, false })
1504          for (Integer v1 : new Integer[] { 1, null })
1505      {
1506          final CompletableFuture<Integer> f = new CompletableFuture<>();
1507 <        final NoopConsumer r = new NoopConsumer(m);
1508 <        if (!createIncomplete) assertTrue(f.complete(v1));
1449 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1450 <        if (createIncomplete) {
1451 <            checkIncomplete(g);
1452 <            assertTrue(f.complete(v1));
1453 <        }
1507 >        final NoopConsumer[] rs = new NoopConsumer[4];
1508 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1509  
1510 <        checkCompletedNormally(g, null);
1511 <        r.assertValue(v1);
1510 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1511 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1512 >        checkIncomplete(h0);
1513 >        checkIncomplete(h1);
1514 >        assertTrue(f.complete(v1));
1515 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1516 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1517 >
1518 >        checkCompletedNormally(h0, null);
1519 >        checkCompletedNormally(h1, null);
1520 >        checkCompletedNormally(h2, null);
1521 >        checkCompletedNormally(h3, null);
1522          checkCompletedNormally(f, v1);
1523 +        for (NoopConsumer r : rs) r.assertValue(v1);
1524      }}
1525  
1526      /**
# Line 1463 | Line 1529 | public class CompletableFutureTest exten
1529       */
1530      public void testThenAccept_exceptionalCompletion() {
1531          for (ExecutionMode m : ExecutionMode.values())
1466        for (boolean createIncomplete : new boolean[] { true, false })
1532      {
1533          final CFException ex = new CFException();
1534          final CompletableFuture<Integer> f = new CompletableFuture<>();
1535 <        final NoopConsumer r = new NoopConsumer(m);
1536 <        if (!createIncomplete) f.completeExceptionally(ex);
1472 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1473 <        if (createIncomplete) {
1474 <            checkIncomplete(g);
1475 <            f.completeExceptionally(ex);
1476 <        }
1535 >        final NoopConsumer[] rs = new NoopConsumer[4];
1536 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1537  
1538 <        checkCompletedWithWrappedException(g, ex);
1538 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1539 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1540 >        assertTrue(f.completeExceptionally(ex));
1541 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1542 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1543 >
1544 >        checkCompletedWithWrappedException(h0, ex);
1545 >        checkCompletedWithWrappedException(h1, ex);
1546 >        checkCompletedWithWrappedException(h2, ex);
1547 >        checkCompletedWithWrappedException(h3, ex);
1548          checkCompletedExceptionally(f, ex);
1549 <        r.assertNotInvoked();
1549 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1550      }}
1551  
1552      /**
# Line 1485 | Line 1554 | public class CompletableFutureTest exten
1554       */
1555      public void testThenAccept_sourceCancelled() {
1556          for (ExecutionMode m : ExecutionMode.values())
1488        for (boolean createIncomplete : new boolean[] { true, false })
1557          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1558      {
1559          final CompletableFuture<Integer> f = new CompletableFuture<>();
1560 <        final NoopConsumer r = new NoopConsumer(m);
1561 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1494 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1495 <        if (createIncomplete) {
1496 <            checkIncomplete(g);
1497 <            assertTrue(f.cancel(mayInterruptIfRunning));
1498 <        }
1560 >        final NoopConsumer[] rs = new NoopConsumer[4];
1561 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1562  
1563 <        checkCompletedWithWrappedCancellationException(g);
1563 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1564 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1565 >        assertTrue(f.cancel(mayInterruptIfRunning));
1566 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1567 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1568 >
1569 >        checkCompletedWithWrappedCancellationException(h0);
1570 >        checkCompletedWithWrappedCancellationException(h1);
1571 >        checkCompletedWithWrappedCancellationException(h2);
1572 >        checkCompletedWithWrappedCancellationException(h3);
1573          checkCancelled(f);
1574 <        r.assertNotInvoked();
1574 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1575      }}
1576  
1577      /**
# Line 1507 | Line 1579 | public class CompletableFutureTest exten
1579       */
1580      public void testThenAccept_actionFailed() {
1581          for (ExecutionMode m : ExecutionMode.values())
1510        for (boolean createIncomplete : new boolean[] { true, false })
1582          for (Integer v1 : new Integer[] { 1, null })
1583      {
1584          final CompletableFuture<Integer> f = new CompletableFuture<>();
1585 <        final FailingConsumer r = new FailingConsumer(m);
1586 <        if (!createIncomplete) f.complete(v1);
1516 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1517 <        if (createIncomplete) {
1518 <            checkIncomplete(g);
1519 <            f.complete(v1);
1520 <        }
1585 >        final FailingConsumer[] rs = new FailingConsumer[4];
1586 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1587  
1588 <        checkCompletedWithWrappedCFException(g);
1588 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1589 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1590 >        assertTrue(f.complete(v1));
1591 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1592 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1593 >
1594 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1595 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1596 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1597 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1598          checkCompletedNormally(f, v1);
1599      }}
1600  
# Line 1535 | Line 1610 | public class CompletableFutureTest exten
1610      {
1611          final CompletableFuture<Integer> f = new CompletableFuture<>();
1612          final CompletableFuture<Integer> g = new CompletableFuture<>();
1613 <        final SubtractFunction r1 = new SubtractFunction(m);
1614 <        final SubtractFunction r2 = new SubtractFunction(m);
1540 <        final SubtractFunction r3 = new SubtractFunction(m);
1613 >        final SubtractFunction[] rs = new SubtractFunction[6];
1614 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1615  
1616          final CompletableFuture<Integer> fst =  fFirst ? f : g;
1617          final CompletableFuture<Integer> snd = !fFirst ? f : g;
1618          final Integer w1 =  fFirst ? v1 : v2;
1619          final Integer w2 = !fFirst ? v1 : v2;
1620  
1621 <        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1621 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1622 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1623          assertTrue(fst.complete(w1));
1624 <        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1625 <        checkIncomplete(h1);
1626 <        checkIncomplete(h2);
1627 <        r1.assertNotInvoked();
1628 <        r2.assertNotInvoked();
1624 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1625 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1626 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1627 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1628 >        checkCompletedNormally(h1, subtract(w1, w1));
1629 >        checkCompletedNormally(h3, subtract(w1, w1));
1630 >        rs[1].assertValue(subtract(w1, w1));
1631 >        rs[3].assertValue(subtract(w1, w1));
1632          assertTrue(snd.complete(w2));
1633 <        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1633 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1634  
1635 <        checkCompletedNormally(h1, subtract(v1, v2));
1635 >        checkCompletedNormally(h0, subtract(v1, v2));
1636          checkCompletedNormally(h2, subtract(v1, v2));
1637 <        checkCompletedNormally(h3, subtract(v1, v2));
1638 <        r1.assertValue(subtract(v1, v2));
1639 <        r2.assertValue(subtract(v1, v2));
1640 <        r3.assertValue(subtract(v1, v2));
1637 >        checkCompletedNormally(h4, subtract(v1, v2));
1638 >        rs[0].assertValue(subtract(v1, v2));
1639 >        rs[2].assertValue(subtract(v1, v2));
1640 >        rs[4].assertValue(subtract(v1, v2));
1641 >
1642          checkCompletedNormally(f, v1);
1643          checkCompletedNormally(g, v2);
1644      }}
# Line 1677 | Line 1756 | public class CompletableFutureTest exten
1756          assertTrue(snd.complete(w2));
1757          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1758  
1759 <        checkCompletedWithWrappedCFException(h1);
1760 <        checkCompletedWithWrappedCFException(h2);
1761 <        checkCompletedWithWrappedCFException(h3);
1759 >        checkCompletedWithWrappedException(h1, r1.ex);
1760 >        checkCompletedWithWrappedException(h2, r2.ex);
1761 >        checkCompletedWithWrappedException(h3, r3.ex);
1762          r1.assertInvoked();
1763          r2.assertInvoked();
1764          r3.assertInvoked();
# Line 1841 | Line 1920 | public class CompletableFutureTest exten
1920          assertTrue(snd.complete(w2));
1921          final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1922  
1923 <        checkCompletedWithWrappedCFException(h1);
1924 <        checkCompletedWithWrappedCFException(h2);
1925 <        checkCompletedWithWrappedCFException(h3);
1923 >        checkCompletedWithWrappedException(h1, r1.ex);
1924 >        checkCompletedWithWrappedException(h2, r2.ex);
1925 >        checkCompletedWithWrappedException(h3, r3.ex);
1926          r1.assertInvoked();
1927          r2.assertInvoked();
1928          r3.assertInvoked();
# Line 2005 | Line 2084 | public class CompletableFutureTest exten
2084          assertTrue(snd.complete(w2));
2085          final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2086  
2087 <        checkCompletedWithWrappedCFException(h1);
2088 <        checkCompletedWithWrappedCFException(h2);
2089 <        checkCompletedWithWrappedCFException(h3);
2087 >        checkCompletedWithWrappedException(h1, r1.ex);
2088 >        checkCompletedWithWrappedException(h2, r2.ex);
2089 >        checkCompletedWithWrappedException(h3, r3.ex);
2090          r1.assertInvoked();
2091          r2.assertInvoked();
2092          r3.assertInvoked();
# Line 2297 | Line 2376 | public class CompletableFutureTest exten
2376          f.complete(v1);
2377          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2378          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2379 <        checkCompletedWithWrappedCFException(h0);
2380 <        checkCompletedWithWrappedCFException(h1);
2381 <        checkCompletedWithWrappedCFException(h2);
2382 <        checkCompletedWithWrappedCFException(h3);
2379 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2380 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2381 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2382 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2383          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2384  
2385          g.complete(v2);
# Line 2309 | Line 2388 | public class CompletableFutureTest exten
2388          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2389          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2390  
2391 <        checkCompletedWithWrappedCFException(h4);
2391 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2392          assertTrue(Objects.equals(v1, rs[4].value) ||
2393                     Objects.equals(v2, rs[4].value));
2394 <        checkCompletedWithWrappedCFException(h5);
2394 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2395          assertTrue(Objects.equals(v1, rs[5].value) ||
2396                     Objects.equals(v2, rs[5].value));
2397  
# Line 2556 | Line 2635 | public class CompletableFutureTest exten
2635          f.complete(v1);
2636          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2637          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2638 <        checkCompletedWithWrappedCFException(h0);
2639 <        checkCompletedWithWrappedCFException(h1);
2640 <        checkCompletedWithWrappedCFException(h2);
2641 <        checkCompletedWithWrappedCFException(h3);
2638 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2639 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2640 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2641 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2642          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2643  
2644          g.complete(v2);
# Line 2568 | Line 2647 | public class CompletableFutureTest exten
2647          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2648          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2649  
2650 <        checkCompletedWithWrappedCFException(h4);
2650 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2651          assertTrue(Objects.equals(v1, rs[4].value) ||
2652                     Objects.equals(v2, rs[4].value));
2653 <        checkCompletedWithWrappedCFException(h5);
2653 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2654          assertTrue(Objects.equals(v1, rs[5].value) ||
2655                     Objects.equals(v2, rs[5].value));
2656  
# Line 2811 | Line 2890 | public class CompletableFutureTest exten
2890          assertTrue(f.complete(v1));
2891          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2892          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2893 <        checkCompletedWithWrappedCFException(h0);
2894 <        checkCompletedWithWrappedCFException(h1);
2895 <        checkCompletedWithWrappedCFException(h2);
2896 <        checkCompletedWithWrappedCFException(h3);
2893 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2894 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2895 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2896 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2897          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2898          assertTrue(g.complete(v2));
2899          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2900          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2901 <        checkCompletedWithWrappedCFException(h4);
2902 <        checkCompletedWithWrappedCFException(h5);
2901 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2902 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2903  
2904          checkCompletedNormally(f, v1);
2905          checkCompletedNormally(g, v2);
# Line 2881 | Line 2960 | public class CompletableFutureTest exten
2960          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2961          if (createIncomplete) assertTrue(f.complete(v1));
2962  
2963 <        checkCompletedWithWrappedCFException(g);
2963 >        checkCompletedWithWrappedException(g, r.ex);
2964          checkCompletedNormally(f, v1);
2965      }}
2966  
# Line 2906 | Line 2985 | public class CompletableFutureTest exten
2985          checkCancelled(f);
2986      }}
2987  
2988 +    /**
2989 +     * thenCompose result completes exceptionally if the result of the action does
2990 +     */
2991 +    public void testThenCompose_actionReturnsFailingFuture() {
2992 +        for (ExecutionMode m : ExecutionMode.values())
2993 +        for (int order = 0; order < 6; order++)
2994 +        for (Integer v1 : new Integer[] { 1, null })
2995 +    {
2996 +        final CFException ex = new CFException();
2997 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2998 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2999 +        final CompletableFuture<Integer> h;
3000 +        // Test all permutations of orders
3001 +        switch (order) {
3002 +        case 0:
3003 +            assertTrue(f.complete(v1));
3004 +            assertTrue(g.completeExceptionally(ex));
3005 +            h = m.thenCompose(f, (x -> g));
3006 +            break;
3007 +        case 1:
3008 +            assertTrue(f.complete(v1));
3009 +            h = m.thenCompose(f, (x -> g));
3010 +            assertTrue(g.completeExceptionally(ex));
3011 +            break;
3012 +        case 2:
3013 +            assertTrue(g.completeExceptionally(ex));
3014 +            assertTrue(f.complete(v1));
3015 +            h = m.thenCompose(f, (x -> g));
3016 +            break;
3017 +        case 3:
3018 +            assertTrue(g.completeExceptionally(ex));
3019 +            h = m.thenCompose(f, (x -> g));
3020 +            assertTrue(f.complete(v1));
3021 +            break;
3022 +        case 4:
3023 +            h = m.thenCompose(f, (x -> g));
3024 +            assertTrue(f.complete(v1));
3025 +            assertTrue(g.completeExceptionally(ex));
3026 +            break;
3027 +        case 5:
3028 +            h = m.thenCompose(f, (x -> g));
3029 +            assertTrue(f.complete(v1));
3030 +            assertTrue(g.completeExceptionally(ex));
3031 +            break;
3032 +        default: throw new AssertionError();
3033 +        }
3034 +
3035 +        checkCompletedExceptionally(g, ex);
3036 +        checkCompletedWithWrappedException(h, ex);
3037 +        checkCompletedNormally(f, v1);
3038 +    }}
3039 +
3040      // other static methods
3041  
3042      /**
# Line 2922 | Line 3053 | public class CompletableFutureTest exten
3053       * when all components complete normally
3054       */
3055      public void testAllOf_normal() throws Exception {
3056 <        for (int k = 1; k < 20; k++) {
3056 >        for (int k = 1; k < 10; k++) {
3057              CompletableFuture<Integer>[] fs
3058                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3059              for (int i = 0; i < k; i++)
# Line 2938 | Line 3069 | public class CompletableFutureTest exten
3069          }
3070      }
3071  
3072 <    public void testAllOf_backwards() throws Exception {
3073 <        for (int k = 1; k < 20; k++) {
3072 >    public void testAllOf_normal_backwards() throws Exception {
3073 >        for (int k = 1; k < 10; k++) {
3074              CompletableFuture<Integer>[] fs
3075                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3076              for (int i = 0; i < k; i++)
# Line 2955 | Line 3086 | public class CompletableFutureTest exten
3086          }
3087      }
3088  
3089 +    public void testAllOf_exceptional() throws Exception {
3090 +        for (int k = 1; k < 10; k++) {
3091 +            CompletableFuture<Integer>[] fs
3092 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3093 +            CFException ex = new CFException();
3094 +            for (int i = 0; i < k; i++)
3095 +                fs[i] = new CompletableFuture<>();
3096 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3097 +            for (int i = 0; i < k; i++) {
3098 +                checkIncomplete(f);
3099 +                checkIncomplete(CompletableFuture.allOf(fs));
3100 +                if (i != k / 2) {
3101 +                    fs[i].complete(i);
3102 +                    checkCompletedNormally(fs[i], i);
3103 +                } else {
3104 +                    fs[i].completeExceptionally(ex);
3105 +                    checkCompletedExceptionally(fs[i], ex);
3106 +                }
3107 +            }
3108 +            checkCompletedWithWrappedException(f, ex);
3109 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3110 +        }
3111 +    }
3112 +
3113      /**
3114       * anyOf(no component futures) returns an incomplete future
3115       */
# Line 3049 | Line 3204 | public class CompletableFutureTest exten
3204          CompletableFuture<Integer> f = new CompletableFuture<>();
3205          CompletableFuture<Integer> g = new CompletableFuture<>();
3206          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3052        CompletableFuture<?> h;
3207          ThreadExecutor exec = new ThreadExecutor();
3208  
3209          Runnable[] throwingActions = {
3210              () -> CompletableFuture.supplyAsync(null),
3211              () -> CompletableFuture.supplyAsync(null, exec),
3212 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3212 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3213  
3214              () -> CompletableFuture.runAsync(null),
3215              () -> CompletableFuture.runAsync(null, exec),
# Line 3146 | Line 3300 | public class CompletableFutureTest exten
3300              () -> CompletableFuture.anyOf(null, f),
3301  
3302              () -> f.obtrudeException(null),
3303 +
3304 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3305 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3306 +            () -> CompletableFuture.delayedExecutor(1L, null),
3307 +
3308 +            () -> f.orTimeout(1L, null),
3309 +            () -> f.completeOnTimeout(42, 1L, null),
3310 +
3311 +            () -> CompletableFuture.failedFuture(null),
3312 +            () -> CompletableFuture.failedStage(null),
3313          };
3314  
3315          assertThrows(NullPointerException.class, throwingActions);
# Line 3160 | Line 3324 | public class CompletableFutureTest exten
3324          assertSame(f, f.toCompletableFuture());
3325      }
3326  
3327 +    // jdk9
3328 +
3329 +    /**
3330 +     * newIncompleteFuture returns an incomplete CompletableFuture
3331 +     */
3332 +    public void testNewIncompleteFuture() {
3333 +        for (Integer v1 : new Integer[] { 1, null })
3334 +    {
3335 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3336 +        CompletableFuture<Integer> g = f.newIncompleteFuture();
3337 +        checkIncomplete(f);
3338 +        checkIncomplete(g);
3339 +        f.complete(v1);
3340 +        checkCompletedNormally(f, v1);
3341 +        checkIncomplete(g);
3342 +        g.complete(v1);
3343 +        checkCompletedNormally(g, v1);
3344 +        assertSame(g.getClass(), CompletableFuture.class);
3345 +    }}
3346 +
3347 +    /**
3348 +     * completedStage returns a completed CompletionStage
3349 +     */
3350 +    public void testCompletedStage() {
3351 +        AtomicInteger x = new AtomicInteger(0);
3352 +        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3353 +        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3354 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3355 +        assertEquals(x.get(), 1);
3356 +        assertNull(r.get());
3357 +    }
3358 +
3359 +    /**
3360 +     * defaultExecutor by default returns the commonPool if
3361 +     * it supports more than one thread.
3362 +     */
3363 +    public void testDefaultExecutor() {
3364 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3365 +        Executor e = f.defaultExecutor();
3366 +        Executor c = ForkJoinPool.commonPool();
3367 +        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3368 +            assertSame(e, c);
3369 +        else
3370 +            assertNotSame(e, c);
3371 +    }
3372 +
3373 +    /**
3374 +     * failedFuture returns a CompletableFuture completed
3375 +     * exceptionally with the given Exception
3376 +     */
3377 +    public void testFailedFuture() {
3378 +        CFException ex = new CFException();
3379 +        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3380 +        checkCompletedExceptionally(f, ex);
3381 +    }
3382 +
3383 +    /**
3384 +     * failedFuture(null) throws NPE
3385 +     */
3386 +    public void testFailedFuture_null() {
3387 +        try {
3388 +            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3389 +            shouldThrow();
3390 +        } catch (NullPointerException success) {}
3391 +    }
3392 +
3393 +    /**
3394 +     * copy returns a CompletableFuture that is completed normally,
3395 +     * with the same value, when source is.
3396 +     */
3397 +    public void testCopy() {
3398 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3399 +        CompletableFuture<Integer> g = f.copy();
3400 +        checkIncomplete(f);
3401 +        checkIncomplete(g);
3402 +        f.complete(1);
3403 +        checkCompletedNormally(f, 1);
3404 +        checkCompletedNormally(g, 1);
3405 +    }
3406 +
3407 +    /**
3408 +     * copy returns a CompletableFuture that is completed exceptionally
3409 +     * when source is.
3410 +     */
3411 +    public void testCopy2() {
3412 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3413 +        CompletableFuture<Integer> g = f.copy();
3414 +        checkIncomplete(f);
3415 +        checkIncomplete(g);
3416 +        CFException ex = new CFException();
3417 +        f.completeExceptionally(ex);
3418 +        checkCompletedExceptionally(f, ex);
3419 +        checkCompletedWithWrappedException(g, ex);
3420 +    }
3421 +
3422 +    /**
3423 +     * minimalCompletionStage returns a CompletableFuture that is
3424 +     * completed normally, with the same value, when source is.
3425 +     */
3426 +    public void testMinimalCompletionStage() {
3427 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3428 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3429 +        AtomicInteger x = new AtomicInteger(0);
3430 +        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3431 +        checkIncomplete(f);
3432 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3433 +        f.complete(1);
3434 +        checkCompletedNormally(f, 1);
3435 +        assertEquals(x.get(), 1);
3436 +        assertNull(r.get());
3437 +    }
3438 +
3439 +    /**
3440 +     * minimalCompletionStage returns a CompletableFuture that is
3441 +     * completed exceptionally when source is.
3442 +     */
3443 +    public void testMinimalCompletionStage2() {
3444 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3445 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3446 +        AtomicInteger x = new AtomicInteger(0);
3447 +        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3448 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3449 +        checkIncomplete(f);
3450 +        CFException ex = new CFException();
3451 +        f.completeExceptionally(ex);
3452 +        checkCompletedExceptionally(f, ex);
3453 +        assertEquals(x.get(), 0);
3454 +        assertEquals(r.get().getCause(), ex);
3455 +    }
3456 +
3457 +    /**
3458 +     * failedStage returns a CompletionStage completed
3459 +     * exceptionally with the given Exception
3460 +     */
3461 +    public void testFailedStage() {
3462 +        CFException ex = new CFException();
3463 +        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3464 +        AtomicInteger x = new AtomicInteger(0);
3465 +        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3466 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3467 +        assertEquals(x.get(), 0);
3468 +        assertEquals(r.get(), ex);
3469 +    }
3470 +
3471 +    /**
3472 +     * completeAsync completes with value of given supplier
3473 +     */
3474 +    public void testCompleteAsync() {
3475 +        for (Integer v1 : new Integer[] { 1, null })
3476 +    {
3477 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3478 +        f.completeAsync(() -> v1);
3479 +        f.join();
3480 +        checkCompletedNormally(f, v1);
3481 +    }}
3482 +
3483 +    /**
3484 +     * completeAsync completes exceptionally if given supplier throws
3485 +     */
3486 +    public void testCompleteAsync2() {
3487 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3488 +        CFException ex = new CFException();
3489 +        f.completeAsync(() -> {if (true) throw ex; return 1;});
3490 +        try {
3491 +            f.join();
3492 +            shouldThrow();
3493 +        } catch (CompletionException success) {}
3494 +        checkCompletedWithWrappedException(f, ex);
3495 +    }
3496 +
3497 +    /**
3498 +     * completeAsync with given executor completes with value of given supplier
3499 +     */
3500 +    public void testCompleteAsync3() {
3501 +        for (Integer v1 : new Integer[] { 1, null })
3502 +    {
3503 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3504 +        ThreadExecutor executor = new ThreadExecutor();
3505 +        f.completeAsync(() -> v1, executor);
3506 +        assertSame(v1, f.join());
3507 +        checkCompletedNormally(f, v1);
3508 +        assertEquals(1, executor.count.get());
3509 +    }}
3510 +
3511 +    /**
3512 +     * completeAsync with given executor completes exceptionally if
3513 +     * given supplier throws
3514 +     */
3515 +    public void testCompleteAsync4() {
3516 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3517 +        CFException ex = new CFException();
3518 +        ThreadExecutor executor = new ThreadExecutor();
3519 +        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3520 +        try {
3521 +            f.join();
3522 +            shouldThrow();
3523 +        } catch (CompletionException success) {}
3524 +        checkCompletedWithWrappedException(f, ex);
3525 +        assertEquals(1, executor.count.get());
3526 +    }
3527 +
3528 +    /**
3529 +     * orTimeout completes with TimeoutException if not complete
3530 +     */
3531 +    public void testOrTimeout_timesOut() {
3532 +        long timeoutMillis = timeoutMillis();
3533 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3534 +        long startTime = System.nanoTime();
3535 +        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3536 +        checkCompletedWithTimeoutException(f);
3537 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3538 +    }
3539 +
3540 +    /**
3541 +     * orTimeout completes normally if completed before timeout
3542 +     */
3543 +    public void testOrTimeout_completed() {
3544 +        for (Integer v1 : new Integer[] { 1, null })
3545 +    {
3546 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3547 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3548 +        long startTime = System.nanoTime();
3549 +        f.complete(v1);
3550 +        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3551 +        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3552 +        g.complete(v1);
3553 +        checkCompletedNormally(f, v1);
3554 +        checkCompletedNormally(g, v1);
3555 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3556 +    }}
3557 +
3558 +    /**
3559 +     * completeOnTimeout completes with given value if not complete
3560 +     */
3561 +    public void testCompleteOnTimeout_timesOut() {
3562 +        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3563 +                       () -> testCompleteOnTimeout_timesOut(null));
3564 +    }
3565 +
3566 +    /**
3567 +     * completeOnTimeout completes with given value if not complete
3568 +     */
3569 +    public void testCompleteOnTimeout_timesOut(Integer v) {
3570 +        long timeoutMillis = timeoutMillis();
3571 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3572 +        long startTime = System.nanoTime();
3573 +        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3574 +        assertSame(v, f.join());
3575 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3576 +        f.complete(99);         // should have no effect
3577 +        checkCompletedNormally(f, v);
3578 +    }
3579 +
3580 +    /**
3581 +     * completeOnTimeout has no effect if completed within timeout
3582 +     */
3583 +    public void testCompleteOnTimeout_completed() {
3584 +        for (Integer v1 : new Integer[] { 1, null })
3585 +    {
3586 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3587 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3588 +        long startTime = System.nanoTime();
3589 +        f.complete(v1);
3590 +        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3591 +        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3592 +        g.complete(v1);
3593 +        checkCompletedNormally(f, v1);
3594 +        checkCompletedNormally(g, v1);
3595 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3596 +    }}
3597 +
3598 +    /**
3599 +     * delayedExecutor returns an executor that delays submission
3600 +     */
3601 +    public void testDelayedExecutor() {
3602 +        testInParallel(() -> testDelayedExecutor(null, null),
3603 +                       () -> testDelayedExecutor(null, 1),
3604 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3605 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3606 +    }
3607 +
3608 +    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3609 +        long timeoutMillis = timeoutMillis();
3610 +        // Use an "unreasonably long" long timeout to catch lingering threads
3611 +        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3612 +        final Executor delayer, longDelayer;
3613 +        if (executor == null) {
3614 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3615 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3616 +        } else {
3617 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3618 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3619 +        }
3620 +        long startTime = System.nanoTime();
3621 +        CompletableFuture<Integer> f =
3622 +            CompletableFuture.supplyAsync(() -> v, delayer);
3623 +        CompletableFuture<Integer> g =
3624 +            CompletableFuture.supplyAsync(() -> v, longDelayer);
3625 +
3626 +        assertNull(g.getNow(null));
3627 +
3628 +        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3629 +        long millisElapsed = millisElapsedSince(startTime);
3630 +        assertTrue(millisElapsed >= timeoutMillis);
3631 +        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3632 +
3633 +        checkCompletedNormally(f, v);
3634 +
3635 +        checkIncomplete(g);
3636 +        assertTrue(g.cancel(true));
3637 +    }
3638 +
3639      //--- tests of implementation details; not part of official tck ---
3640  
3641      Object resultOf(CompletableFuture<?> f) {
3642 +        SecurityManager sm = System.getSecurityManager();
3643 +        if (sm != null) {
3644 +            try {
3645 +                System.setSecurityManager(null);
3646 +            } catch (SecurityException giveUp) {
3647 +                return "Reflection not available";
3648 +            }
3649 +        }
3650 +
3651          try {
3652              java.lang.reflect.Field resultField
3653                  = CompletableFuture.class.getDeclaredField("result");
3654              resultField.setAccessible(true);
3655              return resultField.get(f);
3656 <        } catch (Throwable t) { throw new AssertionError(t); }
3656 >        } catch (Throwable t) {
3657 >            throw new AssertionError(t);
3658 >        } finally {
3659 >            if (sm != null) System.setSecurityManager(sm);
3660 >        }
3661      }
3662  
3663      public void testExceptionPropagationReusesResultObject() {
# Line 3179 | Line 3668 | public class CompletableFutureTest exten
3668          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3669          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3670  
3671 <        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> dependentFactories
3671 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3672              = new ArrayList<>();
3673  
3674 <        dependentFactories.add((y) -> m.thenRun(y, new Noop(m)));
3675 <        dependentFactories.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3676 <        dependentFactories.add((y) -> m.thenApply(y, new IncFunction(m)));
3677 <
3678 <        dependentFactories.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3679 <        dependentFactories.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3680 <        dependentFactories.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3681 <
3682 <        dependentFactories.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3683 <        dependentFactories.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3684 <        dependentFactories.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3685 <
3686 <        dependentFactories.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3687 <
3688 <        dependentFactories.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3689 <
3690 <        dependentFactories.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3691 <        dependentFactories.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3674 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3675 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3676 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3677 >
3678 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3679 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3680 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3681 >
3682 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3683 >        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3684 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3685 >        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3686 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3687 >        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3688 >
3689 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3690 >
3691 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3692 >
3693 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3694 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3695 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3696 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3697 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3698 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3699  
3700          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3701 <                 dependentFactory : dependentFactories) {
3701 >                 fun : funs) {
3702              CompletableFuture<Integer> f = new CompletableFuture<>();
3703              f.completeExceptionally(ex);
3704              CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3705              checkCompletedWithWrappedException(src, ex);
3706 <            CompletableFuture<?> dep = dependentFactory.apply(src);
3706 >            CompletableFuture<?> dep = fun.apply(src);
3707              checkCompletedWithWrappedException(dep, ex);
3708              assertSame(resultOf(src), resultOf(dep));
3709          }
3710  
3711          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3712 <                 dependentFactory : dependentFactories) {
3712 >                 fun : funs) {
3713              CompletableFuture<Integer> f = new CompletableFuture<>();
3714              CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3715 <            CompletableFuture<?> dep = dependentFactory.apply(src);
3715 >            CompletableFuture<?> dep = fun.apply(src);
3716              f.completeExceptionally(ex);
3717              checkCompletedWithWrappedException(src, ex);
3718              checkCompletedWithWrappedException(dep, ex);
# Line 3225 | Line 3721 | public class CompletableFutureTest exten
3721  
3722          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3723          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3724 <                 dependentFactory : dependentFactories) {
3724 >                 fun : funs) {
3725              CompletableFuture<Integer> f = new CompletableFuture<>();
3726              f.cancel(mayInterruptIfRunning);
3727              checkCancelled(f);
3728              CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3729              checkCompletedWithWrappedCancellationException(src);
3730 <            CompletableFuture<?> dep = dependentFactory.apply(src);
3730 >            CompletableFuture<?> dep = fun.apply(src);
3731              checkCompletedWithWrappedCancellationException(dep);
3732              assertSame(resultOf(src), resultOf(dep));
3733          }
3734  
3735          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3736          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3737 <                 dependentFactory : dependentFactories) {
3737 >                 fun : funs) {
3738              CompletableFuture<Integer> f = new CompletableFuture<>();
3739              CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3740 <            CompletableFuture<?> dep = dependentFactory.apply(src);
3740 >            CompletableFuture<?> dep = fun.apply(src);
3741              f.cancel(mayInterruptIfRunning);
3742              checkCancelled(f);
3743              checkCompletedWithWrappedCancellationException(src);
# Line 3250 | Line 3746 | public class CompletableFutureTest exten
3746          }
3747      }}
3748  
3749 +    /**
3750 +     * Minimal completion stages throw UOE for all non-CompletionStage methods
3751 +     */
3752 +    public void testMinimalCompletionStage_minimality() {
3753 +        if (!testImplementationDetails) return;
3754 +        Function<Method, String> toSignature =
3755 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3756 +        Predicate<Method> isNotStatic =
3757 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3758 +        List<Method> minimalMethods =
3759 +            Stream.of(Object.class, CompletionStage.class)
3760 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3761 +            .filter(isNotStatic)
3762 +            .collect(Collectors.toList());
3763 +        // Methods from CompletableFuture permitted NOT to throw UOE
3764 +        String[] signatureWhitelist = {
3765 +            "newIncompleteFuture[]",
3766 +            "defaultExecutor[]",
3767 +            "minimalCompletionStage[]",
3768 +            "copy[]",
3769 +        };
3770 +        Set<String> permittedMethodSignatures =
3771 +            Stream.concat(minimalMethods.stream().map(toSignature),
3772 +                          Stream.of(signatureWhitelist))
3773 +            .collect(Collectors.toSet());
3774 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3775 +            .filter(isNotStatic)
3776 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3777 +            .collect(Collectors.toList());
3778 +
3779 +        CompletionStage<Integer> minimalStage =
3780 +            new CompletableFuture<Integer>().minimalCompletionStage();
3781 +
3782 +        List<Method> bugs = new ArrayList<>();
3783 +        for (Method method : allMethods) {
3784 +            Class<?>[] parameterTypes = method.getParameterTypes();
3785 +            Object[] args = new Object[parameterTypes.length];
3786 +            // Manufacture boxed primitives for primitive params
3787 +            for (int i = 0; i < args.length; i++) {
3788 +                Class<?> type = parameterTypes[i];
3789 +                if (parameterTypes[i] == boolean.class)
3790 +                    args[i] = false;
3791 +                else if (parameterTypes[i] == int.class)
3792 +                    args[i] = 0;
3793 +                else if (parameterTypes[i] == long.class)
3794 +                    args[i] = 0L;
3795 +            }
3796 +            try {
3797 +                method.invoke(minimalStage, args);
3798 +                bugs.add(method);
3799 +            }
3800 +            catch (java.lang.reflect.InvocationTargetException expected) {
3801 +                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3802 +                    bugs.add(method);
3803 +                    // expected.getCause().printStackTrace();
3804 +                }
3805 +            }
3806 +            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3807 +        }
3808 +        if (!bugs.isEmpty())
3809 +            throw new Error("Methods did not throw UOE: " + bugs.toString());
3810 +    }
3811 +
3812 +    static class Monad {
3813 +        static class ZeroException extends RuntimeException {
3814 +            public ZeroException() { super("monadic zero"); }
3815 +        }
3816 +        // "return", "unit"
3817 +        static <T> CompletableFuture<T> unit(T value) {
3818 +            return completedFuture(value);
3819 +        }
3820 +        // monadic zero ?
3821 +        static <T> CompletableFuture<T> zero() {
3822 +            return failedFuture(new ZeroException());
3823 +        }
3824 +        // >=>
3825 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
3826 +            (Function<T, CompletableFuture<U>> f,
3827 +             Function<U, CompletableFuture<V>> g) {
3828 +            return (x) -> f.apply(x).thenCompose(g);
3829 +        }
3830 +
3831 +        static void assertZero(CompletableFuture<?> f) {
3832 +            try {
3833 +                f.getNow(null);
3834 +                throw new AssertionFailedError("should throw");
3835 +            } catch (CompletionException success) {
3836 +                assertTrue(success.getCause() instanceof ZeroException);
3837 +            }
3838 +        }
3839 +
3840 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
3841 +                                           CompletableFuture<T> g) {
3842 +            T fval = null, gval = null;
3843 +            Throwable fex = null, gex = null;
3844 +
3845 +            try { fval = f.get(); }
3846 +            catch (ExecutionException ex) { fex = ex.getCause(); }
3847 +            catch (Throwable ex) { fex = ex; }
3848 +
3849 +            try { gval = g.get(); }
3850 +            catch (ExecutionException ex) { gex = ex.getCause(); }
3851 +            catch (Throwable ex) { gex = ex; }
3852 +
3853 +            if (fex != null || gex != null)
3854 +                assertSame(fex.getClass(), gex.getClass());
3855 +            else
3856 +                assertEquals(fval, gval);
3857 +        }
3858 +
3859 +        static class PlusFuture<T> extends CompletableFuture<T> {
3860 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
3861 +        }
3862 +
3863 +        /** Implements "monadic plus". */
3864 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
3865 +                                             CompletableFuture<? extends T> g) {
3866 +            PlusFuture<T> plus = new PlusFuture<T>();
3867 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
3868 +                try {
3869 +                    if (ex == null) {
3870 +                        if (plus.complete(result))
3871 +                            if (plus.firstFailure.get() != null)
3872 +                                plus.firstFailure.set(null);
3873 +                    }
3874 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
3875 +                        if (plus.isDone())
3876 +                            plus.firstFailure.set(null);
3877 +                    }
3878 +                    else {
3879 +                        // first failure has precedence
3880 +                        Throwable first = plus.firstFailure.getAndSet(null);
3881 +
3882 +                        // may fail with "Self-suppression not permitted"
3883 +                        try { first.addSuppressed(ex); }
3884 +                        catch (Exception ignored) {}
3885 +
3886 +                        plus.completeExceptionally(first);
3887 +                    }
3888 +                } catch (Throwable unexpected) {
3889 +                    plus.completeExceptionally(unexpected);
3890 +                }
3891 +            };
3892 +            f.whenComplete(action);
3893 +            g.whenComplete(action);
3894 +            return plus;
3895 +        }
3896 +    }
3897 +
3898 +    /**
3899 +     * CompletableFuture is an additive monad - sort of.
3900 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
3901 +     */
3902 +    public void testAdditiveMonad() throws Throwable {
3903 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
3904 +        CompletableFuture<Long> zero = Monad.zero();
3905 +
3906 +        // Some mutually non-commutative functions
3907 +        Function<Long, CompletableFuture<Long>> triple
3908 +            = (x) -> Monad.unit(3 * x);
3909 +        Function<Long, CompletableFuture<Long>> inc
3910 +            = (x) -> Monad.unit(x + 1);
3911 +
3912 +        // unit is a right identity: m >>= unit === m
3913 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
3914 +                                 inc.apply(5L));
3915 +        // unit is a left identity: (unit x) >>= f === f x
3916 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
3917 +                                 inc.apply(5L));
3918 +
3919 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
3920 +        Monad.assertFutureEquals(
3921 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
3922 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
3923 +
3924 +        // The case for CompletableFuture as an additive monad is weaker...
3925 +
3926 +        // zero is a monadic zero
3927 +        Monad.assertZero(zero);
3928 +
3929 +        // left zero: zero >>= f === zero
3930 +        Monad.assertZero(zero.thenCompose(inc));
3931 +        // right zero: f >>= (\x -> zero) === zero
3932 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
3933 +
3934 +        // f plus zero === f
3935 +        Monad.assertFutureEquals(Monad.unit(5L),
3936 +                                 Monad.plus(Monad.unit(5L), zero));
3937 +        // zero plus f === f
3938 +        Monad.assertFutureEquals(Monad.unit(5L),
3939 +                                 Monad.plus(zero, Monad.unit(5L)));
3940 +        // zero plus zero === zero
3941 +        Monad.assertZero(Monad.plus(zero, zero));
3942 +        {
3943 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
3944 +                                                   Monad.unit(8L));
3945 +            // non-determinism
3946 +            assertTrue(f.get() == 5L || f.get() == 8L);
3947 +        }
3948 +
3949 +        CompletableFuture<Long> godot = new CompletableFuture<>();
3950 +        // f plus godot === f (doesn't wait for godot)
3951 +        Monad.assertFutureEquals(Monad.unit(5L),
3952 +                                 Monad.plus(Monad.unit(5L), godot));
3953 +        // godot plus f === f (doesn't wait for godot)
3954 +        Monad.assertFutureEquals(Monad.unit(5L),
3955 +                                 Monad.plus(godot, Monad.unit(5L)));
3956 +    }
3957 +
3958 +    /**
3959 +     * A single CompletableFuture with many dependents.
3960 +     * A demo of scalability - runtime is O(n).
3961 +     */
3962 +    public void testManyDependents() throws Throwable {
3963 +        final int n = 1_000;
3964 +        final CompletableFuture<Void> head = new CompletableFuture<>();
3965 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
3966 +        final AtomicInteger count = new AtomicInteger(0);
3967 +        for (int i = 0; i < n; i++) {
3968 +            head.thenRun(() -> count.getAndIncrement());
3969 +            head.thenAccept((x) -> count.getAndIncrement());
3970 +            head.thenApply((x) -> count.getAndIncrement());
3971 +
3972 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
3973 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
3974 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
3975 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
3976 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
3977 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
3978 +
3979 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
3980 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
3981 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
3982 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
3983 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
3984 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
3985 +        }
3986 +        head.complete(null);
3987 +        assertEquals(5 * 3 * n, count.get());
3988 +    }
3989 +
3990 + //     static <U> U join(CompletionStage<U> stage) {
3991 + //         CompletableFuture<U> f = new CompletableFuture<>();
3992 + //         stage.whenComplete((v, ex) -> {
3993 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3994 + //         });
3995 + //         return f.join();
3996 + //     }
3997 +
3998 + //     static <U> boolean isDone(CompletionStage<U> stage) {
3999 + //         CompletableFuture<U> f = new CompletableFuture<>();
4000 + //         stage.whenComplete((v, ex) -> {
4001 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4002 + //         });
4003 + //         return f.isDone();
4004 + //     }
4005 +
4006 + //     static <U> U join2(CompletionStage<U> stage) {
4007 + //         return stage.toCompletableFuture().copy().join();
4008 + //     }
4009 +
4010 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4011 + //         return stage.toCompletableFuture().copy().isDone();
4012 + //     }
4013 +
4014   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines