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.89 by jsr166, Mon Jun 16 21:34:49 2014 UTC vs.
Revision 1.169 by jsr166, Mon Jul 18 17:42: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.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
35 + import java.util.concurrent.TimeUnit;
36   import java.util.concurrent.atomic.AtomicInteger;
37 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 < import static java.util.concurrent.TimeUnit.SECONDS;
26 < import java.util.*;
27 < import java.util.function.Supplier;
28 < import java.util.function.Consumer;
37 > import java.util.concurrent.atomic.AtomicReference;
38   import java.util.function.BiConsumer;
30 import java.util.function.Function;
39   import java.util.function.BiFunction;
40 + import java.util.function.Consumer;
41 + import java.util.function.Function;
42 + import java.util.function.Predicate;
43 + import java.util.function.Supplier;
44 +
45 + import junit.framework.AssertionFailedError;
46 + import junit.framework.Test;
47 + import junit.framework.TestSuite;
48  
49   public class CompletableFutureTest extends JSR166TestCase {
50  
51      public static void main(String[] args) {
52 <        junit.textui.TestRunner.run(suite());
52 >        main(suite(), args);
53      }
54      public static Test suite() {
55          return new TestSuite(CompletableFutureTest.class);
# Line 44 | Line 60 | public class CompletableFutureTest exten
60      void checkIncomplete(CompletableFuture<?> f) {
61          assertFalse(f.isDone());
62          assertFalse(f.isCancelled());
63 <        assertTrue(f.toString().contains("[Not completed]"));
63 >        assertTrue(f.toString().contains("Not completed"));
64          try {
65              assertNull(f.getNow(null));
66          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 57 | Line 73 | public class CompletableFutureTest exten
73      }
74  
75      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
76 <        try {
77 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
76 >        checkTimedGet(f, value);
77 >
78          try {
79              assertEquals(value, f.join());
80          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 75 | Line 90 | public class CompletableFutureTest exten
90          assertTrue(f.toString().contains("[Completed normally]"));
91      }
92  
93 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
94 <        try {
95 <            f.get(LONG_DELAY_MS, MILLISECONDS);
96 <            shouldThrow();
97 <        } catch (ExecutionException success) {
98 <            assertTrue(success.getCause() instanceof CFException);
99 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
100 <        try {
101 <            f.join();
102 <            shouldThrow();
103 <        } catch (CompletionException success) {
104 <            assertTrue(success.getCause() instanceof CFException);
105 <        }
106 <        try {
107 <            f.getNow(null);
108 <            shouldThrow();
109 <        } catch (CompletionException success) {
95 <            assertTrue(success.getCause() instanceof CFException);
93 >    /**
94 >     * Returns the "raw" internal exceptional completion of f,
95 >     * without any additional wrapping with CompletionException.
96 >     */
97 >    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
98 >        // handle (and whenComplete) can distinguish between "direct"
99 >        // and "wrapped" exceptional completion
100 >        return f.handle((U u, Throwable t) -> t).join();
101 >    }
102 >
103 >    void checkCompletedExceptionally(CompletableFuture<?> f,
104 >                                     boolean wrapped,
105 >                                     Consumer<Throwable> checker) {
106 >        Throwable cause = exceptionalCompletion(f);
107 >        if (wrapped) {
108 >            assertTrue(cause instanceof CompletionException);
109 >            cause = cause.getCause();
110          }
111 <        try {
98 <            f.get();
99 <            shouldThrow();
100 <        } catch (ExecutionException success) {
101 <            assertTrue(success.getCause() instanceof CFException);
102 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
103 <        assertTrue(f.isDone());
104 <        assertFalse(f.isCancelled());
105 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
106 <    }
111 >        checker.accept(cause);
112  
113 <    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 <                                                      Throwable ex) {
113 >        long startTime = System.nanoTime();
114          try {
115              f.get(LONG_DELAY_MS, MILLISECONDS);
116              shouldThrow();
117          } catch (ExecutionException success) {
118 <            assertSame(ex, success.getCause());
118 >            assertSame(cause, success.getCause());
119          } catch (Throwable fail) { threadUnexpectedException(fail); }
120 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
121 +
122          try {
123              f.join();
124              shouldThrow();
125          } catch (CompletionException success) {
126 <            assertSame(ex, success.getCause());
127 <        }
126 >            assertSame(cause, success.getCause());
127 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
128 >
129          try {
130              f.getNow(null);
131              shouldThrow();
132          } catch (CompletionException success) {
133 <            assertSame(ex, success.getCause());
134 <        }
133 >            assertSame(cause, success.getCause());
134 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
135 >
136          try {
137              f.get();
138              shouldThrow();
139          } catch (ExecutionException success) {
140 <            assertSame(ex, success.getCause());
140 >            assertSame(cause, success.getCause());
141          } catch (Throwable fail) { threadUnexpectedException(fail); }
142  
135        assertTrue(f.isDone());
143          assertFalse(f.isCancelled());
144 +        assertTrue(f.isDone());
145 +        assertTrue(f.isCompletedExceptionally());
146          assertTrue(f.toString().contains("[Completed exceptionally]"));
147      }
148  
149 <    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
150 <                                                Throwable ex) {
151 <        checkCompletedExceptionallyWithRootCause(f, ex);
143 <        try {
144 <            CompletableFuture<Throwable> spy = f.handle
145 <                ((U u, Throwable t) -> t);
146 <            assertTrue(spy.join() instanceof CompletionException);
147 <            assertSame(ex, spy.join().getCause());
148 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
150 >        checkCompletedExceptionally(f, true,
151 >            (t) -> assertTrue(t instanceof CFException));
152      }
153  
154 <    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
155 <        checkCompletedExceptionallyWithRootCause(f, ex);
156 <        try {
157 <            CompletableFuture<Throwable> spy = f.handle
158 <                ((U u, Throwable t) -> t);
159 <            assertSame(ex, spy.join());
160 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
154 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
155 >        checkCompletedExceptionally(f, true,
156 >            (t) -> assertTrue(t instanceof CancellationException));
157 >    }
158 >
159 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
160 >        checkCompletedExceptionally(f, false,
161 >            (t) -> assertTrue(t instanceof TimeoutException));
162 >    }
163 >
164 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
165 >                                            Throwable ex) {
166 >        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
167 >    }
168 >
169 >    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
170 >        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
171      }
172  
173      void checkCancelled(CompletableFuture<?> f) {
174 +        long startTime = System.nanoTime();
175          try {
176              f.get(LONG_DELAY_MS, MILLISECONDS);
177              shouldThrow();
178          } catch (CancellationException success) {
179          } catch (Throwable fail) { threadUnexpectedException(fail); }
180 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
181 +
182          try {
183              f.join();
184              shouldThrow();
# Line 176 | Line 192 | public class CompletableFutureTest exten
192              shouldThrow();
193          } catch (CancellationException success) {
194          } catch (Throwable fail) { threadUnexpectedException(fail); }
179        assertTrue(f.isDone());
180        assertTrue(f.isCompletedExceptionally());
181        assertTrue(f.isCancelled());
182        assertTrue(f.toString().contains("[Completed exceptionally]"));
183    }
195  
196 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
197 <        try {
187 <            f.get(LONG_DELAY_MS, MILLISECONDS);
188 <            shouldThrow();
189 <        } catch (ExecutionException success) {
190 <            assertTrue(success.getCause() instanceof CancellationException);
191 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
192 <        try {
193 <            f.join();
194 <            shouldThrow();
195 <        } catch (CompletionException success) {
196 <            assertTrue(success.getCause() instanceof CancellationException);
197 <        }
198 <        try {
199 <            f.getNow(null);
200 <            shouldThrow();
201 <        } catch (CompletionException success) {
202 <            assertTrue(success.getCause() instanceof CancellationException);
203 <        }
204 <        try {
205 <            f.get();
206 <            shouldThrow();
207 <        } catch (ExecutionException success) {
208 <            assertTrue(success.getCause() instanceof CancellationException);
209 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
196 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
197 >
198          assertTrue(f.isDone());
211        assertFalse(f.isCancelled());
199          assertTrue(f.isCompletedExceptionally());
200 +        assertTrue(f.isCancelled());
201          assertTrue(f.toString().contains("[Completed exceptionally]"));
202      }
203  
# Line 257 | Line 245 | public class CompletableFutureTest exten
245      {
246          CompletableFuture<Integer> f = new CompletableFuture<>();
247          checkIncomplete(f);
248 <        assertTrue(f.cancel(true));
249 <        assertTrue(f.cancel(true));
248 >        assertTrue(f.cancel(mayInterruptIfRunning));
249 >        assertTrue(f.cancel(mayInterruptIfRunning));
250 >        assertTrue(f.cancel(!mayInterruptIfRunning));
251          checkCancelled(f);
252      }}
253  
# Line 471 | Line 460 | public class CompletableFutureTest exten
460      class FailingSupplier extends CheckedAction
461          implements Supplier<Integer>
462      {
463 <        FailingSupplier(ExecutionMode m) { super(m); }
463 >        final CFException ex;
464 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
465          public Integer get() {
466              invoked();
467 <            throw new CFException();
467 >            throw ex;
468          }
469      }
470  
471      class FailingConsumer extends CheckedIntegerAction
472          implements Consumer<Integer>
473      {
474 <        FailingConsumer(ExecutionMode m) { super(m); }
474 >        final CFException ex;
475 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
476          public void accept(Integer x) {
477              invoked();
478              value = x;
479 <            throw new CFException();
479 >            throw ex;
480          }
481      }
482  
483      class FailingBiConsumer extends CheckedIntegerAction
484          implements BiConsumer<Integer, Integer>
485      {
486 <        FailingBiConsumer(ExecutionMode m) { super(m); }
486 >        final CFException ex;
487 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
488          public void accept(Integer x, Integer y) {
489              invoked();
490              value = subtract(x, y);
491 <            throw new CFException();
491 >            throw ex;
492          }
493      }
494  
495      class FailingFunction extends CheckedIntegerAction
496          implements Function<Integer, Integer>
497      {
498 <        FailingFunction(ExecutionMode m) { super(m); }
498 >        final CFException ex;
499 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
500          public Integer apply(Integer x) {
501              invoked();
502              value = x;
503 <            throw new CFException();
503 >            throw ex;
504          }
505      }
506  
507      class FailingBiFunction extends CheckedIntegerAction
508          implements BiFunction<Integer, Integer, Integer>
509      {
510 <        FailingBiFunction(ExecutionMode m) { super(m); }
510 >        final CFException ex;
511 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
512          public Integer apply(Integer x, Integer y) {
513              invoked();
514              value = subtract(x, y);
515 <            throw new CFException();
515 >            throw ex;
516          }
517      }
518  
519      class FailingRunnable extends CheckedAction implements Runnable {
520 <        FailingRunnable(ExecutionMode m) { super(m); }
520 >        final CFException ex;
521 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
522          public void run() {
523              invoked();
524 <            throw new CFException();
524 >            throw ex;
525          }
526      }
527  
533
528      class CompletableFutureInc extends CheckedIntegerAction
529          implements Function<Integer, CompletableFuture<Integer>>
530      {
# Line 547 | Line 541 | public class CompletableFutureTest exten
541      class FailingCompletableFutureFunction extends CheckedIntegerAction
542          implements Function<Integer, CompletableFuture<Integer>>
543      {
544 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
544 >        final CFException ex;
545 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
546          public CompletableFuture<Integer> apply(Integer x) {
547              invoked();
548              value = x;
549 <            throw new CFException();
549 >            throw ex;
550 >        }
551 >    }
552 >
553 >    static class CountingRejectingExecutor implements Executor {
554 >        final RejectedExecutionException ex = new RejectedExecutionException();
555 >        final AtomicInteger count = new AtomicInteger(0);
556 >        public void execute(Runnable r) {
557 >            count.getAndIncrement();
558 >            throw ex;
559          }
560      }
561  
# Line 569 | Line 573 | public class CompletableFutureTest exten
573          }
574      }
575  
576 +    static final boolean defaultExecutorIsCommonPool
577 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
578 +
579      /**
580       * Permits the testing of parallel code for the 3 different
581       * execution modes without copy/pasting all the test methods.
582       */
583      enum ExecutionMode {
584 <        DEFAULT {
584 >        SYNC {
585              public void checkExecutionMode() {
586                  assertFalse(ThreadExecutor.startedCurrentThread());
587                  assertNull(ForkJoinTask.getPool());
# Line 650 | Line 657 | public class CompletableFutureTest exten
657  
658          ASYNC {
659              public void checkExecutionMode() {
660 <                assertSame(ForkJoinPool.commonPool(),
661 <                           ForkJoinTask.getPool());
660 >                assertEquals(defaultExecutorIsCommonPool,
661 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
662              }
663              public CompletableFuture<Void> runAsync(Runnable a) {
664                  return CompletableFuture.runAsync(a);
# Line 850 | Line 857 | public class CompletableFutureTest exten
857          if (!createIncomplete) assertTrue(f.complete(v1));
858          final CompletableFuture<Integer> g = f.exceptionally
859              ((Throwable t) -> {
853                // Should not be called
860                  a.getAndIncrement();
861 <                throw new AssertionError();
861 >                threadFail("should not be called");
862 >                return null;            // unreached
863              });
864          if (createIncomplete) assertTrue(f.complete(v1));
865  
# Line 875 | Line 882 | public class CompletableFutureTest exten
882          if (!createIncomplete) f.completeExceptionally(ex);
883          final CompletableFuture<Integer> g = f.exceptionally
884              ((Throwable t) -> {
885 <                ExecutionMode.DEFAULT.checkExecutionMode();
885 >                ExecutionMode.SYNC.checkExecutionMode();
886                  threadAssertSame(t, ex);
887                  a.getAndIncrement();
888                  return v1;
# Line 886 | Line 893 | public class CompletableFutureTest exten
893          assertEquals(1, a.get());
894      }}
895  
896 +    /**
897 +     * If an "exceptionally action" throws an exception, it completes
898 +     * exceptionally with that exception
899 +     */
900      public void testExceptionally_exceptionalCompletionActionFailed() {
901          for (boolean createIncomplete : new boolean[] { true, false })
891        for (Integer v1 : new Integer[] { 1, null })
902      {
903          final AtomicInteger a = new AtomicInteger(0);
904          final CFException ex1 = new CFException();
# Line 897 | Line 907 | public class CompletableFutureTest exten
907          if (!createIncomplete) f.completeExceptionally(ex1);
908          final CompletableFuture<Integer> g = f.exceptionally
909              ((Throwable t) -> {
910 <                ExecutionMode.DEFAULT.checkExecutionMode();
910 >                ExecutionMode.SYNC.checkExecutionMode();
911                  threadAssertSame(t, ex1);
912                  a.getAndIncrement();
913                  throw ex2;
# Line 905 | Line 915 | public class CompletableFutureTest exten
915          if (createIncomplete) f.completeExceptionally(ex1);
916  
917          checkCompletedWithWrappedException(g, ex2);
918 +        checkCompletedExceptionally(f, ex1);
919          assertEquals(1, a.get());
920      }}
921  
# Line 912 | Line 923 | public class CompletableFutureTest exten
923       * whenComplete action executes on normal completion, propagating
924       * source result.
925       */
926 <    public void testWhenComplete_normalCompletion1() {
926 >    public void testWhenComplete_normalCompletion() {
927          for (ExecutionMode m : ExecutionMode.values())
928          for (boolean createIncomplete : new boolean[] { true, false })
929          for (Integer v1 : new Integer[] { 1, null })
# Line 922 | Line 933 | public class CompletableFutureTest exten
933          if (!createIncomplete) assertTrue(f.complete(v1));
934          final CompletableFuture<Integer> g = m.whenComplete
935              (f,
936 <             (Integer x, Throwable t) -> {
936 >             (Integer result, Throwable t) -> {
937                  m.checkExecutionMode();
938 <                threadAssertSame(x, v1);
938 >                threadAssertSame(result, v1);
939                  threadAssertNull(t);
940                  a.getAndIncrement();
941              });
# Line 942 | Line 953 | public class CompletableFutureTest exten
953      public void testWhenComplete_exceptionalCompletion() {
954          for (ExecutionMode m : ExecutionMode.values())
955          for (boolean createIncomplete : new boolean[] { true, false })
945        for (Integer v1 : new Integer[] { 1, null })
956      {
957          final AtomicInteger a = new AtomicInteger(0);
958          final CFException ex = new CFException();
# Line 950 | Line 960 | public class CompletableFutureTest exten
960          if (!createIncomplete) f.completeExceptionally(ex);
961          final CompletableFuture<Integer> g = m.whenComplete
962              (f,
963 <             (Integer x, Throwable t) -> {
963 >             (Integer result, Throwable t) -> {
964                  m.checkExecutionMode();
965 <                threadAssertNull(x);
965 >                threadAssertNull(result);
966                  threadAssertSame(t, ex);
967                  a.getAndIncrement();
968              });
# Line 977 | Line 987 | public class CompletableFutureTest exten
987          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
988          final CompletableFuture<Integer> g = m.whenComplete
989              (f,
990 <             (Integer x, Throwable t) -> {
990 >             (Integer result, Throwable t) -> {
991                  m.checkExecutionMode();
992 <                threadAssertNull(x);
992 >                threadAssertNull(result);
993                  threadAssertTrue(t instanceof CancellationException);
994                  a.getAndIncrement();
995              });
# Line 994 | Line 1004 | public class CompletableFutureTest exten
1004       * If a whenComplete action throws an exception when triggered by
1005       * a normal completion, it completes exceptionally
1006       */
1007 <    public void testWhenComplete_actionFailed() {
1007 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1008          for (boolean createIncomplete : new boolean[] { true, false })
1009          for (ExecutionMode m : ExecutionMode.values())
1010          for (Integer v1 : new Integer[] { 1, null })
# Line 1005 | Line 1015 | public class CompletableFutureTest exten
1015          if (!createIncomplete) assertTrue(f.complete(v1));
1016          final CompletableFuture<Integer> g = m.whenComplete
1017              (f,
1018 <             (Integer x, Throwable t) -> {
1018 >             (Integer result, Throwable t) -> {
1019                  m.checkExecutionMode();
1020 <                threadAssertSame(x, v1);
1020 >                threadAssertSame(result, v1);
1021                  threadAssertNull(t);
1022                  a.getAndIncrement();
1023                  throw ex;
# Line 1022 | Line 1032 | public class CompletableFutureTest exten
1032      /**
1033       * If a whenComplete action throws an exception when triggered by
1034       * a source completion that also throws an exception, the source
1035 <     * exception takes precedence.
1035 >     * exception takes precedence (unlike handle)
1036       */
1037 <    public void testWhenComplete_actionFailedSourceFailed() {
1037 >    public void testWhenComplete_sourceFailedActionFailed() {
1038          for (boolean createIncomplete : new boolean[] { true, false })
1039          for (ExecutionMode m : ExecutionMode.values())
1030        for (Integer v1 : new Integer[] { 1, null })
1040      {
1041          final AtomicInteger a = new AtomicInteger(0);
1042          final CFException ex1 = new CFException();
# Line 1037 | Line 1046 | public class CompletableFutureTest exten
1046          if (!createIncomplete) f.completeExceptionally(ex1);
1047          final CompletableFuture<Integer> g = m.whenComplete
1048              (f,
1049 <             (Integer x, Throwable t) -> {
1049 >             (Integer result, Throwable t) -> {
1050                  m.checkExecutionMode();
1051                  threadAssertSame(t, ex1);
1052 <                threadAssertNull(x);
1052 >                threadAssertNull(result);
1053                  a.getAndIncrement();
1054                  throw ex2;
1055              });
# Line 1048 | Line 1057 | public class CompletableFutureTest exten
1057  
1058          checkCompletedWithWrappedException(g, ex1);
1059          checkCompletedExceptionally(f, ex1);
1060 +        if (testImplementationDetails) {
1061 +            assertEquals(1, ex1.getSuppressed().length);
1062 +            assertSame(ex2, ex1.getSuppressed()[0]);
1063 +        }
1064          assertEquals(1, a.get());
1065      }}
1066  
# Line 1065 | Line 1078 | public class CompletableFutureTest exten
1078          if (!createIncomplete) assertTrue(f.complete(v1));
1079          final CompletableFuture<Integer> g = m.handle
1080              (f,
1081 <             (Integer x, Throwable t) -> {
1081 >             (Integer result, Throwable t) -> {
1082                  m.checkExecutionMode();
1083 <                threadAssertSame(x, v1);
1083 >                threadAssertSame(result, v1);
1084                  threadAssertNull(t);
1085                  a.getAndIncrement();
1086                  return inc(v1);
# Line 1094 | Line 1107 | public class CompletableFutureTest exten
1107          if (!createIncomplete) f.completeExceptionally(ex);
1108          final CompletableFuture<Integer> g = m.handle
1109              (f,
1110 <             (Integer x, Throwable t) -> {
1110 >             (Integer result, Throwable t) -> {
1111                  m.checkExecutionMode();
1112 <                threadAssertNull(x);
1112 >                threadAssertNull(result);
1113                  threadAssertSame(t, ex);
1114                  a.getAndIncrement();
1115                  return v1;
# Line 1123 | Line 1136 | public class CompletableFutureTest exten
1136          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1137          final CompletableFuture<Integer> g = m.handle
1138              (f,
1139 <             (Integer x, Throwable t) -> {
1139 >             (Integer result, Throwable t) -> {
1140                  m.checkExecutionMode();
1141 <                threadAssertNull(x);
1141 >                threadAssertNull(result);
1142                  threadAssertTrue(t instanceof CancellationException);
1143                  a.getAndIncrement();
1144                  return v1;
# Line 1138 | Line 1151 | public class CompletableFutureTest exten
1151      }}
1152  
1153      /**
1154 <     * handle result completes exceptionally if action does
1154 >     * If a "handle action" throws an exception when triggered by
1155 >     * a normal completion, it completes exceptionally
1156       */
1157 <    public void testHandle_sourceFailedActionFailed() {
1157 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1158          for (ExecutionMode m : ExecutionMode.values())
1159          for (boolean createIncomplete : new boolean[] { true, false })
1160 +        for (Integer v1 : new Integer[] { 1, null })
1161      {
1162          final CompletableFuture<Integer> f = new CompletableFuture<>();
1163          final AtomicInteger a = new AtomicInteger(0);
1164 <        final CFException ex1 = new CFException();
1165 <        final CFException ex2 = new CFException();
1151 <        if (!createIncomplete) f.completeExceptionally(ex1);
1164 >        final CFException ex = new CFException();
1165 >        if (!createIncomplete) assertTrue(f.complete(v1));
1166          final CompletableFuture<Integer> g = m.handle
1167              (f,
1168 <             (Integer x, Throwable t) -> {
1168 >             (Integer result, Throwable t) -> {
1169                  m.checkExecutionMode();
1170 <                threadAssertNull(x);
1171 <                threadAssertSame(ex1, t);
1170 >                threadAssertSame(result, v1);
1171 >                threadAssertNull(t);
1172                  a.getAndIncrement();
1173 <                throw ex2;
1173 >                throw ex;
1174              });
1175 <        if (createIncomplete) f.completeExceptionally(ex1);
1175 >        if (createIncomplete) assertTrue(f.complete(v1));
1176  
1177 <        checkCompletedWithWrappedException(g, ex2);
1178 <        checkCompletedExceptionally(f, ex1);
1177 >        checkCompletedWithWrappedException(g, ex);
1178 >        checkCompletedNormally(f, v1);
1179          assertEquals(1, a.get());
1180      }}
1181  
1182 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1183 <        for (ExecutionMode m : ExecutionMode.values())
1182 >    /**
1183 >     * If a "handle action" throws an exception when triggered by
1184 >     * a source completion that also throws an exception, the action
1185 >     * exception takes precedence (unlike whenComplete)
1186 >     */
1187 >    public void testHandle_sourceFailedActionFailed() {
1188          for (boolean createIncomplete : new boolean[] { true, false })
1189 <        for (Integer v1 : new Integer[] { 1, null })
1189 >        for (ExecutionMode m : ExecutionMode.values())
1190      {
1173        final CompletableFuture<Integer> f = new CompletableFuture<>();
1191          final AtomicInteger a = new AtomicInteger(0);
1192 <        final CFException ex = new CFException();
1193 <        if (!createIncomplete) assertTrue(f.complete(v1));
1192 >        final CFException ex1 = new CFException();
1193 >        final CFException ex2 = new CFException();
1194 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1195 >
1196 >        if (!createIncomplete) f.completeExceptionally(ex1);
1197          final CompletableFuture<Integer> g = m.handle
1198              (f,
1199 <             (Integer x, Throwable t) -> {
1199 >             (Integer result, Throwable t) -> {
1200                  m.checkExecutionMode();
1201 <                threadAssertSame(x, v1);
1202 <                threadAssertNull(t);
1201 >                threadAssertNull(result);
1202 >                threadAssertSame(ex1, t);
1203                  a.getAndIncrement();
1204 <                throw ex;
1204 >                throw ex2;
1205              });
1206 <        if (createIncomplete) assertTrue(f.complete(v1));
1206 >        if (createIncomplete) f.completeExceptionally(ex1);
1207  
1208 <        checkCompletedWithWrappedException(g, ex);
1209 <        checkCompletedNormally(f, v1);
1208 >        checkCompletedWithWrappedException(g, ex2);
1209 >        checkCompletedExceptionally(f, ex1);
1210          assertEquals(1, a.get());
1211      }}
1212  
# Line 1219 | Line 1239 | public class CompletableFutureTest exten
1239      {
1240          final FailingRunnable r = new FailingRunnable(m);
1241          final CompletableFuture<Void> f = m.runAsync(r);
1242 <        checkCompletedWithWrappedCFException(f);
1242 >        checkCompletedWithWrappedException(f, r.ex);
1243          r.assertInvoked();
1244      }}
1245  
1246 +    public void testRunAsync_rejectingExecutor() {
1247 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1248 +        try {
1249 +            CompletableFuture.runAsync(() -> {}, e);
1250 +            shouldThrow();
1251 +        } catch (Throwable t) {
1252 +            assertSame(e.ex, t);
1253 +        }
1254 +
1255 +        assertEquals(1, e.count.get());
1256 +    }
1257 +
1258      /**
1259       * supplyAsync completes with result of supplier
1260       */
# Line 1253 | Line 1285 | public class CompletableFutureTest exten
1285      {
1286          FailingSupplier r = new FailingSupplier(m);
1287          CompletableFuture<Integer> f = m.supplyAsync(r);
1288 <        checkCompletedWithWrappedCFException(f);
1288 >        checkCompletedWithWrappedException(f, r.ex);
1289          r.assertInvoked();
1290      }}
1291  
1292 +    public void testSupplyAsync_rejectingExecutor() {
1293 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1294 +        try {
1295 +            CompletableFuture.supplyAsync(() -> null, e);
1296 +            shouldThrow();
1297 +        } catch (Throwable t) {
1298 +            assertSame(e.ex, t);
1299 +        }
1300 +
1301 +        assertEquals(1, e.count.get());
1302 +    }
1303 +
1304      // seq completion methods
1305  
1306      /**
# Line 1264 | Line 1308 | public class CompletableFutureTest exten
1308       */
1309      public void testThenRun_normalCompletion() {
1310          for (ExecutionMode m : ExecutionMode.values())
1267        for (boolean createIncomplete : new boolean[] { true, false })
1311          for (Integer v1 : new Integer[] { 1, null })
1312      {
1313          final CompletableFuture<Integer> f = new CompletableFuture<>();
1314 <        final Noop r = new Noop(m);
1315 <        if (!createIncomplete) assertTrue(f.complete(v1));
1273 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1274 <        if (createIncomplete) {
1275 <            checkIncomplete(g);
1276 <            assertTrue(f.complete(v1));
1277 <        }
1314 >        final Noop[] rs = new Noop[6];
1315 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1316  
1317 <        checkCompletedNormally(g, null);
1317 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1318 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1319 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1320 >        checkIncomplete(h0);
1321 >        checkIncomplete(h1);
1322 >        checkIncomplete(h2);
1323 >        assertTrue(f.complete(v1));
1324 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1325 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1326 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1327 >
1328 >        checkCompletedNormally(h0, null);
1329 >        checkCompletedNormally(h1, null);
1330 >        checkCompletedNormally(h2, null);
1331 >        checkCompletedNormally(h3, null);
1332 >        checkCompletedNormally(h4, null);
1333 >        checkCompletedNormally(h5, null);
1334          checkCompletedNormally(f, v1);
1335 <        r.assertInvoked();
1335 >        for (Noop r : rs) r.assertInvoked();
1336      }}
1337  
1338      /**
# Line 1287 | Line 1341 | public class CompletableFutureTest exten
1341       */
1342      public void testThenRun_exceptionalCompletion() {
1343          for (ExecutionMode m : ExecutionMode.values())
1290        for (boolean createIncomplete : new boolean[] { true, false })
1344      {
1345          final CFException ex = new CFException();
1346          final CompletableFuture<Integer> f = new CompletableFuture<>();
1347 <        final Noop r = new Noop(m);
1348 <        if (!createIncomplete) f.completeExceptionally(ex);
1296 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1297 <        if (createIncomplete) {
1298 <            checkIncomplete(g);
1299 <            f.completeExceptionally(ex);
1300 <        }
1347 >        final Noop[] rs = new Noop[6];
1348 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1349  
1350 <        checkCompletedWithWrappedException(g, ex);
1350 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1351 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1352 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1353 >        checkIncomplete(h0);
1354 >        checkIncomplete(h1);
1355 >        checkIncomplete(h2);
1356 >        assertTrue(f.completeExceptionally(ex));
1357 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1358 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1359 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1360 >
1361 >        checkCompletedWithWrappedException(h0, ex);
1362 >        checkCompletedWithWrappedException(h1, ex);
1363 >        checkCompletedWithWrappedException(h2, ex);
1364 >        checkCompletedWithWrappedException(h3, ex);
1365 >        checkCompletedWithWrappedException(h4, ex);
1366 >        checkCompletedWithWrappedException(h5, ex);
1367          checkCompletedExceptionally(f, ex);
1368 <        r.assertNotInvoked();
1368 >        for (Noop r : rs) r.assertNotInvoked();
1369      }}
1370  
1371      /**
# Line 1309 | Line 1373 | public class CompletableFutureTest exten
1373       */
1374      public void testThenRun_sourceCancelled() {
1375          for (ExecutionMode m : ExecutionMode.values())
1312        for (boolean createIncomplete : new boolean[] { true, false })
1376          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1377      {
1378          final CompletableFuture<Integer> f = new CompletableFuture<>();
1379 <        final Noop r = new Noop(m);
1380 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1318 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1319 <        if (createIncomplete) {
1320 <            checkIncomplete(g);
1321 <            assertTrue(f.cancel(mayInterruptIfRunning));
1322 <        }
1379 >        final Noop[] rs = new Noop[6];
1380 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1381  
1382 <        checkCompletedWithWrappedCancellationException(g);
1382 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1383 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1384 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1385 >        checkIncomplete(h0);
1386 >        checkIncomplete(h1);
1387 >        checkIncomplete(h2);
1388 >        assertTrue(f.cancel(mayInterruptIfRunning));
1389 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1390 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1391 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1392 >
1393 >        checkCompletedWithWrappedCancellationException(h0);
1394 >        checkCompletedWithWrappedCancellationException(h1);
1395 >        checkCompletedWithWrappedCancellationException(h2);
1396 >        checkCompletedWithWrappedCancellationException(h3);
1397 >        checkCompletedWithWrappedCancellationException(h4);
1398 >        checkCompletedWithWrappedCancellationException(h5);
1399          checkCancelled(f);
1400 <        r.assertNotInvoked();
1400 >        for (Noop r : rs) r.assertNotInvoked();
1401      }}
1402  
1403      /**
# Line 1331 | Line 1405 | public class CompletableFutureTest exten
1405       */
1406      public void testThenRun_actionFailed() {
1407          for (ExecutionMode m : ExecutionMode.values())
1334        for (boolean createIncomplete : new boolean[] { true, false })
1408          for (Integer v1 : new Integer[] { 1, null })
1409      {
1410          final CompletableFuture<Integer> f = new CompletableFuture<>();
1411 <        final FailingRunnable r = new FailingRunnable(m);
1412 <        if (!createIncomplete) assertTrue(f.complete(v1));
1340 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1341 <        if (createIncomplete) {
1342 <            checkIncomplete(g);
1343 <            assertTrue(f.complete(v1));
1344 <        }
1411 >        final FailingRunnable[] rs = new FailingRunnable[6];
1412 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1413  
1414 <        checkCompletedWithWrappedCFException(g);
1414 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1415 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1416 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1417 >        assertTrue(f.complete(v1));
1418 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1419 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1420 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1421 >
1422 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1423 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1424 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1425 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1426 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1427 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1428          checkCompletedNormally(f, v1);
1429      }}
1430  
# Line 1352 | Line 1433 | public class CompletableFutureTest exten
1433       */
1434      public void testThenApply_normalCompletion() {
1435          for (ExecutionMode m : ExecutionMode.values())
1355        for (boolean createIncomplete : new boolean[] { true, false })
1436          for (Integer v1 : new Integer[] { 1, null })
1437      {
1438          final CompletableFuture<Integer> f = new CompletableFuture<>();
1439 <        final IncFunction r = new IncFunction(m);
1440 <        if (!createIncomplete) assertTrue(f.complete(v1));
1361 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1362 <        if (createIncomplete) {
1363 <            checkIncomplete(g);
1364 <            assertTrue(f.complete(v1));
1365 <        }
1439 >        final IncFunction[] rs = new IncFunction[4];
1440 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1441  
1442 <        checkCompletedNormally(g, inc(v1));
1442 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1443 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1444 >        checkIncomplete(h0);
1445 >        checkIncomplete(h1);
1446 >        assertTrue(f.complete(v1));
1447 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1448 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1449 >
1450 >        checkCompletedNormally(h0, inc(v1));
1451 >        checkCompletedNormally(h1, inc(v1));
1452 >        checkCompletedNormally(h2, inc(v1));
1453 >        checkCompletedNormally(h3, inc(v1));
1454          checkCompletedNormally(f, v1);
1455 <        r.assertValue(inc(v1));
1455 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1456      }}
1457  
1458      /**
# Line 1375 | Line 1461 | public class CompletableFutureTest exten
1461       */
1462      public void testThenApply_exceptionalCompletion() {
1463          for (ExecutionMode m : ExecutionMode.values())
1378        for (boolean createIncomplete : new boolean[] { true, false })
1464      {
1465          final CFException ex = new CFException();
1466          final CompletableFuture<Integer> f = new CompletableFuture<>();
1467 <        final IncFunction r = new IncFunction(m);
1468 <        if (!createIncomplete) f.completeExceptionally(ex);
1384 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1385 <        if (createIncomplete) {
1386 <            checkIncomplete(g);
1387 <            f.completeExceptionally(ex);
1388 <        }
1467 >        final IncFunction[] rs = new IncFunction[4];
1468 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1469  
1470 <        checkCompletedWithWrappedException(g, ex);
1470 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1471 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1472 >        assertTrue(f.completeExceptionally(ex));
1473 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1474 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1475 >
1476 >        checkCompletedWithWrappedException(h0, ex);
1477 >        checkCompletedWithWrappedException(h1, ex);
1478 >        checkCompletedWithWrappedException(h2, ex);
1479 >        checkCompletedWithWrappedException(h3, ex);
1480          checkCompletedExceptionally(f, ex);
1481 <        r.assertNotInvoked();
1481 >        for (IncFunction r : rs) r.assertNotInvoked();
1482      }}
1483  
1484      /**
# Line 1397 | Line 1486 | public class CompletableFutureTest exten
1486       */
1487      public void testThenApply_sourceCancelled() {
1488          for (ExecutionMode m : ExecutionMode.values())
1400        for (boolean createIncomplete : new boolean[] { true, false })
1489          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490      {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final IncFunction r = new IncFunction(m);
1493 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1406 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1407 <        if (createIncomplete) {
1408 <            checkIncomplete(g);
1409 <            assertTrue(f.cancel(mayInterruptIfRunning));
1410 <        }
1492 >        final IncFunction[] rs = new IncFunction[4];
1493 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1494  
1495 <        checkCompletedWithWrappedCancellationException(g);
1495 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1496 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1497 >        assertTrue(f.cancel(mayInterruptIfRunning));
1498 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1499 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1500 >
1501 >        checkCompletedWithWrappedCancellationException(h0);
1502 >        checkCompletedWithWrappedCancellationException(h1);
1503 >        checkCompletedWithWrappedCancellationException(h2);
1504 >        checkCompletedWithWrappedCancellationException(h3);
1505          checkCancelled(f);
1506 <        r.assertNotInvoked();
1506 >        for (IncFunction r : rs) r.assertNotInvoked();
1507      }}
1508  
1509      /**
# Line 1419 | Line 1511 | public class CompletableFutureTest exten
1511       */
1512      public void testThenApply_actionFailed() {
1513          for (ExecutionMode m : ExecutionMode.values())
1422        for (boolean createIncomplete : new boolean[] { true, false })
1514          for (Integer v1 : new Integer[] { 1, null })
1515      {
1516          final CompletableFuture<Integer> f = new CompletableFuture<>();
1517 <        final FailingFunction r = new FailingFunction(m);
1518 <        if (!createIncomplete) assertTrue(f.complete(v1));
1519 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1520 <        if (createIncomplete) {
1521 <            checkIncomplete(g);
1522 <            assertTrue(f.complete(v1));
1523 <        }
1517 >        final FailingFunction[] rs = new FailingFunction[4];
1518 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1519 >
1520 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1521 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1522 >        assertTrue(f.complete(v1));
1523 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1524 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1525  
1526 <        checkCompletedWithWrappedCFException(g);
1526 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1527 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1528 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1529 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1530          checkCompletedNormally(f, v1);
1531      }}
1532  
# Line 1440 | Line 1535 | public class CompletableFutureTest exten
1535       */
1536      public void testThenAccept_normalCompletion() {
1537          for (ExecutionMode m : ExecutionMode.values())
1443        for (boolean createIncomplete : new boolean[] { true, false })
1538          for (Integer v1 : new Integer[] { 1, null })
1539      {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541 <        final NoopConsumer r = new NoopConsumer(m);
1542 <        if (!createIncomplete) assertTrue(f.complete(v1));
1449 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1450 <        if (createIncomplete) {
1451 <            checkIncomplete(g);
1452 <            assertTrue(f.complete(v1));
1453 <        }
1541 >        final NoopConsumer[] rs = new NoopConsumer[4];
1542 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1543  
1544 <        checkCompletedNormally(g, null);
1545 <        r.assertValue(v1);
1544 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1545 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1546 >        checkIncomplete(h0);
1547 >        checkIncomplete(h1);
1548 >        assertTrue(f.complete(v1));
1549 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1550 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1551 >
1552 >        checkCompletedNormally(h0, null);
1553 >        checkCompletedNormally(h1, null);
1554 >        checkCompletedNormally(h2, null);
1555 >        checkCompletedNormally(h3, null);
1556          checkCompletedNormally(f, v1);
1557 +        for (NoopConsumer r : rs) r.assertValue(v1);
1558      }}
1559  
1560      /**
# Line 1463 | Line 1563 | public class CompletableFutureTest exten
1563       */
1564      public void testThenAccept_exceptionalCompletion() {
1565          for (ExecutionMode m : ExecutionMode.values())
1466        for (boolean createIncomplete : new boolean[] { true, false })
1566      {
1567          final CFException ex = new CFException();
1568          final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final NoopConsumer r = new NoopConsumer(m);
1570 <        if (!createIncomplete) f.completeExceptionally(ex);
1472 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1473 <        if (createIncomplete) {
1474 <            checkIncomplete(g);
1475 <            f.completeExceptionally(ex);
1476 <        }
1569 >        final NoopConsumer[] rs = new NoopConsumer[4];
1570 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1571  
1572 <        checkCompletedWithWrappedException(g, ex);
1572 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1573 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1574 >        assertTrue(f.completeExceptionally(ex));
1575 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1576 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1577 >
1578 >        checkCompletedWithWrappedException(h0, ex);
1579 >        checkCompletedWithWrappedException(h1, ex);
1580 >        checkCompletedWithWrappedException(h2, ex);
1581 >        checkCompletedWithWrappedException(h3, ex);
1582          checkCompletedExceptionally(f, ex);
1583 <        r.assertNotInvoked();
1583 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1584      }}
1585  
1586      /**
# Line 1485 | Line 1588 | public class CompletableFutureTest exten
1588       */
1589      public void testThenAccept_sourceCancelled() {
1590          for (ExecutionMode m : ExecutionMode.values())
1488        for (boolean createIncomplete : new boolean[] { true, false })
1591          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1592      {
1593          final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        final NoopConsumer r = new NoopConsumer(m);
1595 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1494 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1495 <        if (createIncomplete) {
1496 <            checkIncomplete(g);
1497 <            assertTrue(f.cancel(mayInterruptIfRunning));
1498 <        }
1594 >        final NoopConsumer[] rs = new NoopConsumer[4];
1595 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1596  
1597 <        checkCompletedWithWrappedCancellationException(g);
1597 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1598 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1599 >        assertTrue(f.cancel(mayInterruptIfRunning));
1600 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1601 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1602 >
1603 >        checkCompletedWithWrappedCancellationException(h0);
1604 >        checkCompletedWithWrappedCancellationException(h1);
1605 >        checkCompletedWithWrappedCancellationException(h2);
1606 >        checkCompletedWithWrappedCancellationException(h3);
1607          checkCancelled(f);
1608 <        r.assertNotInvoked();
1608 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1609      }}
1610  
1611      /**
# Line 1507 | Line 1613 | public class CompletableFutureTest exten
1613       */
1614      public void testThenAccept_actionFailed() {
1615          for (ExecutionMode m : ExecutionMode.values())
1510        for (boolean createIncomplete : new boolean[] { true, false })
1616          for (Integer v1 : new Integer[] { 1, null })
1617      {
1618          final CompletableFuture<Integer> f = new CompletableFuture<>();
1619 <        final FailingConsumer r = new FailingConsumer(m);
1620 <        if (!createIncomplete) f.complete(v1);
1621 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1622 <        if (createIncomplete) {
1623 <            checkIncomplete(g);
1624 <            f.complete(v1);
1625 <        }
1619 >        final FailingConsumer[] rs = new FailingConsumer[4];
1620 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1621 >
1622 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1623 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1624 >        assertTrue(f.complete(v1));
1625 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1626 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1627  
1628 <        checkCompletedWithWrappedCFException(g);
1628 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1629 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1630 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1631 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1632          checkCompletedNormally(f, v1);
1633      }}
1634  
# Line 1535 | Line 1644 | public class CompletableFutureTest exten
1644      {
1645          final CompletableFuture<Integer> f = new CompletableFuture<>();
1646          final CompletableFuture<Integer> g = new CompletableFuture<>();
1647 <        final SubtractFunction r1 = new SubtractFunction(m);
1648 <        final SubtractFunction r2 = new SubtractFunction(m);
1540 <        final SubtractFunction r3 = new SubtractFunction(m);
1647 >        final SubtractFunction[] rs = new SubtractFunction[6];
1648 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1649  
1650          final CompletableFuture<Integer> fst =  fFirst ? f : g;
1651          final CompletableFuture<Integer> snd = !fFirst ? f : g;
1652          final Integer w1 =  fFirst ? v1 : v2;
1653          final Integer w2 = !fFirst ? v1 : v2;
1654  
1655 <        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1655 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1656 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1657          assertTrue(fst.complete(w1));
1658 <        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1659 <        checkIncomplete(h1);
1660 <        checkIncomplete(h2);
1661 <        r1.assertNotInvoked();
1662 <        r2.assertNotInvoked();
1658 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1659 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1660 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1661 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1662 >        checkCompletedNormally(h1, subtract(w1, w1));
1663 >        checkCompletedNormally(h3, subtract(w1, w1));
1664 >        rs[1].assertValue(subtract(w1, w1));
1665 >        rs[3].assertValue(subtract(w1, w1));
1666          assertTrue(snd.complete(w2));
1667 <        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1667 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1668  
1669 <        checkCompletedNormally(h1, subtract(v1, v2));
1669 >        checkCompletedNormally(h0, subtract(v1, v2));
1670          checkCompletedNormally(h2, subtract(v1, v2));
1671 <        checkCompletedNormally(h3, subtract(v1, v2));
1672 <        r1.assertValue(subtract(v1, v2));
1673 <        r2.assertValue(subtract(v1, v2));
1674 <        r3.assertValue(subtract(v1, v2));
1671 >        checkCompletedNormally(h4, subtract(v1, v2));
1672 >        rs[0].assertValue(subtract(v1, v2));
1673 >        rs[2].assertValue(subtract(v1, v2));
1674 >        rs[4].assertValue(subtract(v1, v2));
1675 >
1676          checkCompletedNormally(f, v1);
1677          checkCompletedNormally(g, v2);
1678      }}
# Line 1677 | Line 1790 | public class CompletableFutureTest exten
1790          assertTrue(snd.complete(w2));
1791          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1792  
1793 <        checkCompletedWithWrappedCFException(h1);
1794 <        checkCompletedWithWrappedCFException(h2);
1795 <        checkCompletedWithWrappedCFException(h3);
1793 >        checkCompletedWithWrappedException(h1, r1.ex);
1794 >        checkCompletedWithWrappedException(h2, r2.ex);
1795 >        checkCompletedWithWrappedException(h3, r3.ex);
1796          r1.assertInvoked();
1797          r2.assertInvoked();
1798          r3.assertInvoked();
# Line 1841 | Line 1954 | public class CompletableFutureTest exten
1954          assertTrue(snd.complete(w2));
1955          final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1956  
1957 <        checkCompletedWithWrappedCFException(h1);
1958 <        checkCompletedWithWrappedCFException(h2);
1959 <        checkCompletedWithWrappedCFException(h3);
1957 >        checkCompletedWithWrappedException(h1, r1.ex);
1958 >        checkCompletedWithWrappedException(h2, r2.ex);
1959 >        checkCompletedWithWrappedException(h3, r3.ex);
1960          r1.assertInvoked();
1961          r2.assertInvoked();
1962          r3.assertInvoked();
# Line 2005 | Line 2118 | public class CompletableFutureTest exten
2118          assertTrue(snd.complete(w2));
2119          final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2120  
2121 <        checkCompletedWithWrappedCFException(h1);
2122 <        checkCompletedWithWrappedCFException(h2);
2123 <        checkCompletedWithWrappedCFException(h3);
2121 >        checkCompletedWithWrappedException(h1, r1.ex);
2122 >        checkCompletedWithWrappedException(h2, r2.ex);
2123 >        checkCompletedWithWrappedException(h3, r3.ex);
2124          r1.assertInvoked();
2125          r2.assertInvoked();
2126          r3.assertInvoked();
# Line 2297 | Line 2410 | public class CompletableFutureTest exten
2410          f.complete(v1);
2411          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2412          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2413 <        checkCompletedWithWrappedCFException(h0);
2414 <        checkCompletedWithWrappedCFException(h1);
2415 <        checkCompletedWithWrappedCFException(h2);
2416 <        checkCompletedWithWrappedCFException(h3);
2413 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2414 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2415 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2416 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2417          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2418  
2419          g.complete(v2);
# Line 2309 | Line 2422 | public class CompletableFutureTest exten
2422          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2423          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2424  
2425 <        checkCompletedWithWrappedCFException(h4);
2425 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2426          assertTrue(Objects.equals(v1, rs[4].value) ||
2427                     Objects.equals(v2, rs[4].value));
2428 <        checkCompletedWithWrappedCFException(h5);
2428 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2429          assertTrue(Objects.equals(v1, rs[5].value) ||
2430                     Objects.equals(v2, rs[5].value));
2431  
# Line 2556 | Line 2669 | public class CompletableFutureTest exten
2669          f.complete(v1);
2670          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2671          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2672 <        checkCompletedWithWrappedCFException(h0);
2673 <        checkCompletedWithWrappedCFException(h1);
2674 <        checkCompletedWithWrappedCFException(h2);
2675 <        checkCompletedWithWrappedCFException(h3);
2672 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2673 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2674 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2675 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2676          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2677  
2678          g.complete(v2);
# Line 2568 | Line 2681 | public class CompletableFutureTest exten
2681          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2682          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2683  
2684 <        checkCompletedWithWrappedCFException(h4);
2684 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2685          assertTrue(Objects.equals(v1, rs[4].value) ||
2686                     Objects.equals(v2, rs[4].value));
2687 <        checkCompletedWithWrappedCFException(h5);
2687 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2688          assertTrue(Objects.equals(v1, rs[5].value) ||
2689                     Objects.equals(v2, rs[5].value));
2690  
# Line 2587 | Line 2700 | public class CompletableFutureTest exten
2700          for (ExecutionMode m : ExecutionMode.values())
2701          for (Integer v1 : new Integer[] { 1, null })
2702          for (Integer v2 : new Integer[] { 2, null })
2703 +        for (boolean pushNop : new boolean[] { true, false })
2704      {
2705          final CompletableFuture<Integer> f = new CompletableFuture<>();
2706          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2599 | Line 2713 | public class CompletableFutureTest exten
2713          checkIncomplete(h1);
2714          rs[0].assertNotInvoked();
2715          rs[1].assertNotInvoked();
2716 +        if (pushNop) {          // ad hoc test of intra-completion interference
2717 +            m.thenRun(f, () -> {});
2718 +            m.thenRun(g, () -> {});
2719 +        }
2720          f.complete(v1);
2721          checkCompletedNormally(h0, null);
2722          checkCompletedNormally(h1, null);
# Line 2811 | Line 2929 | public class CompletableFutureTest exten
2929          assertTrue(f.complete(v1));
2930          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2931          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2932 <        checkCompletedWithWrappedCFException(h0);
2933 <        checkCompletedWithWrappedCFException(h1);
2934 <        checkCompletedWithWrappedCFException(h2);
2935 <        checkCompletedWithWrappedCFException(h3);
2932 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2933 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2934 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2935 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2936          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2937          assertTrue(g.complete(v2));
2938          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2939          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2940 <        checkCompletedWithWrappedCFException(h4);
2941 <        checkCompletedWithWrappedCFException(h5);
2940 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2941 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2942  
2943          checkCompletedNormally(f, v1);
2944          checkCompletedNormally(g, v2);
# Line 2881 | Line 2999 | public class CompletableFutureTest exten
2999          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3000          if (createIncomplete) assertTrue(f.complete(v1));
3001  
3002 <        checkCompletedWithWrappedCFException(g);
3002 >        checkCompletedWithWrappedException(g, r.ex);
3003          checkCompletedNormally(f, v1);
3004      }}
3005  
# Line 2906 | Line 3024 | public class CompletableFutureTest exten
3024          checkCancelled(f);
3025      }}
3026  
3027 +    /**
3028 +     * thenCompose result completes exceptionally if the result of the action does
3029 +     */
3030 +    public void testThenCompose_actionReturnsFailingFuture() {
3031 +        for (ExecutionMode m : ExecutionMode.values())
3032 +        for (int order = 0; order < 6; order++)
3033 +        for (Integer v1 : new Integer[] { 1, null })
3034 +    {
3035 +        final CFException ex = new CFException();
3036 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3037 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3038 +        final CompletableFuture<Integer> h;
3039 +        // Test all permutations of orders
3040 +        switch (order) {
3041 +        case 0:
3042 +            assertTrue(f.complete(v1));
3043 +            assertTrue(g.completeExceptionally(ex));
3044 +            h = m.thenCompose(f, (x -> g));
3045 +            break;
3046 +        case 1:
3047 +            assertTrue(f.complete(v1));
3048 +            h = m.thenCompose(f, (x -> g));
3049 +            assertTrue(g.completeExceptionally(ex));
3050 +            break;
3051 +        case 2:
3052 +            assertTrue(g.completeExceptionally(ex));
3053 +            assertTrue(f.complete(v1));
3054 +            h = m.thenCompose(f, (x -> g));
3055 +            break;
3056 +        case 3:
3057 +            assertTrue(g.completeExceptionally(ex));
3058 +            h = m.thenCompose(f, (x -> g));
3059 +            assertTrue(f.complete(v1));
3060 +            break;
3061 +        case 4:
3062 +            h = m.thenCompose(f, (x -> g));
3063 +            assertTrue(f.complete(v1));
3064 +            assertTrue(g.completeExceptionally(ex));
3065 +            break;
3066 +        case 5:
3067 +            h = m.thenCompose(f, (x -> g));
3068 +            assertTrue(f.complete(v1));
3069 +            assertTrue(g.completeExceptionally(ex));
3070 +            break;
3071 +        default: throw new AssertionError();
3072 +        }
3073 +
3074 +        checkCompletedExceptionally(g, ex);
3075 +        checkCompletedWithWrappedException(h, ex);
3076 +        checkCompletedNormally(f, v1);
3077 +    }}
3078 +
3079      // other static methods
3080  
3081      /**
# Line 2938 | Line 3108 | public class CompletableFutureTest exten
3108          }
3109      }
3110  
3111 <    public void testAllOf_backwards() throws Exception {
3111 >    public void testAllOf_normal_backwards() throws Exception {
3112          for (int k = 1; k < 10; k++) {
3113              CompletableFuture<Integer>[] fs
3114                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
# Line 2966 | Line 3136 | public class CompletableFutureTest exten
3136              for (int i = 0; i < k; i++) {
3137                  checkIncomplete(f);
3138                  checkIncomplete(CompletableFuture.allOf(fs));
3139 <                if (i != k/2) {
3139 >                if (i != k / 2) {
3140                      fs[i].complete(i);
3141                      checkCompletedNormally(fs[i], i);
3142                  } else {
# Line 3073 | Line 3243 | public class CompletableFutureTest exten
3243          CompletableFuture<Integer> f = new CompletableFuture<>();
3244          CompletableFuture<Integer> g = new CompletableFuture<>();
3245          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3076        CompletableFuture<?> h;
3246          ThreadExecutor exec = new ThreadExecutor();
3247  
3248          Runnable[] throwingActions = {
3249              () -> CompletableFuture.supplyAsync(null),
3250              () -> CompletableFuture.supplyAsync(null, exec),
3251 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3251 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3252  
3253              () -> CompletableFuture.runAsync(null),
3254              () -> CompletableFuture.runAsync(null, exec),
# Line 3170 | Line 3339 | public class CompletableFutureTest exten
3339              () -> CompletableFuture.anyOf(null, f),
3340  
3341              () -> f.obtrudeException(null),
3342 +
3343 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3344 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3345 +            () -> CompletableFuture.delayedExecutor(1L, null),
3346 +
3347 +            () -> f.orTimeout(1L, null),
3348 +            () -> f.completeOnTimeout(42, 1L, null),
3349 +
3350 +            () -> CompletableFuture.failedFuture(null),
3351 +            () -> CompletableFuture.failedStage(null),
3352          };
3353  
3354          assertThrows(NullPointerException.class, throwingActions);
# Line 3177 | Line 3356 | public class CompletableFutureTest exten
3356      }
3357  
3358      /**
3359 +     * Test submissions to an executor that rejects all tasks.
3360 +     */
3361 +    public void testRejectingExecutor() {
3362 +        for (Integer v : new Integer[] { 1, null })
3363 +    {
3364 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3365 +
3366 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3367 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3368 +
3369 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3370 +
3371 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3372 +        srcs.add(complete);
3373 +        srcs.add(incomplete);
3374 +
3375 +        for (CompletableFuture<Integer> src : srcs) {
3376 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3377 +            fs.add(src.thenRunAsync(() -> {}, e));
3378 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3379 +            fs.add(src.thenApplyAsync((z) -> z, e));
3380 +
3381 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3382 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3383 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3384 +
3385 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3386 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3387 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3388 +
3389 +            fs.add(src.thenComposeAsync((z) -> null, e));
3390 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3391 +            fs.add(src.handleAsync((z, t) -> null, e));
3392 +
3393 +            for (CompletableFuture<?> future : fs) {
3394 +                if (src.isDone())
3395 +                    checkCompletedWithWrappedException(future, e.ex);
3396 +                else
3397 +                    checkIncomplete(future);
3398 +            }
3399 +            futures.addAll(fs);
3400 +        }
3401 +
3402 +        {
3403 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3404 +
3405 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3406 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3407 +
3408 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3409 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3410 +
3411 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3412 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3413 +
3414 +            for (CompletableFuture<?> future : fs)
3415 +                checkIncomplete(future);
3416 +            futures.addAll(fs);
3417 +        }
3418 +
3419 +        {
3420 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3421 +
3422 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3423 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3424 +
3425 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3426 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3427 +
3428 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3429 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3430 +
3431 +            for (CompletableFuture<?> future : fs)
3432 +                checkCompletedWithWrappedException(future, e.ex);
3433 +            futures.addAll(fs);
3434 +        }
3435 +
3436 +        incomplete.complete(v);
3437 +
3438 +        for (CompletableFuture<?> future : futures)
3439 +            checkCompletedWithWrappedException(future, e.ex);
3440 +
3441 +        assertEquals(futures.size(), e.count.get());
3442 +    }}
3443 +
3444 +    /**
3445 +     * Test submissions to an executor that rejects all tasks, but
3446 +     * should never be invoked because the dependent future is
3447 +     * explicitly completed.
3448 +     */
3449 +    public void testRejectingExecutorNeverInvoked() {
3450 +        for (Integer v : new Integer[] { 1, null })
3451 +    {
3452 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3453 +
3454 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3455 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3456 +
3457 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3458 +
3459 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3460 +        srcs.add(complete);
3461 +        srcs.add(incomplete);
3462 +
3463 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3464 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3465 +        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3466 +        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3467 +
3468 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3469 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3470 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3471 +
3472 +        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3473 +        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3474 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3475 +
3476 +        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3477 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3478 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3479 +
3480 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3481 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3482 +
3483 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3484 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3485 +
3486 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3487 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3488 +
3489 +        for (CompletableFuture<?> future : fs)
3490 +            checkIncomplete(future);
3491 +
3492 +        for (CompletableFuture<?> future : fs)
3493 +            future.complete(null);
3494 +
3495 +        incomplete.complete(v);
3496 +
3497 +        for (CompletableFuture<?> future : fs)
3498 +            checkCompletedNormally(future, null);
3499 +
3500 +        assertEquals(0, e.count.get());
3501 +    }}
3502 +
3503 +    /**
3504       * toCompletableFuture returns this CompletableFuture.
3505       */
3506      public void testToCompletableFuture() {
# Line 3184 | Line 3508 | public class CompletableFutureTest exten
3508          assertSame(f, f.toCompletableFuture());
3509      }
3510  
3511 +    // jdk9
3512 +
3513 +    /**
3514 +     * newIncompleteFuture returns an incomplete CompletableFuture
3515 +     */
3516 +    public void testNewIncompleteFuture() {
3517 +        for (Integer v1 : new Integer[] { 1, null })
3518 +    {
3519 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3520 +        CompletableFuture<Integer> g = f.newIncompleteFuture();
3521 +        checkIncomplete(f);
3522 +        checkIncomplete(g);
3523 +        f.complete(v1);
3524 +        checkCompletedNormally(f, v1);
3525 +        checkIncomplete(g);
3526 +        g.complete(v1);
3527 +        checkCompletedNormally(g, v1);
3528 +        assertSame(g.getClass(), CompletableFuture.class);
3529 +    }}
3530 +
3531 +    /**
3532 +     * completedStage returns a completed CompletionStage
3533 +     */
3534 +    public void testCompletedStage() {
3535 +        AtomicInteger x = new AtomicInteger(0);
3536 +        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3537 +        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3538 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3539 +        assertEquals(x.get(), 1);
3540 +        assertNull(r.get());
3541 +    }
3542 +
3543 +    /**
3544 +     * defaultExecutor by default returns the commonPool if
3545 +     * it supports more than one thread.
3546 +     */
3547 +    public void testDefaultExecutor() {
3548 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3549 +        Executor e = f.defaultExecutor();
3550 +        Executor c = ForkJoinPool.commonPool();
3551 +        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3552 +            assertSame(e, c);
3553 +        else
3554 +            assertNotSame(e, c);
3555 +    }
3556 +
3557 +    /**
3558 +     * failedFuture returns a CompletableFuture completed
3559 +     * exceptionally with the given Exception
3560 +     */
3561 +    public void testFailedFuture() {
3562 +        CFException ex = new CFException();
3563 +        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3564 +        checkCompletedExceptionally(f, ex);
3565 +    }
3566 +
3567 +    /**
3568 +     * failedFuture(null) throws NPE
3569 +     */
3570 +    public void testFailedFuture_null() {
3571 +        try {
3572 +            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3573 +            shouldThrow();
3574 +        } catch (NullPointerException success) {}
3575 +    }
3576 +
3577 +    /**
3578 +     * copy returns a CompletableFuture that is completed normally,
3579 +     * with the same value, when source is.
3580 +     */
3581 +    public void testCopy() {
3582 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3583 +        CompletableFuture<Integer> g = f.copy();
3584 +        checkIncomplete(f);
3585 +        checkIncomplete(g);
3586 +        f.complete(1);
3587 +        checkCompletedNormally(f, 1);
3588 +        checkCompletedNormally(g, 1);
3589 +    }
3590 +
3591 +    /**
3592 +     * copy returns a CompletableFuture that is completed exceptionally
3593 +     * when source is.
3594 +     */
3595 +    public void testCopy2() {
3596 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3597 +        CompletableFuture<Integer> g = f.copy();
3598 +        checkIncomplete(f);
3599 +        checkIncomplete(g);
3600 +        CFException ex = new CFException();
3601 +        f.completeExceptionally(ex);
3602 +        checkCompletedExceptionally(f, ex);
3603 +        checkCompletedWithWrappedException(g, ex);
3604 +    }
3605 +
3606 +    /**
3607 +     * minimalCompletionStage returns a CompletableFuture that is
3608 +     * completed normally, with the same value, when source is.
3609 +     */
3610 +    public void testMinimalCompletionStage() {
3611 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3612 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3613 +        AtomicInteger x = new AtomicInteger(0);
3614 +        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3615 +        checkIncomplete(f);
3616 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3617 +        f.complete(1);
3618 +        checkCompletedNormally(f, 1);
3619 +        assertEquals(x.get(), 1);
3620 +        assertNull(r.get());
3621 +    }
3622 +
3623 +    /**
3624 +     * minimalCompletionStage returns a CompletableFuture that is
3625 +     * completed exceptionally when source is.
3626 +     */
3627 +    public void testMinimalCompletionStage2() {
3628 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3629 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3630 +        AtomicInteger x = new AtomicInteger(0);
3631 +        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3632 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3633 +        checkIncomplete(f);
3634 +        CFException ex = new CFException();
3635 +        f.completeExceptionally(ex);
3636 +        checkCompletedExceptionally(f, ex);
3637 +        assertEquals(x.get(), 0);
3638 +        assertEquals(r.get().getCause(), ex);
3639 +    }
3640 +
3641 +    /**
3642 +     * failedStage returns a CompletionStage completed
3643 +     * exceptionally with the given Exception
3644 +     */
3645 +    public void testFailedStage() {
3646 +        CFException ex = new CFException();
3647 +        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3648 +        AtomicInteger x = new AtomicInteger(0);
3649 +        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3650 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3651 +        assertEquals(x.get(), 0);
3652 +        assertEquals(r.get(), ex);
3653 +    }
3654 +
3655 +    /**
3656 +     * completeAsync completes with value of given supplier
3657 +     */
3658 +    public void testCompleteAsync() {
3659 +        for (Integer v1 : new Integer[] { 1, null })
3660 +    {
3661 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3662 +        f.completeAsync(() -> v1);
3663 +        f.join();
3664 +        checkCompletedNormally(f, v1);
3665 +    }}
3666 +
3667 +    /**
3668 +     * completeAsync completes exceptionally if given supplier throws
3669 +     */
3670 +    public void testCompleteAsync2() {
3671 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3672 +        CFException ex = new CFException();
3673 +        f.completeAsync(() -> {if (true) throw ex; return 1;});
3674 +        try {
3675 +            f.join();
3676 +            shouldThrow();
3677 +        } catch (CompletionException success) {}
3678 +        checkCompletedWithWrappedException(f, ex);
3679 +    }
3680 +
3681 +    /**
3682 +     * completeAsync with given executor completes with value of given supplier
3683 +     */
3684 +    public void testCompleteAsync3() {
3685 +        for (Integer v1 : new Integer[] { 1, null })
3686 +    {
3687 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3688 +        ThreadExecutor executor = new ThreadExecutor();
3689 +        f.completeAsync(() -> v1, executor);
3690 +        assertSame(v1, f.join());
3691 +        checkCompletedNormally(f, v1);
3692 +        assertEquals(1, executor.count.get());
3693 +    }}
3694 +
3695 +    /**
3696 +     * completeAsync with given executor completes exceptionally if
3697 +     * given supplier throws
3698 +     */
3699 +    public void testCompleteAsync4() {
3700 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3701 +        CFException ex = new CFException();
3702 +        ThreadExecutor executor = new ThreadExecutor();
3703 +        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3704 +        try {
3705 +            f.join();
3706 +            shouldThrow();
3707 +        } catch (CompletionException success) {}
3708 +        checkCompletedWithWrappedException(f, ex);
3709 +        assertEquals(1, executor.count.get());
3710 +    }
3711 +
3712 +    /**
3713 +     * orTimeout completes with TimeoutException if not complete
3714 +     */
3715 +    public void testOrTimeout_timesOut() {
3716 +        long timeoutMillis = timeoutMillis();
3717 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3718 +        long startTime = System.nanoTime();
3719 +        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3720 +        checkCompletedWithTimeoutException(f);
3721 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3722 +    }
3723 +
3724 +    /**
3725 +     * orTimeout completes normally if completed before timeout
3726 +     */
3727 +    public void testOrTimeout_completed() {
3728 +        for (Integer v1 : new Integer[] { 1, null })
3729 +    {
3730 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3731 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3732 +        long startTime = System.nanoTime();
3733 +        f.complete(v1);
3734 +        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3735 +        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3736 +        g.complete(v1);
3737 +        checkCompletedNormally(f, v1);
3738 +        checkCompletedNormally(g, v1);
3739 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3740 +    }}
3741 +
3742 +    /**
3743 +     * completeOnTimeout completes with given value if not complete
3744 +     */
3745 +    public void testCompleteOnTimeout_timesOut() {
3746 +        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3747 +                       () -> testCompleteOnTimeout_timesOut(null));
3748 +    }
3749 +
3750 +    /**
3751 +     * completeOnTimeout completes with given value if not complete
3752 +     */
3753 +    public void testCompleteOnTimeout_timesOut(Integer v) {
3754 +        long timeoutMillis = timeoutMillis();
3755 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3756 +        long startTime = System.nanoTime();
3757 +        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3758 +        assertSame(v, f.join());
3759 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3760 +        f.complete(99);         // should have no effect
3761 +        checkCompletedNormally(f, v);
3762 +    }
3763 +
3764 +    /**
3765 +     * completeOnTimeout has no effect if completed within timeout
3766 +     */
3767 +    public void testCompleteOnTimeout_completed() {
3768 +        for (Integer v1 : new Integer[] { 1, null })
3769 +    {
3770 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3771 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3772 +        long startTime = System.nanoTime();
3773 +        f.complete(v1);
3774 +        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3775 +        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3776 +        g.complete(v1);
3777 +        checkCompletedNormally(f, v1);
3778 +        checkCompletedNormally(g, v1);
3779 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3780 +    }}
3781 +
3782 +    /**
3783 +     * delayedExecutor returns an executor that delays submission
3784 +     */
3785 +    public void testDelayedExecutor() {
3786 +        testInParallel(() -> testDelayedExecutor(null, null),
3787 +                       () -> testDelayedExecutor(null, 1),
3788 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3789 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3790 +    }
3791 +
3792 +    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3793 +        long timeoutMillis = timeoutMillis();
3794 +        // Use an "unreasonably long" long timeout to catch lingering threads
3795 +        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3796 +        final Executor delayer, longDelayer;
3797 +        if (executor == null) {
3798 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3799 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3800 +        } else {
3801 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3802 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3803 +        }
3804 +        long startTime = System.nanoTime();
3805 +        CompletableFuture<Integer> f =
3806 +            CompletableFuture.supplyAsync(() -> v, delayer);
3807 +        CompletableFuture<Integer> g =
3808 +            CompletableFuture.supplyAsync(() -> v, longDelayer);
3809 +
3810 +        assertNull(g.getNow(null));
3811 +
3812 +        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3813 +        long millisElapsed = millisElapsedSince(startTime);
3814 +        assertTrue(millisElapsed >= timeoutMillis);
3815 +        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3816 +
3817 +        checkCompletedNormally(f, v);
3818 +
3819 +        checkIncomplete(g);
3820 +        assertTrue(g.cancel(true));
3821 +    }
3822 +
3823      //--- tests of implementation details; not part of official tck ---
3824  
3825      Object resultOf(CompletableFuture<?> f) {
3826 +        SecurityManager sm = System.getSecurityManager();
3827 +        if (sm != null) {
3828 +            try {
3829 +                System.setSecurityManager(null);
3830 +            } catch (SecurityException giveUp) {
3831 +                return "Reflection not available";
3832 +            }
3833 +        }
3834 +
3835          try {
3836              java.lang.reflect.Field resultField
3837                  = CompletableFuture.class.getDeclaredField("result");
3838              resultField.setAccessible(true);
3839              return resultField.get(f);
3840 <        } catch (Throwable t) { throw new AssertionError(t); }
3840 >        } catch (Throwable t) {
3841 >            throw new AssertionError(t);
3842 >        } finally {
3843 >            if (sm != null) System.setSecurityManager(sm);
3844 >        }
3845      }
3846  
3847      public void testExceptionPropagationReusesResultObject() {
# Line 3203 | Line 3852 | public class CompletableFutureTest exten
3852          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3853          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3854  
3855 +        final Runnable noopRunnable = new Noop(m);
3856 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
3857 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
3858 +
3859          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3860              = new ArrayList<>();
3861  
3862 <        funs.add((y) -> m.thenRun(y, new Noop(m)));
3863 <        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3864 <        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3865 <
3866 <        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3867 <        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3868 <        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3862 >        funs.add((y) -> m.thenRun(y, noopRunnable));
3863 >        funs.add((y) -> m.thenAccept(y, noopConsumer));
3864 >        funs.add((y) -> m.thenApply(y, incFunction));
3865 >
3866 >        funs.add((y) -> m.runAfterEither(y, incomplete, noopRunnable));
3867 >        funs.add((y) -> m.acceptEither(y, incomplete, noopConsumer));
3868 >        funs.add((y) -> m.applyToEither(y, incomplete, incFunction));
3869  
3870 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3870 >        funs.add((y) -> m.runAfterBoth(y, v42, noopRunnable));
3871 >        funs.add((y) -> m.runAfterBoth(v42, y, noopRunnable));
3872          funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3873 +        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3874          funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3875 +        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3876  
3877 <        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3877 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3878  
3879          funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3880  
3881 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3882 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3881 >        funs.add((y) -> CompletableFuture.allOf(y));
3882 >        funs.add((y) -> CompletableFuture.allOf(y, v42));
3883 >        funs.add((y) -> CompletableFuture.allOf(v42, y));
3884 >        funs.add((y) -> CompletableFuture.anyOf(y));
3885 >        funs.add((y) -> CompletableFuture.anyOf(y, incomplete));
3886 >        funs.add((y) -> CompletableFuture.anyOf(incomplete, y));
3887  
3888          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3889                   fun : funs) {
3890              CompletableFuture<Integer> f = new CompletableFuture<>();
3891              f.completeExceptionally(ex);
3892 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3892 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3893              checkCompletedWithWrappedException(src, ex);
3894              CompletableFuture<?> dep = fun.apply(src);
3895              checkCompletedWithWrappedException(dep, ex);
# Line 3239 | Line 3899 | public class CompletableFutureTest exten
3899          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3900                   fun : funs) {
3901              CompletableFuture<Integer> f = new CompletableFuture<>();
3902 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3902 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3903              CompletableFuture<?> dep = fun.apply(src);
3904              f.completeExceptionally(ex);
3905              checkCompletedWithWrappedException(src, ex);
# Line 3253 | Line 3913 | public class CompletableFutureTest exten
3913              CompletableFuture<Integer> f = new CompletableFuture<>();
3914              f.cancel(mayInterruptIfRunning);
3915              checkCancelled(f);
3916 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3916 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3917              checkCompletedWithWrappedCancellationException(src);
3918              CompletableFuture<?> dep = fun.apply(src);
3919              checkCompletedWithWrappedCancellationException(dep);
# Line 3264 | Line 3924 | public class CompletableFutureTest exten
3924          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3925                   fun : funs) {
3926              CompletableFuture<Integer> f = new CompletableFuture<>();
3927 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3927 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3928              CompletableFuture<?> dep = fun.apply(src);
3929              f.cancel(mayInterruptIfRunning);
3930              checkCancelled(f);
# Line 3274 | Line 3934 | public class CompletableFutureTest exten
3934          }
3935      }}
3936  
3937 +    /**
3938 +     * Minimal completion stages throw UOE for most non-CompletionStage methods
3939 +     */
3940 +    public void testMinimalCompletionStage_minimality() {
3941 +        if (!testImplementationDetails) return;
3942 +        Function<Method, String> toSignature =
3943 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3944 +        Predicate<Method> isNotStatic =
3945 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3946 +        List<Method> minimalMethods =
3947 +            Stream.of(Object.class, CompletionStage.class)
3948 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3949 +            .filter(isNotStatic)
3950 +            .collect(Collectors.toList());
3951 +        // Methods from CompletableFuture permitted NOT to throw UOE
3952 +        String[] signatureWhitelist = {
3953 +            "newIncompleteFuture[]",
3954 +            "defaultExecutor[]",
3955 +            "minimalCompletionStage[]",
3956 +            "copy[]",
3957 +        };
3958 +        Set<String> permittedMethodSignatures =
3959 +            Stream.concat(minimalMethods.stream().map(toSignature),
3960 +                          Stream.of(signatureWhitelist))
3961 +            .collect(Collectors.toSet());
3962 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3963 +            .filter(isNotStatic)
3964 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3965 +            .collect(Collectors.toList());
3966 +
3967 +        List<CompletionStage<Integer>> stages = new ArrayList<>();
3968 +        stages.add(new CompletableFuture<Integer>().minimalCompletionStage());
3969 +        stages.add(CompletableFuture.completedStage(1));
3970 +        stages.add(CompletableFuture.failedStage(new CFException()));
3971 +
3972 +        List<Method> bugs = new ArrayList<>();
3973 +        for (Method method : allMethods) {
3974 +            Class<?>[] parameterTypes = method.getParameterTypes();
3975 +            Object[] args = new Object[parameterTypes.length];
3976 +            // Manufacture boxed primitives for primitive params
3977 +            for (int i = 0; i < args.length; i++) {
3978 +                Class<?> type = parameterTypes[i];
3979 +                if (parameterTypes[i] == boolean.class)
3980 +                    args[i] = false;
3981 +                else if (parameterTypes[i] == int.class)
3982 +                    args[i] = 0;
3983 +                else if (parameterTypes[i] == long.class)
3984 +                    args[i] = 0L;
3985 +            }
3986 +            for (CompletionStage<Integer> stage : stages) {
3987 +                try {
3988 +                    method.invoke(stage, args);
3989 +                    bugs.add(method);
3990 +                }
3991 +                catch (java.lang.reflect.InvocationTargetException expected) {
3992 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3993 +                        bugs.add(method);
3994 +                        // expected.getCause().printStackTrace();
3995 +                    }
3996 +                }
3997 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
3998 +            }
3999 +        }
4000 +        if (!bugs.isEmpty())
4001 +            throw new Error("Methods did not throw UOE: " + bugs);
4002 +    }
4003 +
4004 +    static class Monad {
4005 +        static class ZeroException extends RuntimeException {
4006 +            public ZeroException() { super("monadic zero"); }
4007 +        }
4008 +        // "return", "unit"
4009 +        static <T> CompletableFuture<T> unit(T value) {
4010 +            return completedFuture(value);
4011 +        }
4012 +        // monadic zero ?
4013 +        static <T> CompletableFuture<T> zero() {
4014 +            return failedFuture(new ZeroException());
4015 +        }
4016 +        // >=>
4017 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4018 +            (Function<T, CompletableFuture<U>> f,
4019 +             Function<U, CompletableFuture<V>> g) {
4020 +            return (x) -> f.apply(x).thenCompose(g);
4021 +        }
4022 +
4023 +        static void assertZero(CompletableFuture<?> f) {
4024 +            try {
4025 +                f.getNow(null);
4026 +                throw new AssertionFailedError("should throw");
4027 +            } catch (CompletionException success) {
4028 +                assertTrue(success.getCause() instanceof ZeroException);
4029 +            }
4030 +        }
4031 +
4032 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4033 +                                           CompletableFuture<T> g) {
4034 +            T fval = null, gval = null;
4035 +            Throwable fex = null, gex = null;
4036 +
4037 +            try { fval = f.get(); }
4038 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4039 +            catch (Throwable ex) { fex = ex; }
4040 +
4041 +            try { gval = g.get(); }
4042 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4043 +            catch (Throwable ex) { gex = ex; }
4044 +
4045 +            if (fex != null || gex != null)
4046 +                assertSame(fex.getClass(), gex.getClass());
4047 +            else
4048 +                assertEquals(fval, gval);
4049 +        }
4050 +
4051 +        static class PlusFuture<T> extends CompletableFuture<T> {
4052 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4053 +        }
4054 +
4055 +        /** Implements "monadic plus". */
4056 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4057 +                                             CompletableFuture<? extends T> g) {
4058 +            PlusFuture<T> plus = new PlusFuture<T>();
4059 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4060 +                try {
4061 +                    if (ex == null) {
4062 +                        if (plus.complete(result))
4063 +                            if (plus.firstFailure.get() != null)
4064 +                                plus.firstFailure.set(null);
4065 +                    }
4066 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4067 +                        if (plus.isDone())
4068 +                            plus.firstFailure.set(null);
4069 +                    }
4070 +                    else {
4071 +                        // first failure has precedence
4072 +                        Throwable first = plus.firstFailure.getAndSet(null);
4073 +
4074 +                        // may fail with "Self-suppression not permitted"
4075 +                        try { first.addSuppressed(ex); }
4076 +                        catch (Exception ignored) {}
4077 +
4078 +                        plus.completeExceptionally(first);
4079 +                    }
4080 +                } catch (Throwable unexpected) {
4081 +                    plus.completeExceptionally(unexpected);
4082 +                }
4083 +            };
4084 +            f.whenComplete(action);
4085 +            g.whenComplete(action);
4086 +            return plus;
4087 +        }
4088 +    }
4089 +
4090 +    /**
4091 +     * CompletableFuture is an additive monad - sort of.
4092 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4093 +     */
4094 +    public void testAdditiveMonad() throws Throwable {
4095 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4096 +        CompletableFuture<Long> zero = Monad.zero();
4097 +
4098 +        // Some mutually non-commutative functions
4099 +        Function<Long, CompletableFuture<Long>> triple
4100 +            = (x) -> Monad.unit(3 * x);
4101 +        Function<Long, CompletableFuture<Long>> inc
4102 +            = (x) -> Monad.unit(x + 1);
4103 +
4104 +        // unit is a right identity: m >>= unit === m
4105 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4106 +                                 inc.apply(5L));
4107 +        // unit is a left identity: (unit x) >>= f === f x
4108 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4109 +                                 inc.apply(5L));
4110 +
4111 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4112 +        Monad.assertFutureEquals(
4113 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4114 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4115 +
4116 +        // The case for CompletableFuture as an additive monad is weaker...
4117 +
4118 +        // zero is a monadic zero
4119 +        Monad.assertZero(zero);
4120 +
4121 +        // left zero: zero >>= f === zero
4122 +        Monad.assertZero(zero.thenCompose(inc));
4123 +        // right zero: f >>= (\x -> zero) === zero
4124 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4125 +
4126 +        // f plus zero === f
4127 +        Monad.assertFutureEquals(Monad.unit(5L),
4128 +                                 Monad.plus(Monad.unit(5L), zero));
4129 +        // zero plus f === f
4130 +        Monad.assertFutureEquals(Monad.unit(5L),
4131 +                                 Monad.plus(zero, Monad.unit(5L)));
4132 +        // zero plus zero === zero
4133 +        Monad.assertZero(Monad.plus(zero, zero));
4134 +        {
4135 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4136 +                                                   Monad.unit(8L));
4137 +            // non-determinism
4138 +            assertTrue(f.get() == 5L || f.get() == 8L);
4139 +        }
4140 +
4141 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4142 +        // f plus godot === f (doesn't wait for godot)
4143 +        Monad.assertFutureEquals(Monad.unit(5L),
4144 +                                 Monad.plus(Monad.unit(5L), godot));
4145 +        // godot plus f === f (doesn't wait for godot)
4146 +        Monad.assertFutureEquals(Monad.unit(5L),
4147 +                                 Monad.plus(godot, Monad.unit(5L)));
4148 +    }
4149 +
4150 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4151 +    public void testRecursiveChains() throws Throwable {
4152 +        for (ExecutionMode m : ExecutionMode.values())
4153 +        for (boolean addDeadEnds : new boolean[] { true, false })
4154 +    {
4155 +        final int val = 42;
4156 +        final int n = expensiveTests ? 1_000 : 2;
4157 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4158 +        CompletableFuture<Integer> tail = head;
4159 +        for (int i = 0; i < n; i++) {
4160 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4161 +            tail = m.thenApply(tail, v -> v + 1);
4162 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4163 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4164 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4165 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4166 +        }
4167 +        head.complete(val);
4168 +        assertEquals(val + 3 * n, (int) tail.join());
4169 +    }}
4170 +
4171 +    /**
4172 +     * A single CompletableFuture with many dependents.
4173 +     * A demo of scalability - runtime is O(n).
4174 +     */
4175 +    public void testManyDependents() throws Throwable {
4176 +        final int n = expensiveTests ? 1_000_000 : 10;
4177 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4178 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4179 +        final AtomicInteger count = new AtomicInteger(0);
4180 +        for (int i = 0; i < n; i++) {
4181 +            head.thenRun(() -> count.getAndIncrement());
4182 +            head.thenAccept((x) -> count.getAndIncrement());
4183 +            head.thenApply((x) -> count.getAndIncrement());
4184 +
4185 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4186 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4187 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4188 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4189 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4190 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4191 +
4192 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4193 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4194 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4195 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4196 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4197 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4198 +        }
4199 +        head.complete(null);
4200 +        assertEquals(5 * 3 * n, count.get());
4201 +    }
4202 +
4203 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4204 +    public void testCoCompletionGarbageRetention() throws Throwable {
4205 +        final int n = expensiveTests ? 1_000_000 : 10;
4206 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4207 +        CompletableFuture<Integer> f;
4208 +        for (int i = 0; i < n; i++) {
4209 +            f = new CompletableFuture<>();
4210 +            f.runAfterEither(incomplete, () -> {});
4211 +            f.complete(null);
4212 +
4213 +            f = new CompletableFuture<>();
4214 +            f.acceptEither(incomplete, (x) -> {});
4215 +            f.complete(null);
4216 +
4217 +            f = new CompletableFuture<>();
4218 +            f.applyToEither(incomplete, (x) -> x);
4219 +            f.complete(null);
4220 +
4221 +            f = new CompletableFuture<>();
4222 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4223 +            f.complete(null);
4224 +        }
4225 +
4226 +        for (int i = 0; i < n; i++) {
4227 +            f = new CompletableFuture<>();
4228 +            incomplete.runAfterEither(f, () -> {});
4229 +            f.complete(null);
4230 +
4231 +            f = new CompletableFuture<>();
4232 +            incomplete.acceptEither(f, (x) -> {});
4233 +            f.complete(null);
4234 +
4235 +            f = new CompletableFuture<>();
4236 +            incomplete.applyToEither(f, (x) -> x);
4237 +            f.complete(null);
4238 +
4239 +            f = new CompletableFuture<>();
4240 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4241 +            f.complete(null);
4242 +        }
4243 +    }
4244 +
4245 +    /**
4246 +     * Checks for garbage retention with anyOf.
4247 +     * Following used to fail with OOME:
4248 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testAnyOfGarbageRetention tck
4249 +     */
4250 +    public void testAnyOfGarbageRetention() throws Throwable {
4251 +        for (Integer v : new Integer[] { 1, null })
4252 +    {
4253 +        final int n = expensiveTests ? 100_000 : 10;
4254 +        CompletableFuture<Integer>[] fs
4255 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4256 +        for (int i = 0; i < fs.length; i++)
4257 +            fs[i] = new CompletableFuture<>();
4258 +        fs[fs.length - 1].complete(v);
4259 +        for (int i = 0; i < n; i++)
4260 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4261 +    }}
4262 +
4263 +    /**
4264 +     * Checks for garbage retention with allOf.
4265 +     *
4266 +     * As of 2016-07, fails with OOME:
4267 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4268 +     */
4269 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4270 +        final int n = expensiveTests ? 100_000 : 10;
4271 +        CompletableFuture<Integer>[] fs
4272 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4273 +        for (int i = 0; i < fs.length; i++)
4274 +            fs[i] = new CompletableFuture<>();
4275 +        for (int i = 0; i < n; i++)
4276 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4277 +    }
4278 +
4279 +    /**
4280 +     * Checks for garbage retention when a dependent future is
4281 +     * cancelled and garbage-collected.
4282 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4283 +     *
4284 +     * As of 2016-07, fails with OOME:
4285 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4286 +     */
4287 +    public void testCancelledGarbageRetention() throws Throwable {
4288 +        final int n = expensiveTests ? 100_000 : 10;
4289 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4290 +        for (int i = 0; i < n; i++)
4291 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4292 +    }
4293 +
4294 + //     static <U> U join(CompletionStage<U> stage) {
4295 + //         CompletableFuture<U> f = new CompletableFuture<>();
4296 + //         stage.whenComplete((v, ex) -> {
4297 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4298 + //         });
4299 + //         return f.join();
4300 + //     }
4301 +
4302 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4303 + //         CompletableFuture<U> f = new CompletableFuture<>();
4304 + //         stage.whenComplete((v, ex) -> {
4305 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4306 + //         });
4307 + //         return f.isDone();
4308 + //     }
4309 +
4310 + //     static <U> U join2(CompletionStage<U> stage) {
4311 + //         return stage.toCompletableFuture().copy().join();
4312 + //     }
4313 +
4314 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4315 + //         return stage.toCompletableFuture().copy().isDone();
4316 + //     }
4317 +
4318   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines