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.154 by jsr166, Sun Jun 26 19:27:42 2016 UTC vs.
Revision 1.223 by jsr166, Mon Dec 16 22:36:39 2019 UTC

# Line 32 | Line 32 | 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;
35   import java.util.concurrent.atomic.AtomicInteger;
36   import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
# Line 42 | Line 41 | import java.util.function.Function;
41   import java.util.function.Predicate;
42   import java.util.function.Supplier;
43  
45 import junit.framework.AssertionFailedError;
44   import junit.framework.Test;
45   import junit.framework.TestSuite;
46  
# Line 60 | Line 58 | public class CompletableFutureTest exten
58      void checkIncomplete(CompletableFuture<?> f) {
59          assertFalse(f.isDone());
60          assertFalse(f.isCancelled());
61 <        assertTrue(f.toString().contains("Not completed"));
61 >        assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
62 >
63 >        Object result = null;
64          try {
65 <            assertNull(f.getNow(null));
65 >            result = f.getNow(null);
66          } catch (Throwable fail) { threadUnexpectedException(fail); }
67 +        assertNull(result);
68 +
69          try {
70 <            f.get(0L, SECONDS);
70 >            f.get(randomExpiredTimeout(), randomTimeUnit());
71              shouldThrow();
72          }
73          catch (TimeoutException success) {}
74          catch (Throwable fail) { threadUnexpectedException(fail); }
75      }
76  
77 <    <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
78 <        checkTimedGet(f, value);
77 >    <T> void checkCompletedNormally(CompletableFuture<T> f, T expectedValue) {
78 >        checkTimedGet(f, expectedValue);
79  
80 +        assertEquals(expectedValue, f.join());
81 +        assertEquals(expectedValue, f.getNow(null));
82 +
83 +        T result = null;
84          try {
85 <            assertEquals(value, f.join());
80 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
81 <        try {
82 <            assertEquals(value, f.getNow(null));
83 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
84 <        try {
85 <            assertEquals(value, f.get());
85 >            result = f.get();
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 +        assertEquals(expectedValue, result);
88 +
89          assertTrue(f.isDone());
90          assertFalse(f.isCancelled());
91          assertFalse(f.isCompletedExceptionally());
92 <        assertTrue(f.toString().contains("[Completed normally]"));
92 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
93      }
94  
95      /**
96       * Returns the "raw" internal exceptional completion of f,
97       * without any additional wrapping with CompletionException.
98       */
99 <    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
100 <        // handle (and whenComplete) can distinguish between "direct"
101 <        // and "wrapped" exceptional completion
102 <        return f.handle((U u, Throwable t) -> t).join();
99 >    Throwable exceptionalCompletion(CompletableFuture<?> f) {
100 >        // handle (and whenComplete and exceptionally) can distinguish
101 >        // between "direct" and "wrapped" exceptional completion
102 >        return f.handle((u, t) -> t).join();
103      }
104  
105      void checkCompletedExceptionally(CompletableFuture<?> f,
# Line 143 | Line 145 | public class CompletableFutureTest exten
145          assertFalse(f.isCancelled());
146          assertTrue(f.isDone());
147          assertTrue(f.isCompletedExceptionally());
148 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
148 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
149      }
150  
151      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
152          checkCompletedExceptionally(f, true,
153 <            (t) -> assertTrue(t instanceof CFException));
153 >            t -> assertTrue(t instanceof CFException));
154      }
155  
156      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
157          checkCompletedExceptionally(f, true,
158 <            (t) -> assertTrue(t instanceof CancellationException));
158 >            t -> assertTrue(t instanceof CancellationException));
159      }
160  
161      void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
162          checkCompletedExceptionally(f, false,
163 <            (t) -> assertTrue(t instanceof TimeoutException));
163 >            t -> assertTrue(t instanceof TimeoutException));
164      }
165  
166      void checkCompletedWithWrappedException(CompletableFuture<?> f,
167                                              Throwable ex) {
168 <        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
168 >        checkCompletedExceptionally(f, true, t -> assertSame(t, ex));
169      }
170  
171      void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
172 <        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
172 >        checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
173      }
174  
175      void checkCancelled(CompletableFuture<?> f) {
# Line 198 | Line 200 | public class CompletableFutureTest exten
200          assertTrue(f.isDone());
201          assertTrue(f.isCompletedExceptionally());
202          assertTrue(f.isCancelled());
203 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
203 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
204      }
205  
206      /**
# Line 297 | Line 299 | public class CompletableFutureTest exten
299          }
300  
301          f = new CompletableFuture<>();
302 <        f.completeExceptionally(ex = new CFException());
302 >        f.completeExceptionally(new CFException());
303          f.obtrudeValue(v1);
304          checkCompletedNormally(f, v1);
305          f.obtrudeException(ex = new CFException());
# Line 334 | Line 336 | public class CompletableFutureTest exten
336      /**
337       * toString indicates current completion state
338       */
339 <    public void testToString() {
340 <        CompletableFuture<String> f;
341 <
342 <        f = new CompletableFuture<String>();
343 <        assertTrue(f.toString().contains("[Not completed]"));
339 >    public void testToString_incomplete() {
340 >        CompletableFuture<String> f = new CompletableFuture<>();
341 >        assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
342 >        if (testImplementationDetails)
343 >            assertEquals(identityString(f) + "[Not completed]",
344 >                         f.toString());
345 >    }
346  
347 +    public void testToString_normal() {
348 +        CompletableFuture<String> f = new CompletableFuture<>();
349          assertTrue(f.complete("foo"));
350 <        assertTrue(f.toString().contains("[Completed normally]"));
350 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
351 >        if (testImplementationDetails)
352 >            assertEquals(identityString(f) + "[Completed normally]",
353 >                         f.toString());
354 >    }
355  
356 <        f = new CompletableFuture<String>();
356 >    public void testToString_exception() {
357 >        CompletableFuture<String> f = new CompletableFuture<>();
358          assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
359 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
360 >        if (testImplementationDetails)
361 >            assertTrue(f.toString().startsWith(
362 >                               identityString(f) + "[Completed exceptionally: "));
363 >    }
364  
365 +    public void testToString_cancelled() {
366          for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
367 <            f = new CompletableFuture<String>();
367 >            CompletableFuture<String> f = new CompletableFuture<>();
368              assertTrue(f.cancel(mayInterruptIfRunning));
369 <            assertTrue(f.toString().contains("[Completed exceptionally]"));
369 >            assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
370 >            if (testImplementationDetails)
371 >                assertTrue(f.toString().startsWith(
372 >                                   identityString(f) + "[Completed exceptionally: "));
373          }
374      }
375  
# Line 362 | Line 381 | public class CompletableFutureTest exten
381          checkCompletedNormally(f, "test");
382      }
383  
384 <    abstract class CheckedAction {
384 >    abstract static class CheckedAction {
385          int invocationCount = 0;
386          final ExecutionMode m;
387          CheckedAction(ExecutionMode m) { this.m = m; }
# Line 374 | Line 393 | public class CompletableFutureTest exten
393          void assertInvoked() { assertEquals(1, invocationCount); }
394      }
395  
396 <    abstract class CheckedIntegerAction extends CheckedAction {
396 >    abstract static class CheckedIntegerAction extends CheckedAction {
397          Integer value;
398          CheckedIntegerAction(ExecutionMode m) { super(m); }
399          void assertValue(Integer expected) {
# Line 383 | Line 402 | public class CompletableFutureTest exten
402          }
403      }
404  
405 <    class IntegerSupplier extends CheckedAction
405 >    static class IntegerSupplier extends CheckedAction
406          implements Supplier<Integer>
407      {
408          final Integer value;
# Line 402 | Line 421 | public class CompletableFutureTest exten
421          return (x == null) ? null : x + 1;
422      }
423  
424 <    class NoopConsumer extends CheckedIntegerAction
424 >    static class NoopConsumer extends CheckedIntegerAction
425          implements Consumer<Integer>
426      {
427          NoopConsumer(ExecutionMode m) { super(m); }
# Line 412 | Line 431 | public class CompletableFutureTest exten
431          }
432      }
433  
434 <    class IncFunction extends CheckedIntegerAction
434 >    static class IncFunction extends CheckedIntegerAction
435          implements Function<Integer,Integer>
436      {
437          IncFunction(ExecutionMode m) { super(m); }
# Line 430 | Line 449 | public class CompletableFutureTest exten
449              - ((y == null) ? 99 : y.intValue());
450      }
451  
452 <    class SubtractAction extends CheckedIntegerAction
452 >    static class SubtractAction extends CheckedIntegerAction
453          implements BiConsumer<Integer, Integer>
454      {
455          SubtractAction(ExecutionMode m) { super(m); }
# Line 440 | Line 459 | public class CompletableFutureTest exten
459          }
460      }
461  
462 <    class SubtractFunction extends CheckedIntegerAction
462 >    static class SubtractFunction extends CheckedIntegerAction
463          implements BiFunction<Integer, Integer, Integer>
464      {
465          SubtractFunction(ExecutionMode m) { super(m); }
# Line 450 | Line 469 | public class CompletableFutureTest exten
469          }
470      }
471  
472 <    class Noop extends CheckedAction implements Runnable {
472 >    static class Noop extends CheckedAction implements Runnable {
473          Noop(ExecutionMode m) { super(m); }
474          public void run() {
475              invoked();
476          }
477      }
478  
479 <    class FailingSupplier extends CheckedAction
479 >    static class FailingSupplier extends CheckedAction
480          implements Supplier<Integer>
481      {
482          final CFException ex;
# Line 468 | Line 487 | public class CompletableFutureTest exten
487          }
488      }
489  
490 <    class FailingConsumer extends CheckedIntegerAction
490 >    static class FailingConsumer extends CheckedIntegerAction
491          implements Consumer<Integer>
492      {
493          final CFException ex;
# Line 480 | Line 499 | public class CompletableFutureTest exten
499          }
500      }
501  
502 <    class FailingBiConsumer extends CheckedIntegerAction
502 >    static class FailingBiConsumer extends CheckedIntegerAction
503          implements BiConsumer<Integer, Integer>
504      {
505          final CFException ex;
# Line 492 | Line 511 | public class CompletableFutureTest exten
511          }
512      }
513  
514 <    class FailingFunction extends CheckedIntegerAction
514 >    static class FailingFunction extends CheckedIntegerAction
515          implements Function<Integer, Integer>
516      {
517          final CFException ex;
# Line 504 | Line 523 | public class CompletableFutureTest exten
523          }
524      }
525  
526 <    class FailingBiFunction extends CheckedIntegerAction
526 >    static class FailingBiFunction extends CheckedIntegerAction
527          implements BiFunction<Integer, Integer, Integer>
528      {
529          final CFException ex;
# Line 516 | Line 535 | public class CompletableFutureTest exten
535          }
536      }
537  
538 <    class FailingRunnable extends CheckedAction implements Runnable {
538 >    static class FailingRunnable extends CheckedAction implements Runnable {
539          final CFException ex;
540          FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
541          public void run() {
# Line 525 | Line 544 | public class CompletableFutureTest exten
544          }
545      }
546  
547 <    class CompletableFutureInc extends CheckedIntegerAction
547 >    static class CompletableFutureInc extends CheckedIntegerAction
548          implements Function<Integer, CompletableFuture<Integer>>
549      {
550          CompletableFutureInc(ExecutionMode m) { super(m); }
551          public CompletableFuture<Integer> apply(Integer x) {
552              invoked();
553              value = x;
554 <            CompletableFuture<Integer> f = new CompletableFuture<>();
555 <            assertTrue(f.complete(inc(x)));
556 <            return f;
554 >            return CompletableFuture.completedFuture(inc(x));
555 >        }
556 >    }
557 >
558 >    static class FailingExceptionalCompletableFutureFunction extends CheckedAction
559 >        implements Function<Throwable, CompletableFuture<Integer>>
560 >    {
561 >        final CFException ex;
562 >        FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
563 >        public CompletableFuture<Integer> apply(Throwable x) {
564 >            invoked();
565 >            throw ex;
566 >        }
567 >    }
568 >
569 >    static class ExceptionalCompletableFutureFunction extends CheckedAction
570 >        implements Function<Throwable, CompletionStage<Integer>> {
571 >        final Integer value = 3;
572 >        ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
573 >        public CompletionStage<Integer> apply(Throwable x) {
574 >            invoked();
575 >            return CompletableFuture.completedFuture(value);
576          }
577      }
578  
579 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
579 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
580          implements Function<Integer, CompletableFuture<Integer>>
581      {
582          final CFException ex;
# Line 550 | Line 588 | public class CompletableFutureTest exten
588          }
589      }
590  
591 +    static class CountingRejectingExecutor implements Executor {
592 +        final RejectedExecutionException ex = new RejectedExecutionException();
593 +        final AtomicInteger count = new AtomicInteger(0);
594 +        public void execute(Runnable r) {
595 +            count.getAndIncrement();
596 +            throw ex;
597 +        }
598 +    }
599 +
600      // Used for explicit executor tests
601      static final class ThreadExecutor implements Executor {
602          final AtomicInteger count = new AtomicInteger(0);
# Line 644 | Line 691 | public class CompletableFutureTest exten
691                   Function<? super T,U> a) {
692                  return f.applyToEither(g, a);
693              }
694 +            public <T> CompletableFuture<T> exceptionally
695 +                (CompletableFuture<T> f,
696 +                 Function<Throwable, ? extends T> fn) {
697 +                return f.exceptionally(fn);
698 +            }
699 +            public <T> CompletableFuture<T> exceptionallyCompose
700 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
701 +                return f.exceptionallyCompose(fn);
702 +            }
703          },
648
704          ASYNC {
705              public void checkExecutionMode() {
706                  assertEquals(defaultExecutorIsCommonPool,
# Line 718 | Line 773 | public class CompletableFutureTest exten
773                   Function<? super T,U> a) {
774                  return f.applyToEitherAsync(g, a);
775              }
776 +            public <T> CompletableFuture<T> exceptionally
777 +                (CompletableFuture<T> f,
778 +                 Function<Throwable, ? extends T> fn) {
779 +                return f.exceptionallyAsync(fn);
780 +            }
781 +
782 +            public <T> CompletableFuture<T> exceptionallyCompose
783 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
784 +                return f.exceptionallyComposeAsync(fn);
785 +            }
786 +
787          },
788  
789          EXECUTOR {
# Line 791 | Line 857 | public class CompletableFutureTest exten
857                   Function<? super T,U> a) {
858                  return f.applyToEitherAsync(g, a, new ThreadExecutor());
859              }
860 +            public <T> CompletableFuture<T> exceptionally
861 +                (CompletableFuture<T> f,
862 +                 Function<Throwable, ? extends T> fn) {
863 +                return f.exceptionallyAsync(fn, new ThreadExecutor());
864 +            }
865 +            public <T> CompletableFuture<T> exceptionallyCompose
866 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
867 +                return f.exceptionallyComposeAsync(fn, new ThreadExecutor());
868 +            }
869 +
870          };
871  
872          public abstract void checkExecutionMode();
# Line 833 | Line 909 | public class CompletableFutureTest exten
909              (CompletableFuture<T> f,
910               CompletionStage<? extends T> g,
911               Function<? super T,U> a);
912 +        public abstract <T> CompletableFuture<T> exceptionally
913 +            (CompletableFuture<T> f,
914 +             Function<Throwable, ? extends T> fn);
915 +        public abstract <T> CompletableFuture<T> exceptionallyCompose
916 +            (CompletableFuture<T> f,
917 +             Function<Throwable, ? extends CompletionStage<T>> fn);
918      }
919  
920      /**
# Line 840 | Line 922 | public class CompletableFutureTest exten
922       * normally, and source result is propagated
923       */
924      public void testExceptionally_normalCompletion() {
925 +        for (ExecutionMode m : ExecutionMode.values())
926          for (boolean createIncomplete : new boolean[] { true, false })
927          for (Integer v1 : new Integer[] { 1, null })
928      {
929 <        final AtomicInteger a = new AtomicInteger(0);
929 >        final AtomicInteger ran = new AtomicInteger(0);
930          final CompletableFuture<Integer> f = new CompletableFuture<>();
931          if (!createIncomplete) assertTrue(f.complete(v1));
932 <        final CompletableFuture<Integer> g = f.exceptionally
933 <            ((Throwable t) -> {
934 <                a.getAndIncrement();
935 <                threadFail("should not be called");
853 <                return null;            // unreached
932 >        final CompletableFuture<Integer> g = m.exceptionally
933 >            (f, (Throwable t) -> {
934 >                ran.getAndIncrement();
935 >                throw new AssertionError("should not be called");
936              });
937          if (createIncomplete) assertTrue(f.complete(v1));
938  
939          checkCompletedNormally(g, v1);
940          checkCompletedNormally(f, v1);
941 <        assertEquals(0, a.get());
941 >        assertEquals(0, ran.get());
942      }}
943  
944      /**
# Line 864 | Line 946 | public class CompletableFutureTest exten
946       * exception
947       */
948      public void testExceptionally_exceptionalCompletion() {
949 +        for (ExecutionMode m : ExecutionMode.values())
950          for (boolean createIncomplete : new boolean[] { true, false })
951          for (Integer v1 : new Integer[] { 1, null })
952      {
953 <        final AtomicInteger a = new AtomicInteger(0);
953 >        final AtomicInteger ran = new AtomicInteger(0);
954          final CFException ex = new CFException();
955          final CompletableFuture<Integer> f = new CompletableFuture<>();
956          if (!createIncomplete) f.completeExceptionally(ex);
957 <        final CompletableFuture<Integer> g = f.exceptionally
958 <            ((Throwable t) -> {
959 <                ExecutionMode.SYNC.checkExecutionMode();
960 <                threadAssertSame(t, ex);
961 <                a.getAndIncrement();
957 >        final CompletableFuture<Integer> g = m.exceptionally
958 >            (f, (Throwable t) -> {
959 >                m.checkExecutionMode();
960 >                assertSame(t, ex);
961 >                ran.getAndIncrement();
962                  return v1;
963              });
964          if (createIncomplete) f.completeExceptionally(ex);
965  
966          checkCompletedNormally(g, v1);
967 <        assertEquals(1, a.get());
967 >        assertEquals(1, ran.get());
968      }}
969  
970      /**
# Line 889 | Line 972 | public class CompletableFutureTest exten
972       * exceptionally with that exception
973       */
974      public void testExceptionally_exceptionalCompletionActionFailed() {
975 +        for (ExecutionMode m : ExecutionMode.values())
976          for (boolean createIncomplete : new boolean[] { true, false })
977      {
978 <        final AtomicInteger a = new AtomicInteger(0);
978 >        final AtomicInteger ran = new AtomicInteger(0);
979          final CFException ex1 = new CFException();
980          final CFException ex2 = new CFException();
981          final CompletableFuture<Integer> f = new CompletableFuture<>();
982          if (!createIncomplete) f.completeExceptionally(ex1);
983 <        final CompletableFuture<Integer> g = f.exceptionally
984 <            ((Throwable t) -> {
985 <                ExecutionMode.SYNC.checkExecutionMode();
986 <                threadAssertSame(t, ex1);
987 <                a.getAndIncrement();
983 >        final CompletableFuture<Integer> g = m.exceptionally
984 >            (f, (Throwable t) -> {
985 >                m.checkExecutionMode();
986 >                assertSame(t, ex1);
987 >                ran.getAndIncrement();
988                  throw ex2;
989              });
990          if (createIncomplete) f.completeExceptionally(ex1);
991  
992          checkCompletedWithWrappedException(g, ex2);
993          checkCompletedExceptionally(f, ex1);
994 <        assertEquals(1, a.get());
994 >        assertEquals(1, ran.get());
995      }}
996  
997      /**
# Line 919 | Line 1003 | public class CompletableFutureTest exten
1003          for (boolean createIncomplete : new boolean[] { true, false })
1004          for (Integer v1 : new Integer[] { 1, null })
1005      {
1006 <        final AtomicInteger a = new AtomicInteger(0);
1006 >        final AtomicInteger ran = new AtomicInteger(0);
1007          final CompletableFuture<Integer> f = new CompletableFuture<>();
1008          if (!createIncomplete) assertTrue(f.complete(v1));
1009          final CompletableFuture<Integer> g = m.whenComplete
1010              (f,
1011               (Integer result, Throwable t) -> {
1012                  m.checkExecutionMode();
1013 <                threadAssertSame(result, v1);
1014 <                threadAssertNull(t);
1015 <                a.getAndIncrement();
1013 >                assertSame(result, v1);
1014 >                assertNull(t);
1015 >                ran.getAndIncrement();
1016              });
1017          if (createIncomplete) assertTrue(f.complete(v1));
1018  
1019          checkCompletedNormally(g, v1);
1020          checkCompletedNormally(f, v1);
1021 <        assertEquals(1, a.get());
1021 >        assertEquals(1, ran.get());
1022      }}
1023  
1024      /**
# Line 945 | Line 1029 | public class CompletableFutureTest exten
1029          for (ExecutionMode m : ExecutionMode.values())
1030          for (boolean createIncomplete : new boolean[] { true, false })
1031      {
1032 <        final AtomicInteger a = new AtomicInteger(0);
1032 >        final AtomicInteger ran = new AtomicInteger(0);
1033          final CFException ex = new CFException();
1034          final CompletableFuture<Integer> f = new CompletableFuture<>();
1035          if (!createIncomplete) f.completeExceptionally(ex);
# Line 953 | Line 1037 | public class CompletableFutureTest exten
1037              (f,
1038               (Integer result, Throwable t) -> {
1039                  m.checkExecutionMode();
1040 <                threadAssertNull(result);
1041 <                threadAssertSame(t, ex);
1042 <                a.getAndIncrement();
1040 >                assertNull(result);
1041 >                assertSame(t, ex);
1042 >                ran.getAndIncrement();
1043              });
1044          if (createIncomplete) f.completeExceptionally(ex);
1045  
1046          checkCompletedWithWrappedException(g, ex);
1047          checkCompletedExceptionally(f, ex);
1048 <        assertEquals(1, a.get());
1048 >        assertEquals(1, ran.get());
1049      }}
1050  
1051      /**
# Line 973 | Line 1057 | public class CompletableFutureTest exten
1057          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1058          for (boolean createIncomplete : new boolean[] { true, false })
1059      {
1060 <        final AtomicInteger a = new AtomicInteger(0);
1060 >        final AtomicInteger ran = new AtomicInteger(0);
1061          final CompletableFuture<Integer> f = new CompletableFuture<>();
1062          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1063          final CompletableFuture<Integer> g = m.whenComplete
1064              (f,
1065               (Integer result, Throwable t) -> {
1066                  m.checkExecutionMode();
1067 <                threadAssertNull(result);
1068 <                threadAssertTrue(t instanceof CancellationException);
1069 <                a.getAndIncrement();
1067 >                assertNull(result);
1068 >                assertTrue(t instanceof CancellationException);
1069 >                ran.getAndIncrement();
1070              });
1071          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1072  
1073          checkCompletedWithWrappedCancellationException(g);
1074          checkCancelled(f);
1075 <        assertEquals(1, a.get());
1075 >        assertEquals(1, ran.get());
1076      }}
1077  
1078      /**
# Line 1000 | Line 1084 | public class CompletableFutureTest exten
1084          for (ExecutionMode m : ExecutionMode.values())
1085          for (Integer v1 : new Integer[] { 1, null })
1086      {
1087 <        final AtomicInteger a = new AtomicInteger(0);
1087 >        final AtomicInteger ran = new AtomicInteger(0);
1088          final CFException ex = new CFException();
1089          final CompletableFuture<Integer> f = new CompletableFuture<>();
1090          if (!createIncomplete) assertTrue(f.complete(v1));
# Line 1008 | Line 1092 | public class CompletableFutureTest exten
1092              (f,
1093               (Integer result, Throwable t) -> {
1094                  m.checkExecutionMode();
1095 <                threadAssertSame(result, v1);
1096 <                threadAssertNull(t);
1097 <                a.getAndIncrement();
1095 >                assertSame(result, v1);
1096 >                assertNull(t);
1097 >                ran.getAndIncrement();
1098                  throw ex;
1099              });
1100          if (createIncomplete) assertTrue(f.complete(v1));
1101  
1102          checkCompletedWithWrappedException(g, ex);
1103          checkCompletedNormally(f, v1);
1104 <        assertEquals(1, a.get());
1104 >        assertEquals(1, ran.get());
1105      }}
1106  
1107      /**
# Line 1029 | Line 1113 | public class CompletableFutureTest exten
1113          for (boolean createIncomplete : new boolean[] { true, false })
1114          for (ExecutionMode m : ExecutionMode.values())
1115      {
1116 <        final AtomicInteger a = new AtomicInteger(0);
1116 >        final AtomicInteger ran = new AtomicInteger(0);
1117          final CFException ex1 = new CFException();
1118          final CFException ex2 = new CFException();
1119          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 1039 | Line 1123 | public class CompletableFutureTest exten
1123              (f,
1124               (Integer result, Throwable t) -> {
1125                  m.checkExecutionMode();
1126 <                threadAssertSame(t, ex1);
1127 <                threadAssertNull(result);
1128 <                a.getAndIncrement();
1126 >                assertSame(t, ex1);
1127 >                assertNull(result);
1128 >                ran.getAndIncrement();
1129                  throw ex2;
1130              });
1131          if (createIncomplete) f.completeExceptionally(ex1);
# Line 1052 | Line 1136 | public class CompletableFutureTest exten
1136              assertEquals(1, ex1.getSuppressed().length);
1137              assertSame(ex2, ex1.getSuppressed()[0]);
1138          }
1139 <        assertEquals(1, a.get());
1139 >        assertEquals(1, ran.get());
1140      }}
1141  
1142      /**
# Line 1065 | Line 1149 | public class CompletableFutureTest exten
1149          for (Integer v1 : new Integer[] { 1, null })
1150      {
1151          final CompletableFuture<Integer> f = new CompletableFuture<>();
1152 <        final AtomicInteger a = new AtomicInteger(0);
1152 >        final AtomicInteger ran = new AtomicInteger(0);
1153          if (!createIncomplete) assertTrue(f.complete(v1));
1154          final CompletableFuture<Integer> g = m.handle
1155              (f,
1156               (Integer result, Throwable t) -> {
1157                  m.checkExecutionMode();
1158 <                threadAssertSame(result, v1);
1159 <                threadAssertNull(t);
1160 <                a.getAndIncrement();
1158 >                assertSame(result, v1);
1159 >                assertNull(t);
1160 >                ran.getAndIncrement();
1161                  return inc(v1);
1162              });
1163          if (createIncomplete) assertTrue(f.complete(v1));
1164  
1165          checkCompletedNormally(g, inc(v1));
1166          checkCompletedNormally(f, v1);
1167 <        assertEquals(1, a.get());
1167 >        assertEquals(1, ran.get());
1168      }}
1169  
1170      /**
# Line 1093 | Line 1177 | public class CompletableFutureTest exten
1177          for (Integer v1 : new Integer[] { 1, null })
1178      {
1179          final CompletableFuture<Integer> f = new CompletableFuture<>();
1180 <        final AtomicInteger a = new AtomicInteger(0);
1180 >        final AtomicInteger ran = new AtomicInteger(0);
1181          final CFException ex = new CFException();
1182          if (!createIncomplete) f.completeExceptionally(ex);
1183          final CompletableFuture<Integer> g = m.handle
1184              (f,
1185               (Integer result, Throwable t) -> {
1186                  m.checkExecutionMode();
1187 <                threadAssertNull(result);
1188 <                threadAssertSame(t, ex);
1189 <                a.getAndIncrement();
1187 >                assertNull(result);
1188 >                assertSame(t, ex);
1189 >                ran.getAndIncrement();
1190                  return v1;
1191              });
1192          if (createIncomplete) f.completeExceptionally(ex);
1193  
1194          checkCompletedNormally(g, v1);
1195          checkCompletedExceptionally(f, ex);
1196 <        assertEquals(1, a.get());
1196 >        assertEquals(1, ran.get());
1197      }}
1198  
1199      /**
# Line 1123 | Line 1207 | public class CompletableFutureTest exten
1207          for (Integer v1 : new Integer[] { 1, null })
1208      {
1209          final CompletableFuture<Integer> f = new CompletableFuture<>();
1210 <        final AtomicInteger a = new AtomicInteger(0);
1210 >        final AtomicInteger ran = new AtomicInteger(0);
1211          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1212          final CompletableFuture<Integer> g = m.handle
1213              (f,
1214               (Integer result, Throwable t) -> {
1215                  m.checkExecutionMode();
1216 <                threadAssertNull(result);
1217 <                threadAssertTrue(t instanceof CancellationException);
1218 <                a.getAndIncrement();
1216 >                assertNull(result);
1217 >                assertTrue(t instanceof CancellationException);
1218 >                ran.getAndIncrement();
1219                  return v1;
1220              });
1221          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1222  
1223          checkCompletedNormally(g, v1);
1224          checkCancelled(f);
1225 <        assertEquals(1, a.get());
1225 >        assertEquals(1, ran.get());
1226      }}
1227  
1228      /**
# Line 1151 | Line 1235 | public class CompletableFutureTest exten
1235          for (Integer v1 : new Integer[] { 1, null })
1236      {
1237          final CompletableFuture<Integer> f = new CompletableFuture<>();
1238 <        final AtomicInteger a = new AtomicInteger(0);
1238 >        final AtomicInteger ran = new AtomicInteger(0);
1239          final CFException ex = new CFException();
1240          if (!createIncomplete) assertTrue(f.complete(v1));
1241          final CompletableFuture<Integer> g = m.handle
1242              (f,
1243               (Integer result, Throwable t) -> {
1244                  m.checkExecutionMode();
1245 <                threadAssertSame(result, v1);
1246 <                threadAssertNull(t);
1247 <                a.getAndIncrement();
1245 >                assertSame(result, v1);
1246 >                assertNull(t);
1247 >                ran.getAndIncrement();
1248                  throw ex;
1249              });
1250          if (createIncomplete) assertTrue(f.complete(v1));
1251  
1252          checkCompletedWithWrappedException(g, ex);
1253          checkCompletedNormally(f, v1);
1254 <        assertEquals(1, a.get());
1254 >        assertEquals(1, ran.get());
1255      }}
1256  
1257      /**
# Line 1179 | Line 1263 | public class CompletableFutureTest exten
1263          for (boolean createIncomplete : new boolean[] { true, false })
1264          for (ExecutionMode m : ExecutionMode.values())
1265      {
1266 <        final AtomicInteger a = new AtomicInteger(0);
1266 >        final AtomicInteger ran = new AtomicInteger(0);
1267          final CFException ex1 = new CFException();
1268          final CFException ex2 = new CFException();
1269          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 1189 | Line 1273 | public class CompletableFutureTest exten
1273              (f,
1274               (Integer result, Throwable t) -> {
1275                  m.checkExecutionMode();
1276 <                threadAssertNull(result);
1277 <                threadAssertSame(ex1, t);
1278 <                a.getAndIncrement();
1276 >                assertNull(result);
1277 >                assertSame(ex1, t);
1278 >                ran.getAndIncrement();
1279                  throw ex2;
1280              });
1281          if (createIncomplete) f.completeExceptionally(ex1);
1282  
1283          checkCompletedWithWrappedException(g, ex2);
1284          checkCompletedExceptionally(f, ex1);
1285 <        assertEquals(1, a.get());
1285 >        assertEquals(1, ran.get());
1286      }}
1287  
1288      /**
# Line 1234 | Line 1318 | public class CompletableFutureTest exten
1318          r.assertInvoked();
1319      }}
1320  
1321 +    @SuppressWarnings("FutureReturnValueIgnored")
1322 +    public void testRunAsync_rejectingExecutor() {
1323 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1324 +        try {
1325 +            CompletableFuture.runAsync(() -> {}, e);
1326 +            shouldThrow();
1327 +        } catch (Throwable t) {
1328 +            assertSame(e.ex, t);
1329 +        }
1330 +
1331 +        assertEquals(1, e.count.get());
1332 +    }
1333 +
1334      /**
1335       * supplyAsync completes with result of supplier
1336       */
# Line 1268 | Line 1365 | public class CompletableFutureTest exten
1365          r.assertInvoked();
1366      }}
1367  
1368 +    @SuppressWarnings("FutureReturnValueIgnored")
1369 +    public void testSupplyAsync_rejectingExecutor() {
1370 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1371 +        try {
1372 +            CompletableFuture.supplyAsync(() -> null, e);
1373 +            shouldThrow();
1374 +        } catch (Throwable t) {
1375 +            assertSame(e.ex, t);
1376 +        }
1377 +
1378 +        assertEquals(1, e.count.get());
1379 +    }
1380 +
1381      // seq completion methods
1382  
1383      /**
# Line 2530 | Line 2640 | public class CompletableFutureTest exten
2640  
2641          // unspecified behavior - both source completions available
2642          try {
2643 <            assertEquals(null, h0.join());
2643 >            assertNull(h0.join());
2644              rs[0].assertValue(v1);
2645          } catch (CompletionException ok) {
2646              checkCompletedWithWrappedException(h0, ex);
2647              rs[0].assertNotInvoked();
2648          }
2649          try {
2650 <            assertEquals(null, h1.join());
2650 >            assertNull(h1.join());
2651              rs[1].assertValue(v1);
2652          } catch (CompletionException ok) {
2653              checkCompletedWithWrappedException(h1, ex);
2654              rs[1].assertNotInvoked();
2655          }
2656          try {
2657 <            assertEquals(null, h2.join());
2657 >            assertNull(h2.join());
2658              rs[2].assertValue(v1);
2659          } catch (CompletionException ok) {
2660              checkCompletedWithWrappedException(h2, ex);
2661              rs[2].assertNotInvoked();
2662          }
2663          try {
2664 <            assertEquals(null, h3.join());
2664 >            assertNull(h3.join());
2665              rs[3].assertValue(v1);
2666          } catch (CompletionException ok) {
2667              checkCompletedWithWrappedException(h3, ex);
# Line 2667 | Line 2777 | public class CompletableFutureTest exten
2777          for (ExecutionMode m : ExecutionMode.values())
2778          for (Integer v1 : new Integer[] { 1, null })
2779          for (Integer v2 : new Integer[] { 2, null })
2780 +        for (boolean pushNop : new boolean[] { true, false })
2781      {
2782          final CompletableFuture<Integer> f = new CompletableFuture<>();
2783          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2679 | Line 2790 | public class CompletableFutureTest exten
2790          checkIncomplete(h1);
2791          rs[0].assertNotInvoked();
2792          rs[1].assertNotInvoked();
2793 +        if (pushNop) {          // ad hoc test of intra-completion interference
2794 +            m.thenRun(f, () -> {});
2795 +            m.thenRun(g, () -> {});
2796 +        }
2797          f.complete(v1);
2798          checkCompletedNormally(h0, null);
2799          checkCompletedNormally(h1, null);
# Line 2785 | Line 2900 | public class CompletableFutureTest exten
2900  
2901          // unspecified behavior - both source completions available
2902          try {
2903 <            assertEquals(null, h0.join());
2903 >            assertNull(h0.join());
2904              rs[0].assertInvoked();
2905          } catch (CompletionException ok) {
2906              checkCompletedWithWrappedException(h0, ex);
2907              rs[0].assertNotInvoked();
2908          }
2909          try {
2910 <            assertEquals(null, h1.join());
2910 >            assertNull(h1.join());
2911              rs[1].assertInvoked();
2912          } catch (CompletionException ok) {
2913              checkCompletedWithWrappedException(h1, ex);
2914              rs[1].assertNotInvoked();
2915          }
2916          try {
2917 <            assertEquals(null, h2.join());
2917 >            assertNull(h2.join());
2918              rs[2].assertInvoked();
2919          } catch (CompletionException ok) {
2920              checkCompletedWithWrappedException(h2, ex);
2921              rs[2].assertNotInvoked();
2922          }
2923          try {
2924 <            assertEquals(null, h3.join());
2924 >            assertNull(h3.join());
2925              rs[3].assertInvoked();
2926          } catch (CompletionException ok) {
2927              checkCompletedWithWrappedException(h3, ex);
# Line 3003 | Line 3118 | public class CompletableFutureTest exten
3118          case 0:
3119              assertTrue(f.complete(v1));
3120              assertTrue(g.completeExceptionally(ex));
3121 <            h = m.thenCompose(f, (x -> g));
3121 >            h = m.thenCompose(f, x -> g);
3122              break;
3123          case 1:
3124              assertTrue(f.complete(v1));
3125 <            h = m.thenCompose(f, (x -> g));
3125 >            h = m.thenCompose(f, x -> g);
3126              assertTrue(g.completeExceptionally(ex));
3127              break;
3128          case 2:
3129              assertTrue(g.completeExceptionally(ex));
3130              assertTrue(f.complete(v1));
3131 <            h = m.thenCompose(f, (x -> g));
3131 >            h = m.thenCompose(f, x -> g);
3132              break;
3133          case 3:
3134              assertTrue(g.completeExceptionally(ex));
3135 <            h = m.thenCompose(f, (x -> g));
3135 >            h = m.thenCompose(f, x -> g);
3136              assertTrue(f.complete(v1));
3137              break;
3138          case 4:
3139 <            h = m.thenCompose(f, (x -> g));
3139 >            h = m.thenCompose(f, x -> g);
3140              assertTrue(f.complete(v1));
3141              assertTrue(g.completeExceptionally(ex));
3142              break;
3143          case 5:
3144 <            h = m.thenCompose(f, (x -> g));
3144 >            h = m.thenCompose(f, x -> g);
3145              assertTrue(f.complete(v1));
3146              assertTrue(g.completeExceptionally(ex));
3147              break;
# Line 3038 | Line 3153 | public class CompletableFutureTest exten
3153          checkCompletedNormally(f, v1);
3154      }}
3155  
3156 +    /**
3157 +     * exceptionallyCompose result completes normally after normal
3158 +     * completion of source
3159 +     */
3160 +    public void testExceptionallyCompose_normalCompletion() {
3161 +        for (ExecutionMode m : ExecutionMode.values())
3162 +        for (boolean createIncomplete : new boolean[] { true, false })
3163 +        for (Integer v1 : new Integer[] { 1, null })
3164 +    {
3165 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3166 +        final ExceptionalCompletableFutureFunction r =
3167 +            new ExceptionalCompletableFutureFunction(m);
3168 +        if (!createIncomplete) assertTrue(f.complete(v1));
3169 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3170 +        if (createIncomplete) assertTrue(f.complete(v1));
3171 +
3172 +        checkCompletedNormally(f, v1);
3173 +        checkCompletedNormally(g, v1);
3174 +        r.assertNotInvoked();
3175 +    }}
3176 +
3177 +    /**
3178 +     * exceptionallyCompose result completes normally after exceptional
3179 +     * completion of source
3180 +     */
3181 +    public void testExceptionallyCompose_exceptionalCompletion() {
3182 +        for (ExecutionMode m : ExecutionMode.values())
3183 +        for (boolean createIncomplete : new boolean[] { true, false })
3184 +    {
3185 +        final CFException ex = new CFException();
3186 +        final ExceptionalCompletableFutureFunction r =
3187 +            new ExceptionalCompletableFutureFunction(m);
3188 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3189 +        if (!createIncomplete) f.completeExceptionally(ex);
3190 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3191 +        if (createIncomplete) f.completeExceptionally(ex);
3192 +
3193 +        checkCompletedExceptionally(f, ex);
3194 +        checkCompletedNormally(g, r.value);
3195 +        r.assertInvoked();
3196 +    }}
3197 +
3198 +    /**
3199 +     * exceptionallyCompose completes exceptionally on exception if action does
3200 +     */
3201 +    public void testExceptionallyCompose_actionFailed() {
3202 +        for (ExecutionMode m : ExecutionMode.values())
3203 +        for (boolean createIncomplete : new boolean[] { true, false })
3204 +    {
3205 +        final CFException ex = new CFException();
3206 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3207 +        final FailingExceptionalCompletableFutureFunction r
3208 +            = new FailingExceptionalCompletableFutureFunction(m);
3209 +        if (!createIncomplete) f.completeExceptionally(ex);
3210 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3211 +        if (createIncomplete) f.completeExceptionally(ex);
3212 +
3213 +        checkCompletedExceptionally(f, ex);
3214 +        checkCompletedWithWrappedException(g, r.ex);
3215 +        r.assertInvoked();
3216 +    }}
3217 +
3218 +    /**
3219 +     * exceptionallyCompose result completes exceptionally if the
3220 +     * result of the action does
3221 +     */
3222 +    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3223 +        for (ExecutionMode m : ExecutionMode.values())
3224 +        for (int order = 0; order < 6; order++)
3225 +    {
3226 +        final CFException ex0 = new CFException();
3227 +        final CFException ex = new CFException();
3228 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3229 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3230 +        final CompletableFuture<Integer> h;
3231 +        // Test all permutations of orders
3232 +        switch (order) {
3233 +        case 0:
3234 +            assertTrue(f.completeExceptionally(ex0));
3235 +            assertTrue(g.completeExceptionally(ex));
3236 +            h = m.exceptionallyCompose(f, x -> g);
3237 +            break;
3238 +        case 1:
3239 +            assertTrue(f.completeExceptionally(ex0));
3240 +            h = m.exceptionallyCompose(f, x -> g);
3241 +            assertTrue(g.completeExceptionally(ex));
3242 +            break;
3243 +        case 2:
3244 +            assertTrue(g.completeExceptionally(ex));
3245 +            assertTrue(f.completeExceptionally(ex0));
3246 +            h = m.exceptionallyCompose(f, x -> g);
3247 +            break;
3248 +        case 3:
3249 +            assertTrue(g.completeExceptionally(ex));
3250 +            h = m.exceptionallyCompose(f, x -> g);
3251 +            assertTrue(f.completeExceptionally(ex0));
3252 +            break;
3253 +        case 4:
3254 +            h = m.exceptionallyCompose(f, x -> g);
3255 +            assertTrue(f.completeExceptionally(ex0));
3256 +            assertTrue(g.completeExceptionally(ex));
3257 +            break;
3258 +        case 5:
3259 +            h = m.exceptionallyCompose(f, x -> g);
3260 +            assertTrue(f.completeExceptionally(ex0));
3261 +            assertTrue(g.completeExceptionally(ex));
3262 +            break;
3263 +        default: throw new AssertionError();
3264 +        }
3265 +
3266 +        checkCompletedExceptionally(g, ex);
3267 +        checkCompletedWithWrappedException(h, ex);
3268 +        checkCompletedExceptionally(f, ex0);
3269 +    }}
3270 +
3271      // other static methods
3272  
3273      /**
# Line 3201 | Line 3431 | public class CompletableFutureTest exten
3431      /**
3432       * Completion methods throw NullPointerException with null arguments
3433       */
3434 +    @SuppressWarnings("FutureReturnValueIgnored")
3435      public void testNPE() {
3436          CompletableFuture<Integer> f = new CompletableFuture<>();
3437          CompletableFuture<Integer> g = new CompletableFuture<>();
3438          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3439          ThreadExecutor exec = new ThreadExecutor();
3440  
3441 <        Runnable[] throwingActions = {
3441 >        assertThrows(
3442 >            NullPointerException.class,
3443 >
3444              () -> CompletableFuture.supplyAsync(null),
3445              () -> CompletableFuture.supplyAsync(null, exec),
3446              () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
# Line 3220 | Line 3453 | public class CompletableFutureTest exten
3453  
3454              () -> f.thenApply(null),
3455              () -> f.thenApplyAsync(null),
3456 <            () -> f.thenApplyAsync((x) -> x, null),
3456 >            () -> f.thenApplyAsync(x -> x, null),
3457              () -> f.thenApplyAsync(null, exec),
3458  
3459              () -> f.thenAccept(null),
3460              () -> f.thenAcceptAsync(null),
3461 <            () -> f.thenAcceptAsync((x) -> {} , null),
3461 >            () -> f.thenAcceptAsync(x -> {} , null),
3462              () -> f.thenAcceptAsync(null, exec),
3463  
3464              () -> f.thenRun(null),
# Line 3260 | Line 3493 | public class CompletableFutureTest exten
3493              () -> f.applyToEither(g, null),
3494              () -> f.applyToEitherAsync(g, null),
3495              () -> f.applyToEitherAsync(g, null, exec),
3496 <            () -> f.applyToEither(nullFuture, (x) -> x),
3497 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3498 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3499 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3496 >            () -> f.applyToEither(nullFuture, x -> x),
3497 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3498 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3499 >            () -> f.applyToEitherAsync(g, x -> x, null),
3500  
3501              () -> f.acceptEither(g, null),
3502              () -> f.acceptEitherAsync(g, null),
3503              () -> f.acceptEitherAsync(g, null, exec),
3504 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3505 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3506 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3507 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3504 >            () -> f.acceptEither(nullFuture, x -> {}),
3505 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3506 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3507 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3508  
3509              () -> f.runAfterEither(g, null),
3510              () -> f.runAfterEitherAsync(g, null),
# Line 3310 | Line 3543 | public class CompletableFutureTest exten
3543              () -> f.completeOnTimeout(42, 1L, null),
3544  
3545              () -> CompletableFuture.failedFuture(null),
3546 <            () -> CompletableFuture.failedStage(null),
3314 <        };
3546 >            () -> CompletableFuture.failedStage(null));
3547  
3316        assertThrows(NullPointerException.class, throwingActions);
3548          assertEquals(0, exec.count.get());
3549      }
3550  
3320    static class CountingRejectingExecutor implements Executor {
3321        final RejectedExecutionException ex = new RejectedExecutionException();
3322        final AtomicInteger count = new AtomicInteger(0);
3323        public void execute(Runnable r) {
3324            count.getAndIncrement();
3325            throw ex;
3326        }
3327    }
3328
3551      /**
3552       * Test submissions to an executor that rejects all tasks.
3553       */
3554      public void testRejectingExecutor() {
3555 <        for (Integer v : new Integer[] { 1, null }) {
3556 <
3555 >        for (Integer v : new Integer[] { 1, null })
3556 >    {
3557          final CountingRejectingExecutor e = new CountingRejectingExecutor();
3558  
3559          final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
# Line 3346 | Line 3568 | public class CompletableFutureTest exten
3568          for (CompletableFuture<Integer> src : srcs) {
3569              List<CompletableFuture<?>> fs = new ArrayList<>();
3570              fs.add(src.thenRunAsync(() -> {}, e));
3571 <            fs.add(src.thenAcceptAsync((z) -> {}, e));
3572 <            fs.add(src.thenApplyAsync((z) -> z, e));
3571 >            fs.add(src.thenAcceptAsync(z -> {}, e));
3572 >            fs.add(src.thenApplyAsync(z -> z, e));
3573  
3574              fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3575              fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3576              fs.add(src.runAfterBothAsync(src, () -> {}, e));
3577  
3578 <            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3579 <            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3578 >            fs.add(src.applyToEitherAsync(src, z -> z, e));
3579 >            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3580              fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3581  
3582 <            fs.add(src.thenComposeAsync((z) -> null, e));
3582 >            fs.add(src.thenComposeAsync(z -> null, e));
3583              fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3584              fs.add(src.handleAsync((z, t) -> null, e));
3585  
# Line 3390 | Line 3612 | public class CompletableFutureTest exten
3612          {
3613              List<CompletableFuture<?>> fs = new ArrayList<>();
3614  
3615 <            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3616 <            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3615 >            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3616 >            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3617  
3618 <            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3619 <            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3618 >            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3619 >            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3620  
3621              fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3622              fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
# Line 3410 | Line 3632 | public class CompletableFutureTest exten
3632              checkCompletedWithWrappedException(future, e.ex);
3633  
3634          assertEquals(futures.size(), e.count.get());
3635 <
3414 <        }
3415 <    }
3635 >    }}
3636  
3637      /**
3638       * Test submissions to an executor that rejects all tasks, but
# Line 3420 | Line 3640 | public class CompletableFutureTest exten
3640       * explicitly completed.
3641       */
3642      public void testRejectingExecutorNeverInvoked() {
3643 +        for (Integer v : new Integer[] { 1, null })
3644 +    {
3645          final CountingRejectingExecutor e = new CountingRejectingExecutor();
3646  
3425        for (Integer v : new Integer[] { 1, null }) {
3426
3647          final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3648          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3649  
3430        List<CompletableFuture<?>> futures = new ArrayList<>();
3431
3432        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3433        srcs.add(complete);
3434        srcs.add(incomplete);
3435
3650          List<CompletableFuture<?>> fs = new ArrayList<>();
3651          fs.add(incomplete.thenRunAsync(() -> {}, e));
3652 <        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3653 <        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3652 >        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3653 >        fs.add(incomplete.thenApplyAsync(z -> z, e));
3654  
3655          fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3656          fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3657          fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3658  
3659 <        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3660 <        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3659 >        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3660 >        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3661          fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3662  
3663 <        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3663 >        fs.add(incomplete.thenComposeAsync(z -> null, e));
3664          fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3665          fs.add(incomplete.handleAsync((z, t) -> null, e));
3666  
# Line 3471 | Line 3685 | public class CompletableFutureTest exten
3685              checkCompletedNormally(future, null);
3686  
3687          assertEquals(0, e.count.get());
3688 <
3475 <        }
3476 <    }
3688 >    }}
3689  
3690      /**
3691       * toCompletableFuture returns this CompletableFuture.
# Line 3508 | Line 3720 | public class CompletableFutureTest exten
3720       */
3721      public void testCompletedStage() {
3722          AtomicInteger x = new AtomicInteger(0);
3723 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3723 >        AtomicReference<Throwable> r = new AtomicReference<>();
3724          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3725          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3726          assertEquals(x.get(), 1);
# Line 3540 | Line 3752 | public class CompletableFutureTest exten
3752      }
3753  
3754      /**
3543     * failedFuture(null) throws NPE
3544     */
3545    public void testFailedFuture_null() {
3546        try {
3547            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3548            shouldThrow();
3549        } catch (NullPointerException success) {}
3550    }
3551
3552    /**
3755       * copy returns a CompletableFuture that is completed normally,
3756       * with the same value, when source is.
3757       */
3758 <    public void testCopy() {
3758 >    public void testCopy_normalCompletion() {
3759 >        for (boolean createIncomplete : new boolean[] { true, false })
3760 >        for (Integer v1 : new Integer[] { 1, null })
3761 >    {
3762          CompletableFuture<Integer> f = new CompletableFuture<>();
3763 +        if (!createIncomplete) assertTrue(f.complete(v1));
3764          CompletableFuture<Integer> g = f.copy();
3765 <        checkIncomplete(f);
3766 <        checkIncomplete(g);
3767 <        f.complete(1);
3768 <        checkCompletedNormally(f, 1);
3769 <        checkCompletedNormally(g, 1);
3770 <    }
3765 >        if (createIncomplete) {
3766 >            checkIncomplete(f);
3767 >            checkIncomplete(g);
3768 >            assertTrue(f.complete(v1));
3769 >        }
3770 >        checkCompletedNormally(f, v1);
3771 >        checkCompletedNormally(g, v1);
3772 >    }}
3773  
3774      /**
3775       * copy returns a CompletableFuture that is completed exceptionally
3776       * when source is.
3777       */
3778 <    public void testCopy2() {
3778 >    public void testCopy_exceptionalCompletion() {
3779 >        for (boolean createIncomplete : new boolean[] { true, false })
3780 >    {
3781 >        CFException ex = new CFException();
3782          CompletableFuture<Integer> f = new CompletableFuture<>();
3783 +        if (!createIncomplete) f.completeExceptionally(ex);
3784          CompletableFuture<Integer> g = f.copy();
3785 <        checkIncomplete(f);
3786 <        checkIncomplete(g);
3787 <        CFException ex = new CFException();
3788 <        f.completeExceptionally(ex);
3785 >        if (createIncomplete) {
3786 >            checkIncomplete(f);
3787 >            checkIncomplete(g);
3788 >            f.completeExceptionally(ex);
3789 >        }
3790          checkCompletedExceptionally(f, ex);
3791          checkCompletedWithWrappedException(g, ex);
3792 +    }}
3793 +
3794 +    /**
3795 +     * Completion of a copy does not complete its source.
3796 +     */
3797 +    public void testCopy_oneWayPropagation() {
3798 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3799 +        assertTrue(f.copy().complete(1));
3800 +        assertTrue(f.copy().complete(null));
3801 +        assertTrue(f.copy().cancel(true));
3802 +        assertTrue(f.copy().cancel(false));
3803 +        assertTrue(f.copy().completeExceptionally(new CFException()));
3804 +        checkIncomplete(f);
3805      }
3806  
3807      /**
# Line 3586 | Line 3812 | public class CompletableFutureTest exten
3812          CompletableFuture<Integer> f = new CompletableFuture<>();
3813          CompletionStage<Integer> g = f.minimalCompletionStage();
3814          AtomicInteger x = new AtomicInteger(0);
3815 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3815 >        AtomicReference<Throwable> r = new AtomicReference<>();
3816          checkIncomplete(f);
3817          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3818          f.complete(1);
# Line 3603 | Line 3829 | public class CompletableFutureTest exten
3829          CompletableFuture<Integer> f = new CompletableFuture<>();
3830          CompletionStage<Integer> g = f.minimalCompletionStage();
3831          AtomicInteger x = new AtomicInteger(0);
3832 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3832 >        AtomicReference<Throwable> r = new AtomicReference<>();
3833          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3834          checkIncomplete(f);
3835          CFException ex = new CFException();
# Line 3621 | Line 3847 | public class CompletableFutureTest exten
3847          CFException ex = new CFException();
3848          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3849          AtomicInteger x = new AtomicInteger(0);
3850 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3850 >        AtomicReference<Throwable> r = new AtomicReference<>();
3851          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3852          assertEquals(x.get(), 0);
3853          assertEquals(r.get(), ex);
# Line 3645 | Line 3871 | public class CompletableFutureTest exten
3871      public void testCompleteAsync2() {
3872          CompletableFuture<Integer> f = new CompletableFuture<>();
3873          CFException ex = new CFException();
3874 <        f.completeAsync(() -> {if (true) throw ex; return 1;});
3874 >        f.completeAsync(() -> { throw ex; });
3875          try {
3876              f.join();
3877              shouldThrow();
# Line 3675 | Line 3901 | public class CompletableFutureTest exten
3901          CompletableFuture<Integer> f = new CompletableFuture<>();
3902          CFException ex = new CFException();
3903          ThreadExecutor executor = new ThreadExecutor();
3904 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3904 >        f.completeAsync(() -> { throw ex; }, executor);
3905          try {
3906              f.join();
3907              shouldThrow();
# Line 3827 | Line 4053 | public class CompletableFutureTest exten
4053          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4054          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4055  
4056 +        final Runnable noopRunnable = new Noop(m);
4057 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4058 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
4059 +
4060          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4061              = new ArrayList<>();
4062  
4063 <        funs.add((y) -> m.thenRun(y, new Noop(m)));
4064 <        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
4065 <        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
4066 <
4067 <        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
4068 <        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
4069 <        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
4070 <
4071 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
4072 <        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
4073 <        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4074 <        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4075 <        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
4076 <        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
4077 <
4078 <        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4079 <
4080 <        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
4081 <
4082 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
4083 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
4084 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
4085 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
4086 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
4087 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
4063 >        funs.add(y -> m.thenRun(y, noopRunnable));
4064 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4065 >        funs.add(y -> m.thenApply(y, incFunction));
4066 >
4067 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4068 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4069 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4070 >
4071 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4072 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4073 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4074 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4075 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4076 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4077 >
4078 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4079 >
4080 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4081 >
4082 >        funs.add(y -> CompletableFuture.allOf(y));
4083 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4084 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4085 >        funs.add(y -> CompletableFuture.anyOf(y));
4086 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4087 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4088  
4089          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4090                   fun : funs) {
4091              CompletableFuture<Integer> f = new CompletableFuture<>();
4092              f.completeExceptionally(ex);
4093 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4093 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4094              checkCompletedWithWrappedException(src, ex);
4095              CompletableFuture<?> dep = fun.apply(src);
4096              checkCompletedWithWrappedException(dep, ex);
# Line 3870 | Line 4100 | public class CompletableFutureTest exten
4100          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4101                   fun : funs) {
4102              CompletableFuture<Integer> f = new CompletableFuture<>();
4103 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4103 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4104              CompletableFuture<?> dep = fun.apply(src);
4105              f.completeExceptionally(ex);
4106              checkCompletedWithWrappedException(src, ex);
# Line 3884 | Line 4114 | public class CompletableFutureTest exten
4114              CompletableFuture<Integer> f = new CompletableFuture<>();
4115              f.cancel(mayInterruptIfRunning);
4116              checkCancelled(f);
4117 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4117 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4118              checkCompletedWithWrappedCancellationException(src);
4119              CompletableFuture<?> dep = fun.apply(src);
4120              checkCompletedWithWrappedCancellationException(dep);
# Line 3895 | Line 4125 | public class CompletableFutureTest exten
4125          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4126                   fun : funs) {
4127              CompletableFuture<Integer> f = new CompletableFuture<>();
4128 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4128 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4129              CompletableFuture<?> dep = fun.apply(src);
4130              f.cancel(mayInterruptIfRunning);
4131              checkCancelled(f);
# Line 3906 | Line 4136 | public class CompletableFutureTest exten
4136      }}
4137  
4138      /**
4139 <     * Minimal completion stages throw UOE for all non-CompletionStage methods
4139 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
4140       */
4141      public void testMinimalCompletionStage_minimality() {
4142          if (!testImplementationDetails) return;
4143          Function<Method, String> toSignature =
4144 <            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
4144 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4145          Predicate<Method> isNotStatic =
4146 <            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
4146 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4147          List<Method> minimalMethods =
4148              Stream.of(Object.class, CompletionStage.class)
4149 <            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
4149 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4150              .filter(isNotStatic)
4151              .collect(Collectors.toList());
4152          // Methods from CompletableFuture permitted NOT to throw UOE
# Line 3932 | Line 4162 | public class CompletableFutureTest exten
4162              .collect(Collectors.toSet());
4163          List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4164              .filter(isNotStatic)
4165 <            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4165 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4166              .collect(Collectors.toList());
4167  
4168 <        CompletionStage<Integer> minimalStage =
4168 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4169 >        CompletionStage<Integer> min =
4170              new CompletableFuture<Integer>().minimalCompletionStage();
4171 +        stages.add(min);
4172 +        stages.add(min.thenApply(x -> x));
4173 +        stages.add(CompletableFuture.completedStage(1));
4174 +        stages.add(CompletableFuture.failedStage(new CFException()));
4175  
4176          List<Method> bugs = new ArrayList<>();
4177          for (Method method : allMethods) {
# Line 3945 | Line 4180 | public class CompletableFutureTest exten
4180              // Manufacture boxed primitives for primitive params
4181              for (int i = 0; i < args.length; i++) {
4182                  Class<?> type = parameterTypes[i];
4183 <                if (parameterTypes[i] == boolean.class)
4184 <                    args[i] = false;
4185 <                else if (parameterTypes[i] == int.class)
3951 <                    args[i] = 0;
3952 <                else if (parameterTypes[i] == long.class)
3953 <                    args[i] = 0L;
4183 >                if      (type == boolean.class) args[i] = false;
4184 >                else if (type == int.class)     args[i] = 0;
4185 >                else if (type == long.class)    args[i] = 0L;
4186              }
4187 <            try {
4188 <                method.invoke(minimalStage, args);
4189 <                bugs.add(method);
3958 <            }
3959 <            catch (java.lang.reflect.InvocationTargetException expected) {
3960 <                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4187 >            for (CompletionStage<Integer> stage : stages) {
4188 >                try {
4189 >                    method.invoke(stage, args);
4190                      bugs.add(method);
3962                    // expected.getCause().printStackTrace();
4191                  }
4192 +                catch (java.lang.reflect.InvocationTargetException expected) {
4193 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4194 +                        bugs.add(method);
4195 +                        // expected.getCause().printStackTrace();
4196 +                    }
4197 +                }
4198 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4199              }
3965            catch (ReflectiveOperationException bad) { throw new Error(bad); }
4200          }
4201          if (!bugs.isEmpty())
4202 <            throw new Error("Methods did not throw UOE: " + bugs.toString());
4202 >            throw new Error("Methods did not throw UOE: " + bugs);
4203 >    }
4204 >
4205 >    /**
4206 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4207 >     * is completed normally, with the same value, when source is.
4208 >     */
4209 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4210 >        for (boolean createIncomplete : new boolean[] { true, false })
4211 >        for (Integer v1 : new Integer[] { 1, null })
4212 >    {
4213 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4214 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4215 >        if (!createIncomplete) assertTrue(f.complete(v1));
4216 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4217 >        if (createIncomplete) {
4218 >            checkIncomplete(f);
4219 >            checkIncomplete(g);
4220 >            assertTrue(f.complete(v1));
4221 >        }
4222 >        checkCompletedNormally(f, v1);
4223 >        checkCompletedNormally(g, v1);
4224 >    }}
4225 >
4226 >    /**
4227 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4228 >     * is completed exceptionally when source is.
4229 >     */
4230 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4231 >        for (boolean createIncomplete : new boolean[] { true, false })
4232 >    {
4233 >        CFException ex = new CFException();
4234 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4235 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4236 >        if (!createIncomplete) f.completeExceptionally(ex);
4237 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4238 >        if (createIncomplete) {
4239 >            checkIncomplete(f);
4240 >            checkIncomplete(g);
4241 >            f.completeExceptionally(ex);
4242 >        }
4243 >        checkCompletedExceptionally(f, ex);
4244 >        checkCompletedWithWrappedException(g, ex);
4245 >    }}
4246 >
4247 >    /**
4248 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4249 >     */
4250 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4251 >        for (Integer v1 : new Integer[] { 1, null })
4252 >    {
4253 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4254 >        CompletionStage minimal = f.minimalCompletionStage();
4255 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4256 >        assertTrue(g.complete(v1));
4257 >        checkCompletedNormally(g, v1);
4258 >        checkIncomplete(f);
4259 >        checkIncomplete(minimal.toCompletableFuture());
4260 >    }}
4261 >
4262 >    /**
4263 >     * minimalStage.toCompletableFuture().join() awaits completion
4264 >     */
4265 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4266 >        for (boolean createIncomplete : new boolean[] { true, false })
4267 >        for (Integer v1 : new Integer[] { 1, null })
4268 >    {
4269 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4270 >        if (!createIncomplete) assertTrue(f.complete(v1));
4271 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4272 >        if (createIncomplete) assertTrue(f.complete(v1));
4273 >        assertEquals(v1, minimal.toCompletableFuture().join());
4274 >        assertEquals(v1, minimal.toCompletableFuture().get());
4275 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4276 >    }}
4277 >
4278 >    /**
4279 >     * Completion of a toCompletableFuture copy of a minimal stage
4280 >     * does not complete its source.
4281 >     */
4282 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4283 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4284 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4285 >        assertTrue(g.toCompletableFuture().complete(1));
4286 >        assertTrue(g.toCompletableFuture().complete(null));
4287 >        assertTrue(g.toCompletableFuture().cancel(true));
4288 >        assertTrue(g.toCompletableFuture().cancel(false));
4289 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4290 >        checkIncomplete(g.toCompletableFuture());
4291 >        f.complete(1);
4292 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4293 >    }
4294 >
4295 >    /** Demo utility method for external reliable toCompletableFuture */
4296 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4297 >        CompletableFuture<T> f = new CompletableFuture<>();
4298 >        stage.handle((T t, Throwable ex) -> {
4299 >                         if (ex != null) f.completeExceptionally(ex);
4300 >                         else f.complete(t);
4301 >                         return null;
4302 >                     });
4303 >        return f;
4304 >    }
4305 >
4306 >    /** Demo utility method to join a CompletionStage */
4307 >    static <T> T join(CompletionStage<T> stage) {
4308 >        return toCompletableFuture(stage).join();
4309      }
4310  
4311 +    /**
4312 +     * Joining a minimal stage "by hand" works
4313 +     */
4314 +    public void testMinimalCompletionStage_join_by_hand() {
4315 +        for (boolean createIncomplete : new boolean[] { true, false })
4316 +        for (Integer v1 : new Integer[] { 1, null })
4317 +    {
4318 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4319 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4320 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4321 +        if (!createIncomplete) assertTrue(f.complete(v1));
4322 +        minimal.thenAccept(x -> g.complete(x));
4323 +        if (createIncomplete) assertTrue(f.complete(v1));
4324 +        g.join();
4325 +        checkCompletedNormally(g, v1);
4326 +        checkCompletedNormally(f, v1);
4327 +        assertEquals(v1, join(minimal));
4328 +    }}
4329 +
4330      static class Monad {
4331          static class ZeroException extends RuntimeException {
4332              public ZeroException() { super("monadic zero"); }
# Line 3984 | Line 4343 | public class CompletableFutureTest exten
4343          static <T,U,V> Function<T, CompletableFuture<V>> compose
4344              (Function<T, CompletableFuture<U>> f,
4345               Function<U, CompletableFuture<V>> g) {
4346 <            return (x) -> f.apply(x).thenCompose(g);
4346 >            return x -> f.apply(x).thenCompose(g);
4347          }
4348  
4349          static void assertZero(CompletableFuture<?> f) {
4350              try {
4351                  f.getNow(null);
4352 <                throw new AssertionFailedError("should throw");
4352 >                throw new AssertionError("should throw");
4353              } catch (CompletionException success) {
4354                  assertTrue(success.getCause() instanceof ZeroException);
4355              }
# Line 4064 | Line 4423 | public class CompletableFutureTest exten
4423  
4424          // Some mutually non-commutative functions
4425          Function<Long, CompletableFuture<Long>> triple
4426 <            = (x) -> Monad.unit(3 * x);
4426 >            = x -> Monad.unit(3 * x);
4427          Function<Long, CompletableFuture<Long>> inc
4428 <            = (x) -> Monad.unit(x + 1);
4428 >            = x -> Monad.unit(x + 1);
4429  
4430          // unit is a right identity: m >>= unit === m
4431          Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
# Line 4078 | Line 4437 | public class CompletableFutureTest exten
4437          // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4438          Monad.assertFutureEquals(
4439              unit.apply(5L).thenCompose(inc).thenCompose(triple),
4440 <            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4440 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4441  
4442          // The case for CompletableFuture as an additive monad is weaker...
4443  
# Line 4088 | Line 4447 | public class CompletableFutureTest exten
4447          // left zero: zero >>= f === zero
4448          Monad.assertZero(zero.thenCompose(inc));
4449          // right zero: f >>= (\x -> zero) === zero
4450 <        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4450 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4451  
4452          // f plus zero === f
4453          Monad.assertFutureEquals(Monad.unit(5L),
# Line 4114 | Line 4473 | public class CompletableFutureTest exten
4473                                   Monad.plus(godot, Monad.unit(5L)));
4474      }
4475  
4476 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4477 +    @SuppressWarnings("FutureReturnValueIgnored")
4478 +    public void testRecursiveChains() throws Throwable {
4479 +        for (ExecutionMode m : ExecutionMode.values())
4480 +        for (boolean addDeadEnds : new boolean[] { true, false })
4481 +    {
4482 +        final int val = 42;
4483 +        final int n = expensiveTests ? 1_000 : 2;
4484 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4485 +        CompletableFuture<Integer> tail = head;
4486 +        for (int i = 0; i < n; i++) {
4487 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4488 +            tail = m.thenApply(tail, v -> v + 1);
4489 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4490 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4491 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4492 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4493 +        }
4494 +        head.complete(val);
4495 +        assertEquals(val + 3 * n, (int) tail.join());
4496 +    }}
4497 +
4498      /**
4499       * A single CompletableFuture with many dependents.
4500       * A demo of scalability - runtime is O(n).
4501       */
4502 +    @SuppressWarnings("FutureReturnValueIgnored")
4503      public void testManyDependents() throws Throwable {
4504 <        final int n = 1_000;
4504 >        final int n = expensiveTests ? 1_000_000 : 10;
4505          final CompletableFuture<Void> head = new CompletableFuture<>();
4506          final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4507          final AtomicInteger count = new AtomicInteger(0);
4508          for (int i = 0; i < n; i++) {
4509              head.thenRun(() -> count.getAndIncrement());
4510 <            head.thenAccept((x) -> count.getAndIncrement());
4511 <            head.thenApply((x) -> count.getAndIncrement());
4510 >            head.thenAccept(x -> count.getAndIncrement());
4511 >            head.thenApply(x -> count.getAndIncrement());
4512  
4513              head.runAfterBoth(complete, () -> count.getAndIncrement());
4514              head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
# Line 4136 | Line 4518 | public class CompletableFutureTest exten
4518              complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4519  
4520              head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4521 <            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4522 <            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4521 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4522 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4523              new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4524 <            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4525 <            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4524 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4525 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4526          }
4527          head.complete(null);
4528          assertEquals(5 * 3 * n, count.get());
4529      }
4530  
4531 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4532 +    @SuppressWarnings("FutureReturnValueIgnored")
4533 +    public void testCoCompletionGarbageRetention() throws Throwable {
4534 +        final int n = expensiveTests ? 1_000_000 : 10;
4535 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4536 +        CompletableFuture<Integer> f;
4537 +        for (int i = 0; i < n; i++) {
4538 +            f = new CompletableFuture<>();
4539 +            f.runAfterEither(incomplete, () -> {});
4540 +            f.complete(null);
4541 +
4542 +            f = new CompletableFuture<>();
4543 +            f.acceptEither(incomplete, x -> {});
4544 +            f.complete(null);
4545 +
4546 +            f = new CompletableFuture<>();
4547 +            f.applyToEither(incomplete, x -> x);
4548 +            f.complete(null);
4549 +
4550 +            f = new CompletableFuture<>();
4551 +            CompletableFuture.anyOf(f, incomplete);
4552 +            f.complete(null);
4553 +        }
4554 +
4555 +        for (int i = 0; i < n; i++) {
4556 +            f = new CompletableFuture<>();
4557 +            incomplete.runAfterEither(f, () -> {});
4558 +            f.complete(null);
4559 +
4560 +            f = new CompletableFuture<>();
4561 +            incomplete.acceptEither(f, x -> {});
4562 +            f.complete(null);
4563 +
4564 +            f = new CompletableFuture<>();
4565 +            incomplete.applyToEither(f, x -> x);
4566 +            f.complete(null);
4567 +
4568 +            f = new CompletableFuture<>();
4569 +            CompletableFuture.anyOf(incomplete, f);
4570 +            f.complete(null);
4571 +        }
4572 +    }
4573 +
4574 +    /**
4575 +     * Reproduction recipe for:
4576 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4577 +     * cvs update -D '2016-05-01' ./src/main/java/util/concurrent/CompletableFuture.java && ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testAnyOfGarbageRetention tck; cvs update -A
4578 +     */
4579 +    public void testAnyOfGarbageRetention() throws Throwable {
4580 +        for (Integer v : new Integer[] { 1, null })
4581 +    {
4582 +        final int n = expensiveTests ? 100_000 : 10;
4583 +        CompletableFuture<Integer>[] fs
4584 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4585 +        for (int i = 0; i < fs.length; i++)
4586 +            fs[i] = new CompletableFuture<>();
4587 +        fs[fs.length - 1].complete(v);
4588 +        for (int i = 0; i < n; i++)
4589 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4590 +    }}
4591 +
4592 +    /**
4593 +     * Checks for garbage retention with allOf.
4594 +     *
4595 +     * As of 2016-07, fails with OOME:
4596 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4597 +     */
4598 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4599 +        final int n = expensiveTests ? 100_000 : 10;
4600 +        CompletableFuture<Integer>[] fs
4601 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4602 +        for (int i = 0; i < fs.length; i++)
4603 +            fs[i] = new CompletableFuture<>();
4604 +        for (int i = 0; i < n; i++)
4605 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4606 +    }
4607 +
4608 +    /**
4609 +     * Checks for garbage retention when a dependent future is
4610 +     * cancelled and garbage-collected.
4611 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4612 +     *
4613 +     * As of 2016-07, fails with OOME:
4614 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4615 +     */
4616 +    public void testCancelledGarbageRetention() throws Throwable {
4617 +        final int n = expensiveTests ? 100_000 : 10;
4618 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4619 +        for (int i = 0; i < n; i++)
4620 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4621 +    }
4622 +
4623 +    /**
4624 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4625 +     * is invoked many times.
4626 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4627 +     *
4628 +     * As of 2016-07, fails with OOME:
4629 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4630 +     */
4631 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4632 +        final int n = expensiveTests ? 900_000 : 10;
4633 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4634 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4635 +        for (int i = 0; i < n; i++)
4636 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4637 +    }
4638 +
4639   //     static <U> U join(CompletionStage<U> stage) {
4640   //         CompletableFuture<U> f = new CompletableFuture<>();
4641   //         stage.whenComplete((v, ex) -> {
# Line 4170 | Line 4660 | public class CompletableFutureTest exten
4660   //         return stage.toCompletableFuture().copy().isDone();
4661   //     }
4662  
4663 +    // For testing default implementations
4664 +    // Only non-default interface methods defined.
4665 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4666 +        final CompletableFuture<T> cf;
4667 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4668 +        public CompletableFuture<T> toCompletableFuture() {
4669 +            return cf; }
4670 +        public CompletionStage<Void> thenRun
4671 +            (Runnable action) {
4672 +            return cf.thenRun(action); }
4673 +        public CompletionStage<Void> thenRunAsync
4674 +            (Runnable action) {
4675 +            return cf.thenRunAsync(action); }
4676 +        public CompletionStage<Void> thenRunAsync
4677 +            (Runnable action,
4678 +             Executor executor) {
4679 +            return cf.thenRunAsync(action, executor); }
4680 +        public CompletionStage<Void> thenAccept
4681 +            (Consumer<? super T> action) {
4682 +            return cf.thenAccept(action); }
4683 +        public CompletionStage<Void> thenAcceptAsync
4684 +            (Consumer<? super T> action) {
4685 +            return cf.thenAcceptAsync(action); }
4686 +        public CompletionStage<Void> thenAcceptAsync
4687 +            (Consumer<? super T> action,
4688 +             Executor executor) {
4689 +            return cf.thenAcceptAsync(action, executor); }
4690 +        public <U> CompletionStage<U> thenApply
4691 +            (Function<? super T,? extends U> a) {
4692 +            return cf.thenApply(a); }
4693 +        public <U> CompletionStage<U> thenApplyAsync
4694 +            (Function<? super T,? extends U> fn) {
4695 +            return cf.thenApplyAsync(fn); }
4696 +        public <U> CompletionStage<U> thenApplyAsync
4697 +            (Function<? super T,? extends U> fn,
4698 +             Executor executor) {
4699 +            return cf.thenApplyAsync(fn, executor); }
4700 +        public <U,V> CompletionStage<V> thenCombine
4701 +            (CompletionStage<? extends U> other,
4702 +             BiFunction<? super T,? super U,? extends V> fn) {
4703 +            return cf.thenCombine(other, fn); }
4704 +        public <U,V> CompletionStage<V> thenCombineAsync
4705 +            (CompletionStage<? extends U> other,
4706 +             BiFunction<? super T,? super U,? extends V> fn) {
4707 +            return cf.thenCombineAsync(other, fn); }
4708 +        public <U,V> CompletionStage<V> thenCombineAsync
4709 +            (CompletionStage<? extends U> other,
4710 +             BiFunction<? super T,? super U,? extends V> fn,
4711 +             Executor executor) {
4712 +            return cf.thenCombineAsync(other, fn, executor); }
4713 +        public <U> CompletionStage<Void> thenAcceptBoth
4714 +            (CompletionStage<? extends U> other,
4715 +             BiConsumer<? super T, ? super U> action) {
4716 +            return cf.thenAcceptBoth(other, action); }
4717 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4718 +            (CompletionStage<? extends U> other,
4719 +             BiConsumer<? super T, ? super U> action) {
4720 +            return cf.thenAcceptBothAsync(other, action); }
4721 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4722 +            (CompletionStage<? extends U> other,
4723 +             BiConsumer<? super T, ? super U> action,
4724 +             Executor executor) {
4725 +            return cf.thenAcceptBothAsync(other, action, executor); }
4726 +        public CompletionStage<Void> runAfterBoth
4727 +            (CompletionStage<?> other,
4728 +             Runnable action) {
4729 +            return cf.runAfterBoth(other, action); }
4730 +        public CompletionStage<Void> runAfterBothAsync
4731 +            (CompletionStage<?> other,
4732 +             Runnable action) {
4733 +            return cf.runAfterBothAsync(other, action); }
4734 +        public CompletionStage<Void> runAfterBothAsync
4735 +            (CompletionStage<?> other,
4736 +             Runnable action,
4737 +             Executor executor) {
4738 +            return cf.runAfterBothAsync(other, action, executor); }
4739 +        public <U> CompletionStage<U> applyToEither
4740 +            (CompletionStage<? extends T> other,
4741 +             Function<? super T, U> fn) {
4742 +            return cf.applyToEither(other, fn); }
4743 +        public <U> CompletionStage<U> applyToEitherAsync
4744 +            (CompletionStage<? extends T> other,
4745 +             Function<? super T, U> fn) {
4746 +            return cf.applyToEitherAsync(other, fn); }
4747 +        public <U> CompletionStage<U> applyToEitherAsync
4748 +            (CompletionStage<? extends T> other,
4749 +             Function<? super T, U> fn,
4750 +             Executor executor) {
4751 +            return cf.applyToEitherAsync(other, fn, executor); }
4752 +        public CompletionStage<Void> acceptEither
4753 +            (CompletionStage<? extends T> other,
4754 +             Consumer<? super T> action) {
4755 +            return cf.acceptEither(other, action); }
4756 +        public CompletionStage<Void> acceptEitherAsync
4757 +            (CompletionStage<? extends T> other,
4758 +             Consumer<? super T> action) {
4759 +            return cf.acceptEitherAsync(other, action); }
4760 +        public CompletionStage<Void> acceptEitherAsync
4761 +            (CompletionStage<? extends T> other,
4762 +             Consumer<? super T> action,
4763 +             Executor executor) {
4764 +            return cf.acceptEitherAsync(other, action, executor); }
4765 +        public CompletionStage<Void> runAfterEither
4766 +            (CompletionStage<?> other,
4767 +             Runnable action) {
4768 +            return cf.runAfterEither(other, action); }
4769 +        public CompletionStage<Void> runAfterEitherAsync
4770 +            (CompletionStage<?> other,
4771 +             Runnable action) {
4772 +            return cf.runAfterEitherAsync(other, action); }
4773 +        public CompletionStage<Void> runAfterEitherAsync
4774 +            (CompletionStage<?> other,
4775 +             Runnable action,
4776 +             Executor executor) {
4777 +            return cf.runAfterEitherAsync(other, action, executor); }
4778 +        public <U> CompletionStage<U> thenCompose
4779 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4780 +            return cf.thenCompose(fn); }
4781 +        public <U> CompletionStage<U> thenComposeAsync
4782 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4783 +            return cf.thenComposeAsync(fn); }
4784 +        public <U> CompletionStage<U> thenComposeAsync
4785 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4786 +             Executor executor) {
4787 +            return cf.thenComposeAsync(fn, executor); }
4788 +        public <U> CompletionStage<U> handle
4789 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4790 +            return cf.handle(fn); }
4791 +        public <U> CompletionStage<U> handleAsync
4792 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4793 +            return cf.handleAsync(fn); }
4794 +        public <U> CompletionStage<U> handleAsync
4795 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4796 +             Executor executor) {
4797 +            return cf.handleAsync(fn, executor); }
4798 +        public CompletionStage<T> whenComplete
4799 +            (BiConsumer<? super T, ? super Throwable> action) {
4800 +            return cf.whenComplete(action); }
4801 +        public CompletionStage<T> whenCompleteAsync
4802 +            (BiConsumer<? super T, ? super Throwable> action) {
4803 +            return cf.whenCompleteAsync(action); }
4804 +        public CompletionStage<T> whenCompleteAsync
4805 +            (BiConsumer<? super T, ? super Throwable> action,
4806 +             Executor executor) {
4807 +            return cf.whenCompleteAsync(action, executor); }
4808 +        public CompletionStage<T> exceptionally
4809 +            (Function<Throwable, ? extends T> fn) {
4810 +            return cf.exceptionally(fn); }
4811 +    }
4812 +
4813 +    /**
4814 +     * default-implemented exceptionallyAsync action is not invoked when
4815 +     * source completes normally, and source result is propagated
4816 +     */
4817 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4818 +        for (boolean createIncomplete : new boolean[] { true, false })
4819 +        for (Integer v1 : new Integer[] { 1, null })
4820 +    {
4821 +        final AtomicInteger ran = new AtomicInteger(0);
4822 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4823 +        final DelegatedCompletionStage<Integer> d =
4824 +            new DelegatedCompletionStage<Integer>(f);
4825 +        if (!createIncomplete) assertTrue(f.complete(v1));
4826 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4827 +            ((Throwable t) -> {
4828 +                ran.getAndIncrement();
4829 +                throw new AssertionError("should not be called");
4830 +            });
4831 +        if (createIncomplete) assertTrue(f.complete(v1));
4832 +
4833 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4834 +        checkCompletedNormally(f, v1);
4835 +        assertEquals(0, ran.get());
4836 +    }}
4837 +
4838 +    /**
4839 +     * default-implemented exceptionallyAsync action completes with
4840 +     * function value on source exception
4841 +     */
4842 +    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4843 +        for (boolean createIncomplete : new boolean[] { true, false })
4844 +        for (Integer v1 : new Integer[] { 1, null })
4845 +    {
4846 +        final AtomicInteger ran = new AtomicInteger(0);
4847 +        final CFException ex = new CFException();
4848 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4849 +        final DelegatedCompletionStage<Integer> d =
4850 +            new DelegatedCompletionStage<Integer>(f);
4851 +        if (!createIncomplete) f.completeExceptionally(ex);
4852 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4853 +            ((Throwable t) -> {
4854 +                assertSame(t, ex);
4855 +                ran.getAndIncrement();
4856 +                return v1;
4857 +            });
4858 +        if (createIncomplete) f.completeExceptionally(ex);
4859 +
4860 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4861 +        checkCompletedExceptionally(f, ex);
4862 +        assertEquals(1, ran.get());
4863 +    }}
4864 +
4865 +    /**
4866 +     * Under default implementation, if an "exceptionally action"
4867 +     * throws an exception, it completes exceptionally with that
4868 +     * exception
4869 +     */
4870 +    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4871 +        for (boolean createIncomplete : new boolean[] { true, false })
4872 +    {
4873 +        final AtomicInteger ran = new AtomicInteger(0);
4874 +        final CFException ex1 = new CFException();
4875 +        final CFException ex2 = new CFException();
4876 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4877 +        final DelegatedCompletionStage<Integer> d =
4878 +            new DelegatedCompletionStage<Integer>(f);
4879 +        if (!createIncomplete) f.completeExceptionally(ex1);
4880 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4881 +            ((Throwable t) -> {
4882 +                assertSame(t, ex1);
4883 +                ran.getAndIncrement();
4884 +                throw ex2;
4885 +            });
4886 +        if (createIncomplete) f.completeExceptionally(ex1);
4887 +
4888 +        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4889 +        checkCompletedExceptionally(f, ex1);
4890 +        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4891 +        assertEquals(1, ran.get());
4892 +    }}
4893 +
4894 +    /**
4895 +     * default-implemented exceptionallyCompose result completes
4896 +     * normally after normal completion of source
4897 +     */
4898 +    public void testDefaultExceptionallyCompose_normalCompletion() {
4899 +        for (boolean createIncomplete : new boolean[] { true, false })
4900 +        for (Integer v1 : new Integer[] { 1, null })
4901 +    {
4902 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4903 +        final ExceptionalCompletableFutureFunction r =
4904 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4905 +        final DelegatedCompletionStage<Integer> d =
4906 +            new DelegatedCompletionStage<Integer>(f);
4907 +        if (!createIncomplete) assertTrue(f.complete(v1));
4908 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4909 +        if (createIncomplete) assertTrue(f.complete(v1));
4910 +
4911 +        checkCompletedNormally(f, v1);
4912 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4913 +        r.assertNotInvoked();
4914 +    }}
4915 +
4916 +    /**
4917 +     * default-implemented exceptionallyCompose result completes
4918 +     * normally after exceptional completion of source
4919 +     */
4920 +    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4921 +        for (boolean createIncomplete : new boolean[] { true, false })
4922 +    {
4923 +        final CFException ex = new CFException();
4924 +        final ExceptionalCompletableFutureFunction r =
4925 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4926 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4927 +        final DelegatedCompletionStage<Integer> d =
4928 +            new DelegatedCompletionStage<Integer>(f);
4929 +        if (!createIncomplete) f.completeExceptionally(ex);
4930 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4931 +        if (createIncomplete) f.completeExceptionally(ex);
4932 +
4933 +        checkCompletedExceptionally(f, ex);
4934 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4935 +        r.assertInvoked();
4936 +    }}
4937 +
4938 +    /**
4939 +     * default-implemented exceptionallyCompose completes
4940 +     * exceptionally on exception if action does
4941 +     */
4942 +    public void testDefaultExceptionallyCompose_actionFailed() {
4943 +        for (boolean createIncomplete : new boolean[] { true, false })
4944 +    {
4945 +        final CFException ex = new CFException();
4946 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4947 +        final FailingExceptionalCompletableFutureFunction r
4948 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4949 +        final DelegatedCompletionStage<Integer> d =
4950 +            new DelegatedCompletionStage<Integer>(f);
4951 +        if (!createIncomplete) f.completeExceptionally(ex);
4952 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4953 +        if (createIncomplete) f.completeExceptionally(ex);
4954 +
4955 +        checkCompletedExceptionally(f, ex);
4956 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4957 +        r.assertInvoked();
4958 +    }}
4959 +
4960 +    /**
4961 +     * default-implemented exceptionallyComposeAsync result completes
4962 +     * normally after normal completion of source
4963 +     */
4964 +    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4965 +        for (boolean createIncomplete : new boolean[] { true, false })
4966 +        for (Integer v1 : new Integer[] { 1, null })
4967 +    {
4968 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4969 +        final ExceptionalCompletableFutureFunction r =
4970 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4971 +        final DelegatedCompletionStage<Integer> d =
4972 +            new DelegatedCompletionStage<Integer>(f);
4973 +        if (!createIncomplete) assertTrue(f.complete(v1));
4974 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4975 +        if (createIncomplete) assertTrue(f.complete(v1));
4976 +
4977 +        checkCompletedNormally(f, v1);
4978 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4979 +        r.assertNotInvoked();
4980 +    }}
4981 +
4982 +    /**
4983 +     * default-implemented exceptionallyComposeAsync result completes
4984 +     * normally after exceptional completion of source
4985 +     */
4986 +    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
4987 +        for (boolean createIncomplete : new boolean[] { true, false })
4988 +    {
4989 +        final CFException ex = new CFException();
4990 +        final ExceptionalCompletableFutureFunction r =
4991 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4992 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4993 +        final DelegatedCompletionStage<Integer> d =
4994 +            new DelegatedCompletionStage<Integer>(f);
4995 +        if (!createIncomplete) f.completeExceptionally(ex);
4996 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4997 +        if (createIncomplete) f.completeExceptionally(ex);
4998 +
4999 +        checkCompletedExceptionally(f, ex);
5000 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5001 +        r.assertInvoked();
5002 +    }}
5003 +
5004 +    /**
5005 +     * default-implemented exceptionallyComposeAsync completes
5006 +     * exceptionally on exception if action does
5007 +     */
5008 +    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5009 +        for (boolean createIncomplete : new boolean[] { true, false })
5010 +    {
5011 +        final CFException ex = new CFException();
5012 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5013 +        final FailingExceptionalCompletableFutureFunction r
5014 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5015 +        final DelegatedCompletionStage<Integer> d =
5016 +            new DelegatedCompletionStage<Integer>(f);
5017 +        if (!createIncomplete) f.completeExceptionally(ex);
5018 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5019 +        if (createIncomplete) f.completeExceptionally(ex);
5020 +
5021 +        checkCompletedExceptionally(f, ex);
5022 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5023 +        r.assertInvoked();
5024 +    }}
5025 +
5026 +    /**
5027 +     * default-implemented exceptionallyComposeAsync result completes
5028 +     * normally after normal completion of source
5029 +     */
5030 +    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5031 +        for (boolean createIncomplete : new boolean[] { true, false })
5032 +        for (Integer v1 : new Integer[] { 1, null })
5033 +    {
5034 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5035 +        final ExceptionalCompletableFutureFunction r =
5036 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5037 +        final DelegatedCompletionStage<Integer> d =
5038 +            new DelegatedCompletionStage<Integer>(f);
5039 +        if (!createIncomplete) assertTrue(f.complete(v1));
5040 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5041 +        if (createIncomplete) assertTrue(f.complete(v1));
5042 +
5043 +        checkCompletedNormally(f, v1);
5044 +        checkCompletedNormally(g.toCompletableFuture(), v1);
5045 +        r.assertNotInvoked();
5046 +    }}
5047 +
5048 +    /**
5049 +     * default-implemented exceptionallyComposeAsync result completes
5050 +     * normally after exceptional completion of source
5051 +     */
5052 +    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5053 +        for (boolean createIncomplete : new boolean[] { true, false })
5054 +    {
5055 +        final CFException ex = new CFException();
5056 +        final ExceptionalCompletableFutureFunction r =
5057 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5058 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5059 +        final DelegatedCompletionStage<Integer> d =
5060 +            new DelegatedCompletionStage<Integer>(f);
5061 +        if (!createIncomplete) f.completeExceptionally(ex);
5062 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5063 +        if (createIncomplete) f.completeExceptionally(ex);
5064 +
5065 +        checkCompletedExceptionally(f, ex);
5066 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5067 +        r.assertInvoked();
5068 +    }}
5069 +
5070 +    /**
5071 +     * default-implemented exceptionallyComposeAsync completes
5072 +     * exceptionally on exception if action does
5073 +     */
5074 +    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5075 +        for (boolean createIncomplete : new boolean[] { true, false })
5076 +    {
5077 +        final CFException ex = new CFException();
5078 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5079 +        final FailingExceptionalCompletableFutureFunction r
5080 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5081 +        final DelegatedCompletionStage<Integer> d =
5082 +            new DelegatedCompletionStage<Integer>(f);
5083 +        if (!createIncomplete) f.completeExceptionally(ex);
5084 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5085 +        if (createIncomplete) f.completeExceptionally(ex);
5086 +
5087 +        checkCompletedExceptionally(f, ex);
5088 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5089 +        r.assertInvoked();
5090 +    }}
5091 +
5092   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines