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.163 by jsr166, Sun Jul 3 18:33:17 2016 UTC vs.
Revision 1.221 by jsr166, Fri Feb 22 19:27:47 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<>();
536 <            assertTrue(f.complete(inc(x)));
537 <            return f;
554 >            return CompletableFuture.completedFuture(inc(x));
555          }
556      }
557  
558 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
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 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
580          implements Function<Integer, CompletableFuture<Integer>>
581      {
582          final CFException ex;
# Line 653 | 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          },
657
704          ASYNC {
705              public void checkExecutionMode() {
706                  assertEquals(defaultExecutorIsCommonPool,
# Line 727 | 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 800 | 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 842 | 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 849 | 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");
862 <                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 873 | 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 898 | 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 928 | 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 954 | 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 962 | 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 982 | 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 1009 | 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 1017 | 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 1038 | 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 1048 | 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 1061 | 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 1074 | 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 1102 | 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 1132 | 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 1160 | 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 1188 | 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 1198 | 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 1243 | 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 {
# Line 1289 | 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 {
# Line 2563 | 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 2823 | 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 3041 | 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 3076 | 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 3239 | 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 3258 | 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 3298 | 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 3348 | Line 3543 | public class CompletableFutureTest exten
3543              () -> f.completeOnTimeout(42, 1L, null),
3544  
3545              () -> CompletableFuture.failedFuture(null),
3546 <            () -> CompletableFuture.failedStage(null),
3352 <        };
3546 >            () -> CompletableFuture.failedStage(null));
3547  
3354        assertThrows(NullPointerException.class, throwingActions);
3548          assertEquals(0, exec.count.get());
3549      }
3550  
# Line 3375 | 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 3419 | 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 3454 | Line 3647 | public class CompletableFutureTest exten
3647          final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3648          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3649  
3457        List<CompletableFuture<?>> futures = new ArrayList<>();
3458
3459        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3460        srcs.add(complete);
3461        srcs.add(incomplete);
3462
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 3533 | 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 3578 | Line 3765 | public class CompletableFutureTest exten
3765       * copy returns a CompletableFuture that is completed normally,
3766       * with the same value, when source is.
3767       */
3768 <    public void testCopy() {
3768 >    public void testCopy_normalCompletion() {
3769 >        for (boolean createIncomplete : new boolean[] { true, false })
3770 >        for (Integer v1 : new Integer[] { 1, null })
3771 >    {
3772          CompletableFuture<Integer> f = new CompletableFuture<>();
3773 +        if (!createIncomplete) assertTrue(f.complete(v1));
3774          CompletableFuture<Integer> g = f.copy();
3775 <        checkIncomplete(f);
3776 <        checkIncomplete(g);
3777 <        f.complete(1);
3778 <        checkCompletedNormally(f, 1);
3779 <        checkCompletedNormally(g, 1);
3780 <    }
3775 >        if (createIncomplete) {
3776 >            checkIncomplete(f);
3777 >            checkIncomplete(g);
3778 >            assertTrue(f.complete(v1));
3779 >        }
3780 >        checkCompletedNormally(f, v1);
3781 >        checkCompletedNormally(g, v1);
3782 >    }}
3783  
3784      /**
3785       * copy returns a CompletableFuture that is completed exceptionally
3786       * when source is.
3787       */
3788 <    public void testCopy2() {
3788 >    public void testCopy_exceptionalCompletion() {
3789 >        for (boolean createIncomplete : new boolean[] { true, false })
3790 >    {
3791 >        CFException ex = new CFException();
3792          CompletableFuture<Integer> f = new CompletableFuture<>();
3793 +        if (!createIncomplete) f.completeExceptionally(ex);
3794          CompletableFuture<Integer> g = f.copy();
3795 <        checkIncomplete(f);
3796 <        checkIncomplete(g);
3797 <        CFException ex = new CFException();
3798 <        f.completeExceptionally(ex);
3795 >        if (createIncomplete) {
3796 >            checkIncomplete(f);
3797 >            checkIncomplete(g);
3798 >            f.completeExceptionally(ex);
3799 >        }
3800          checkCompletedExceptionally(f, ex);
3801          checkCompletedWithWrappedException(g, ex);
3802 +    }}
3803 +
3804 +    /**
3805 +     * Completion of a copy does not complete its source.
3806 +     */
3807 +    public void testCopy_oneWayPropagation() {
3808 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3809 +        assertTrue(f.copy().complete(1));
3810 +        assertTrue(f.copy().complete(null));
3811 +        assertTrue(f.copy().cancel(true));
3812 +        assertTrue(f.copy().cancel(false));
3813 +        assertTrue(f.copy().completeExceptionally(new CFException()));
3814 +        checkIncomplete(f);
3815      }
3816  
3817      /**
# Line 3611 | Line 3822 | public class CompletableFutureTest exten
3822          CompletableFuture<Integer> f = new CompletableFuture<>();
3823          CompletionStage<Integer> g = f.minimalCompletionStage();
3824          AtomicInteger x = new AtomicInteger(0);
3825 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3825 >        AtomicReference<Throwable> r = new AtomicReference<>();
3826          checkIncomplete(f);
3827          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3828          f.complete(1);
# Line 3628 | Line 3839 | public class CompletableFutureTest exten
3839          CompletableFuture<Integer> f = new CompletableFuture<>();
3840          CompletionStage<Integer> g = f.minimalCompletionStage();
3841          AtomicInteger x = new AtomicInteger(0);
3842 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3842 >        AtomicReference<Throwable> r = new AtomicReference<>();
3843          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3844          checkIncomplete(f);
3845          CFException ex = new CFException();
# Line 3646 | Line 3857 | public class CompletableFutureTest exten
3857          CFException ex = new CFException();
3858          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3859          AtomicInteger x = new AtomicInteger(0);
3860 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3860 >        AtomicReference<Throwable> r = new AtomicReference<>();
3861          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3862          assertEquals(x.get(), 0);
3863          assertEquals(r.get(), ex);
# Line 3670 | Line 3881 | public class CompletableFutureTest exten
3881      public void testCompleteAsync2() {
3882          CompletableFuture<Integer> f = new CompletableFuture<>();
3883          CFException ex = new CFException();
3884 <        f.completeAsync(() -> {if (true) throw ex; return 1;});
3884 >        f.completeAsync(() -> { throw ex; });
3885          try {
3886              f.join();
3887              shouldThrow();
# Line 3700 | Line 3911 | public class CompletableFutureTest exten
3911          CompletableFuture<Integer> f = new CompletableFuture<>();
3912          CFException ex = new CFException();
3913          ThreadExecutor executor = new ThreadExecutor();
3914 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3914 >        f.completeAsync(() -> { throw ex; }, executor);
3915          try {
3916              f.join();
3917              shouldThrow();
# Line 3852 | Line 4063 | public class CompletableFutureTest exten
4063          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4064          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4065  
4066 +        final Runnable noopRunnable = new Noop(m);
4067 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4068 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
4069 +
4070          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4071              = new ArrayList<>();
4072  
4073 <        funs.add((y) -> m.thenRun(y, new Noop(m)));
4074 <        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
4075 <        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
4076 <
4077 <        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
4078 <        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
4079 <        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
4080 <
4081 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
4082 <        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
4083 <        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4084 <        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4085 <        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
4086 <        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
4087 <
4088 <        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4089 <
4090 <        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
4091 <
4092 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
4093 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
4094 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
4095 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
4096 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
4097 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
4073 >        funs.add(y -> m.thenRun(y, noopRunnable));
4074 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4075 >        funs.add(y -> m.thenApply(y, incFunction));
4076 >
4077 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4078 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4079 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4080 >
4081 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4082 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4083 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4084 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4085 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4086 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4087 >
4088 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4089 >
4090 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4091 >
4092 >        funs.add(y -> CompletableFuture.allOf(y));
4093 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4094 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4095 >        funs.add(y -> CompletableFuture.anyOf(y));
4096 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4097 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4098  
4099          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4100                   fun : funs) {
4101              CompletableFuture<Integer> f = new CompletableFuture<>();
4102              f.completeExceptionally(ex);
4103 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4103 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4104              checkCompletedWithWrappedException(src, ex);
4105              CompletableFuture<?> dep = fun.apply(src);
4106              checkCompletedWithWrappedException(dep, ex);
# Line 3895 | Line 4110 | public class CompletableFutureTest exten
4110          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4111                   fun : funs) {
4112              CompletableFuture<Integer> f = new CompletableFuture<>();
4113 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4113 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4114              CompletableFuture<?> dep = fun.apply(src);
4115              f.completeExceptionally(ex);
4116              checkCompletedWithWrappedException(src, ex);
# Line 3909 | Line 4124 | public class CompletableFutureTest exten
4124              CompletableFuture<Integer> f = new CompletableFuture<>();
4125              f.cancel(mayInterruptIfRunning);
4126              checkCancelled(f);
4127 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4127 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4128              checkCompletedWithWrappedCancellationException(src);
4129              CompletableFuture<?> dep = fun.apply(src);
4130              checkCompletedWithWrappedCancellationException(dep);
# Line 3920 | Line 4135 | public class CompletableFutureTest exten
4135          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4136                   fun : funs) {
4137              CompletableFuture<Integer> f = new CompletableFuture<>();
4138 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4138 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4139              CompletableFuture<?> dep = fun.apply(src);
4140              f.cancel(mayInterruptIfRunning);
4141              checkCancelled(f);
# Line 3931 | Line 4146 | public class CompletableFutureTest exten
4146      }}
4147  
4148      /**
4149 <     * Minimal completion stages throw UOE for all non-CompletionStage methods
4149 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
4150       */
4151      public void testMinimalCompletionStage_minimality() {
4152          if (!testImplementationDetails) return;
4153          Function<Method, String> toSignature =
4154 <            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
4154 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4155          Predicate<Method> isNotStatic =
4156 <            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
4156 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4157          List<Method> minimalMethods =
4158              Stream.of(Object.class, CompletionStage.class)
4159 <            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
4159 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4160              .filter(isNotStatic)
4161              .collect(Collectors.toList());
4162          // Methods from CompletableFuture permitted NOT to throw UOE
# Line 3957 | Line 4172 | public class CompletableFutureTest exten
4172              .collect(Collectors.toSet());
4173          List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4174              .filter(isNotStatic)
4175 <            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4175 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4176              .collect(Collectors.toList());
4177  
4178 <        CompletionStage<Integer> minimalStage =
4178 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4179 >        CompletionStage<Integer> min =
4180              new CompletableFuture<Integer>().minimalCompletionStage();
4181 +        stages.add(min);
4182 +        stages.add(min.thenApply(x -> x));
4183 +        stages.add(CompletableFuture.completedStage(1));
4184 +        stages.add(CompletableFuture.failedStage(new CFException()));
4185  
4186          List<Method> bugs = new ArrayList<>();
4187          for (Method method : allMethods) {
# Line 3977 | Line 4197 | public class CompletableFutureTest exten
4197                  else if (parameterTypes[i] == long.class)
4198                      args[i] = 0L;
4199              }
4200 <            try {
4201 <                method.invoke(minimalStage, args);
4202 <                bugs.add(method);
3983 <            }
3984 <            catch (java.lang.reflect.InvocationTargetException expected) {
3985 <                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4200 >            for (CompletionStage<Integer> stage : stages) {
4201 >                try {
4202 >                    method.invoke(stage, args);
4203                      bugs.add(method);
3987                    // expected.getCause().printStackTrace();
4204                  }
4205 +                catch (java.lang.reflect.InvocationTargetException expected) {
4206 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4207 +                        bugs.add(method);
4208 +                        // expected.getCause().printStackTrace();
4209 +                    }
4210 +                }
4211 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4212              }
3990            catch (ReflectiveOperationException bad) { throw new Error(bad); }
4213          }
4214          if (!bugs.isEmpty())
4215 <            throw new Error("Methods did not throw UOE: " + bugs.toString());
4215 >            throw new Error("Methods did not throw UOE: " + bugs);
4216      }
4217  
4218 +    /**
4219 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4220 +     * is completed normally, with the same value, when source is.
4221 +     */
4222 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4223 +        for (boolean createIncomplete : new boolean[] { true, false })
4224 +        for (Integer v1 : new Integer[] { 1, null })
4225 +    {
4226 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4227 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4228 +        if (!createIncomplete) assertTrue(f.complete(v1));
4229 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4230 +        if (createIncomplete) {
4231 +            checkIncomplete(f);
4232 +            checkIncomplete(g);
4233 +            assertTrue(f.complete(v1));
4234 +        }
4235 +        checkCompletedNormally(f, v1);
4236 +        checkCompletedNormally(g, v1);
4237 +    }}
4238 +
4239 +    /**
4240 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4241 +     * is completed exceptionally when source is.
4242 +     */
4243 +    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4244 +        for (boolean createIncomplete : new boolean[] { true, false })
4245 +    {
4246 +        CFException ex = new CFException();
4247 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4248 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4249 +        if (!createIncomplete) f.completeExceptionally(ex);
4250 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4251 +        if (createIncomplete) {
4252 +            checkIncomplete(f);
4253 +            checkIncomplete(g);
4254 +            f.completeExceptionally(ex);
4255 +        }
4256 +        checkCompletedExceptionally(f, ex);
4257 +        checkCompletedWithWrappedException(g, ex);
4258 +    }}
4259 +
4260 +    /**
4261 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4262 +     */
4263 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4264 +        for (Integer v1 : new Integer[] { 1, null })
4265 +    {
4266 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4267 +        CompletionStage minimal = f.minimalCompletionStage();
4268 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4269 +        assertTrue(g.complete(v1));
4270 +        checkCompletedNormally(g, v1);
4271 +        checkIncomplete(f);
4272 +        checkIncomplete(minimal.toCompletableFuture());
4273 +    }}
4274 +
4275 +    /**
4276 +     * minimalStage.toCompletableFuture().join() awaits completion
4277 +     */
4278 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4279 +        for (boolean createIncomplete : new boolean[] { true, false })
4280 +        for (Integer v1 : new Integer[] { 1, null })
4281 +    {
4282 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4283 +        if (!createIncomplete) assertTrue(f.complete(v1));
4284 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4285 +        if (createIncomplete) assertTrue(f.complete(v1));
4286 +        assertEquals(v1, minimal.toCompletableFuture().join());
4287 +        assertEquals(v1, minimal.toCompletableFuture().get());
4288 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4289 +    }}
4290 +
4291 +    /**
4292 +     * Completion of a toCompletableFuture copy of a minimal stage
4293 +     * does not complete its source.
4294 +     */
4295 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4296 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4297 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4298 +        assertTrue(g.toCompletableFuture().complete(1));
4299 +        assertTrue(g.toCompletableFuture().complete(null));
4300 +        assertTrue(g.toCompletableFuture().cancel(true));
4301 +        assertTrue(g.toCompletableFuture().cancel(false));
4302 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4303 +        checkIncomplete(g.toCompletableFuture());
4304 +        f.complete(1);
4305 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4306 +    }
4307 +
4308 +    /** Demo utility method for external reliable toCompletableFuture */
4309 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4310 +        CompletableFuture<T> f = new CompletableFuture<>();
4311 +        stage.handle((T t, Throwable ex) -> {
4312 +                         if (ex != null) f.completeExceptionally(ex);
4313 +                         else f.complete(t);
4314 +                         return null;
4315 +                     });
4316 +        return f;
4317 +    }
4318 +
4319 +    /** Demo utility method to join a CompletionStage */
4320 +    static <T> T join(CompletionStage<T> stage) {
4321 +        return toCompletableFuture(stage).join();
4322 +    }
4323 +
4324 +    /**
4325 +     * Joining a minimal stage "by hand" works
4326 +     */
4327 +    public void testMinimalCompletionStage_join_by_hand() {
4328 +        for (boolean createIncomplete : new boolean[] { true, false })
4329 +        for (Integer v1 : new Integer[] { 1, null })
4330 +    {
4331 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4332 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4333 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4334 +        if (!createIncomplete) assertTrue(f.complete(v1));
4335 +        minimal.thenAccept(x -> g.complete(x));
4336 +        if (createIncomplete) assertTrue(f.complete(v1));
4337 +        g.join();
4338 +        checkCompletedNormally(g, v1);
4339 +        checkCompletedNormally(f, v1);
4340 +        assertEquals(v1, join(minimal));
4341 +    }}
4342 +
4343      static class Monad {
4344          static class ZeroException extends RuntimeException {
4345              public ZeroException() { super("monadic zero"); }
# Line 4009 | Line 4356 | public class CompletableFutureTest exten
4356          static <T,U,V> Function<T, CompletableFuture<V>> compose
4357              (Function<T, CompletableFuture<U>> f,
4358               Function<U, CompletableFuture<V>> g) {
4359 <            return (x) -> f.apply(x).thenCompose(g);
4359 >            return x -> f.apply(x).thenCompose(g);
4360          }
4361  
4362          static void assertZero(CompletableFuture<?> f) {
4363              try {
4364                  f.getNow(null);
4365 <                throw new AssertionFailedError("should throw");
4365 >                throw new AssertionError("should throw");
4366              } catch (CompletionException success) {
4367                  assertTrue(success.getCause() instanceof ZeroException);
4368              }
# Line 4089 | Line 4436 | public class CompletableFutureTest exten
4436  
4437          // Some mutually non-commutative functions
4438          Function<Long, CompletableFuture<Long>> triple
4439 <            = (x) -> Monad.unit(3 * x);
4439 >            = x -> Monad.unit(3 * x);
4440          Function<Long, CompletableFuture<Long>> inc
4441 <            = (x) -> Monad.unit(x + 1);
4441 >            = x -> Monad.unit(x + 1);
4442  
4443          // unit is a right identity: m >>= unit === m
4444          Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
# Line 4103 | Line 4450 | public class CompletableFutureTest exten
4450          // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4451          Monad.assertFutureEquals(
4452              unit.apply(5L).thenCompose(inc).thenCompose(triple),
4453 <            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4453 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4454  
4455          // The case for CompletableFuture as an additive monad is weaker...
4456  
# Line 4113 | Line 4460 | public class CompletableFutureTest exten
4460          // left zero: zero >>= f === zero
4461          Monad.assertZero(zero.thenCompose(inc));
4462          // right zero: f >>= (\x -> zero) === zero
4463 <        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4463 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4464  
4465          // f plus zero === f
4466          Monad.assertFutureEquals(Monad.unit(5L),
# Line 4140 | Line 4487 | public class CompletableFutureTest exten
4487      }
4488  
4489      /** Test long recursive chains of CompletableFutures with cascading completions */
4490 +    @SuppressWarnings("FutureReturnValueIgnored")
4491      public void testRecursiveChains() throws Throwable {
4492          for (ExecutionMode m : ExecutionMode.values())
4493          for (boolean addDeadEnds : new boolean[] { true, false })
# Line 4164 | Line 4512 | public class CompletableFutureTest exten
4512       * A single CompletableFuture with many dependents.
4513       * A demo of scalability - runtime is O(n).
4514       */
4515 +    @SuppressWarnings("FutureReturnValueIgnored")
4516      public void testManyDependents() throws Throwable {
4517          final int n = expensiveTests ? 1_000_000 : 10;
4518          final CompletableFuture<Void> head = new CompletableFuture<>();
# Line 4171 | Line 4520 | public class CompletableFutureTest exten
4520          final AtomicInteger count = new AtomicInteger(0);
4521          for (int i = 0; i < n; i++) {
4522              head.thenRun(() -> count.getAndIncrement());
4523 <            head.thenAccept((x) -> count.getAndIncrement());
4524 <            head.thenApply((x) -> count.getAndIncrement());
4523 >            head.thenAccept(x -> count.getAndIncrement());
4524 >            head.thenApply(x -> count.getAndIncrement());
4525  
4526              head.runAfterBoth(complete, () -> count.getAndIncrement());
4527              head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
# Line 4182 | Line 4531 | public class CompletableFutureTest exten
4531              complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4532  
4533              head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4534 <            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4535 <            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4534 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4535 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4536              new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4537 <            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4538 <            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4537 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4538 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4539          }
4540          head.complete(null);
4541          assertEquals(5 * 3 * n, count.get());
4542      }
4543  
4544      /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4545 +    @SuppressWarnings("FutureReturnValueIgnored")
4546      public void testCoCompletionGarbageRetention() throws Throwable {
4547          final int n = expensiveTests ? 1_000_000 : 10;
4548          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
# Line 4203 | Line 4553 | public class CompletableFutureTest exten
4553              f.complete(null);
4554  
4555              f = new CompletableFuture<>();
4556 <            f.acceptEither(incomplete, (x) -> {});
4556 >            f.acceptEither(incomplete, x -> {});
4557              f.complete(null);
4558  
4559              f = new CompletableFuture<>();
4560 <            f.applyToEither(incomplete, (x) -> x);
4560 >            f.applyToEither(incomplete, x -> x);
4561              f.complete(null);
4562  
4563              f = new CompletableFuture<>();
4564 <            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4564 >            CompletableFuture.anyOf(f, incomplete);
4565              f.complete(null);
4566          }
4567  
# Line 4221 | Line 4571 | public class CompletableFutureTest exten
4571              f.complete(null);
4572  
4573              f = new CompletableFuture<>();
4574 <            incomplete.acceptEither(f, (x) -> {});
4574 >            incomplete.acceptEither(f, x -> {});
4575              f.complete(null);
4576  
4577              f = new CompletableFuture<>();
4578 <            incomplete.applyToEither(f, (x) -> x);
4578 >            incomplete.applyToEither(f, x -> x);
4579              f.complete(null);
4580  
4581              f = new CompletableFuture<>();
4582 <            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4582 >            CompletableFuture.anyOf(incomplete, f);
4583              f.complete(null);
4584          }
4585      }
4586  
4587 <    /*
4588 <     * Tests below currently fail in stress mode due to memory retention.
4589 <     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck
4587 >    /**
4588 >     * Reproduction recipe for:
4589 >     * 8160402: Garbage retention with CompletableFuture.anyOf
4590 >     * 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
4591       */
4241
4242    /** Checks for garbage retention with anyOf. */
4592      public void testAnyOfGarbageRetention() throws Throwable {
4593          for (Integer v : new Integer[] { 1, null })
4594      {
# Line 4253 | Line 4602 | public class CompletableFutureTest exten
4602              checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4603      }}
4604  
4605 <    /** Checks for garbage retention with allOf. */
4605 >    /**
4606 >     * Checks for garbage retention with allOf.
4607 >     *
4608 >     * As of 2016-07, fails with OOME:
4609 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4610 >     */
4611      public void testCancelledAllOfGarbageRetention() throws Throwable {
4612          final int n = expensiveTests ? 100_000 : 10;
4613          CompletableFuture<Integer>[] fs
# Line 4264 | Line 4618 | public class CompletableFutureTest exten
4618              assertTrue(CompletableFuture.allOf(fs).cancel(false));
4619      }
4620  
4621 +    /**
4622 +     * Checks for garbage retention when a dependent future is
4623 +     * cancelled and garbage-collected.
4624 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4625 +     *
4626 +     * As of 2016-07, fails with OOME:
4627 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4628 +     */
4629 +    public void testCancelledGarbageRetention() throws Throwable {
4630 +        final int n = expensiveTests ? 100_000 : 10;
4631 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4632 +        for (int i = 0; i < n; i++)
4633 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4634 +    }
4635 +
4636 +    /**
4637 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4638 +     * is invoked many times.
4639 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4640 +     *
4641 +     * As of 2016-07, fails with OOME:
4642 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4643 +     */
4644 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4645 +        final int n = expensiveTests ? 900_000 : 10;
4646 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4647 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4648 +        for (int i = 0; i < n; i++)
4649 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4650 +    }
4651 +
4652   //     static <U> U join(CompletionStage<U> stage) {
4653   //         CompletableFuture<U> f = new CompletableFuture<>();
4654   //         stage.whenComplete((v, ex) -> {
# Line 4288 | Line 4673 | public class CompletableFutureTest exten
4673   //         return stage.toCompletableFuture().copy().isDone();
4674   //     }
4675  
4676 +    // For testing default implementations
4677 +    // Only non-default interface methods defined.
4678 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4679 +        final CompletableFuture<T> cf;
4680 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4681 +        public CompletableFuture<T> toCompletableFuture() {
4682 +            return cf; }
4683 +        public CompletionStage<Void> thenRun
4684 +            (Runnable action) {
4685 +            return cf.thenRun(action); }
4686 +        public CompletionStage<Void> thenRunAsync
4687 +            (Runnable action) {
4688 +            return cf.thenRunAsync(action); }
4689 +        public CompletionStage<Void> thenRunAsync
4690 +            (Runnable action,
4691 +             Executor executor) {
4692 +            return cf.thenRunAsync(action, executor); }
4693 +        public CompletionStage<Void> thenAccept
4694 +            (Consumer<? super T> action) {
4695 +            return cf.thenAccept(action); }
4696 +        public CompletionStage<Void> thenAcceptAsync
4697 +            (Consumer<? super T> action) {
4698 +            return cf.thenAcceptAsync(action); }
4699 +        public CompletionStage<Void> thenAcceptAsync
4700 +            (Consumer<? super T> action,
4701 +             Executor executor) {
4702 +            return cf.thenAcceptAsync(action, executor); }
4703 +        public <U> CompletionStage<U> thenApply
4704 +            (Function<? super T,? extends U> a) {
4705 +            return cf.thenApply(a); }
4706 +        public <U> CompletionStage<U> thenApplyAsync
4707 +            (Function<? super T,? extends U> fn) {
4708 +            return cf.thenApplyAsync(fn); }
4709 +        public <U> CompletionStage<U> thenApplyAsync
4710 +            (Function<? super T,? extends U> fn,
4711 +             Executor executor) {
4712 +            return cf.thenApplyAsync(fn, executor); }
4713 +        public <U,V> CompletionStage<V> thenCombine
4714 +            (CompletionStage<? extends U> other,
4715 +             BiFunction<? super T,? super U,? extends V> fn) {
4716 +            return cf.thenCombine(other, fn); }
4717 +        public <U,V> CompletionStage<V> thenCombineAsync
4718 +            (CompletionStage<? extends U> other,
4719 +             BiFunction<? super T,? super U,? extends V> fn) {
4720 +            return cf.thenCombineAsync(other, fn); }
4721 +        public <U,V> CompletionStage<V> thenCombineAsync
4722 +            (CompletionStage<? extends U> other,
4723 +             BiFunction<? super T,? super U,? extends V> fn,
4724 +             Executor executor) {
4725 +            return cf.thenCombineAsync(other, fn, executor); }
4726 +        public <U> CompletionStage<Void> thenAcceptBoth
4727 +            (CompletionStage<? extends U> other,
4728 +             BiConsumer<? super T, ? super U> action) {
4729 +            return cf.thenAcceptBoth(other, action); }
4730 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4731 +            (CompletionStage<? extends U> other,
4732 +             BiConsumer<? super T, ? super U> action) {
4733 +            return cf.thenAcceptBothAsync(other, action); }
4734 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4735 +            (CompletionStage<? extends U> other,
4736 +             BiConsumer<? super T, ? super U> action,
4737 +             Executor executor) {
4738 +            return cf.thenAcceptBothAsync(other, action, executor); }
4739 +        public CompletionStage<Void> runAfterBoth
4740 +            (CompletionStage<?> other,
4741 +             Runnable action) {
4742 +            return cf.runAfterBoth(other, action); }
4743 +        public CompletionStage<Void> runAfterBothAsync
4744 +            (CompletionStage<?> other,
4745 +             Runnable action) {
4746 +            return cf.runAfterBothAsync(other, action); }
4747 +        public CompletionStage<Void> runAfterBothAsync
4748 +            (CompletionStage<?> other,
4749 +             Runnable action,
4750 +             Executor executor) {
4751 +            return cf.runAfterBothAsync(other, action, executor); }
4752 +        public <U> CompletionStage<U> applyToEither
4753 +            (CompletionStage<? extends T> other,
4754 +             Function<? super T, U> fn) {
4755 +            return cf.applyToEither(other, fn); }
4756 +        public <U> CompletionStage<U> applyToEitherAsync
4757 +            (CompletionStage<? extends T> other,
4758 +             Function<? super T, U> fn) {
4759 +            return cf.applyToEitherAsync(other, fn); }
4760 +        public <U> CompletionStage<U> applyToEitherAsync
4761 +            (CompletionStage<? extends T> other,
4762 +             Function<? super T, U> fn,
4763 +             Executor executor) {
4764 +            return cf.applyToEitherAsync(other, fn, executor); }
4765 +        public CompletionStage<Void> acceptEither
4766 +            (CompletionStage<? extends T> other,
4767 +             Consumer<? super T> action) {
4768 +            return cf.acceptEither(other, action); }
4769 +        public CompletionStage<Void> acceptEitherAsync
4770 +            (CompletionStage<? extends T> other,
4771 +             Consumer<? super T> action) {
4772 +            return cf.acceptEitherAsync(other, action); }
4773 +        public CompletionStage<Void> acceptEitherAsync
4774 +            (CompletionStage<? extends T> other,
4775 +             Consumer<? super T> action,
4776 +             Executor executor) {
4777 +            return cf.acceptEitherAsync(other, action, executor); }
4778 +        public CompletionStage<Void> runAfterEither
4779 +            (CompletionStage<?> other,
4780 +             Runnable action) {
4781 +            return cf.runAfterEither(other, action); }
4782 +        public CompletionStage<Void> runAfterEitherAsync
4783 +            (CompletionStage<?> other,
4784 +             Runnable action) {
4785 +            return cf.runAfterEitherAsync(other, action); }
4786 +        public CompletionStage<Void> runAfterEitherAsync
4787 +            (CompletionStage<?> other,
4788 +             Runnable action,
4789 +             Executor executor) {
4790 +            return cf.runAfterEitherAsync(other, action, executor); }
4791 +        public <U> CompletionStage<U> thenCompose
4792 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4793 +            return cf.thenCompose(fn); }
4794 +        public <U> CompletionStage<U> thenComposeAsync
4795 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4796 +            return cf.thenComposeAsync(fn); }
4797 +        public <U> CompletionStage<U> thenComposeAsync
4798 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4799 +             Executor executor) {
4800 +            return cf.thenComposeAsync(fn, executor); }
4801 +        public <U> CompletionStage<U> handle
4802 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4803 +            return cf.handle(fn); }
4804 +        public <U> CompletionStage<U> handleAsync
4805 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4806 +            return cf.handleAsync(fn); }
4807 +        public <U> CompletionStage<U> handleAsync
4808 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4809 +             Executor executor) {
4810 +            return cf.handleAsync(fn, executor); }
4811 +        public CompletionStage<T> whenComplete
4812 +            (BiConsumer<? super T, ? super Throwable> action) {
4813 +            return cf.whenComplete(action); }
4814 +        public CompletionStage<T> whenCompleteAsync
4815 +            (BiConsumer<? super T, ? super Throwable> action) {
4816 +            return cf.whenCompleteAsync(action); }
4817 +        public CompletionStage<T> whenCompleteAsync
4818 +            (BiConsumer<? super T, ? super Throwable> action,
4819 +             Executor executor) {
4820 +            return cf.whenCompleteAsync(action, executor); }
4821 +        public CompletionStage<T> exceptionally
4822 +            (Function<Throwable, ? extends T> fn) {
4823 +            return cf.exceptionally(fn); }
4824 +    }
4825 +
4826 +    /**
4827 +     * default-implemented exceptionallyAsync action is not invoked when
4828 +     * source completes normally, and source result is propagated
4829 +     */
4830 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4831 +        for (boolean createIncomplete : new boolean[] { true, false })
4832 +        for (Integer v1 : new Integer[] { 1, null })
4833 +    {
4834 +        final AtomicInteger ran = new AtomicInteger(0);
4835 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4836 +        final DelegatedCompletionStage<Integer> d =
4837 +            new DelegatedCompletionStage<Integer>(f);
4838 +        if (!createIncomplete) assertTrue(f.complete(v1));
4839 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4840 +            ((Throwable t) -> {
4841 +                ran.getAndIncrement();
4842 +                throw new AssertionError("should not be called");
4843 +            });
4844 +        if (createIncomplete) assertTrue(f.complete(v1));
4845 +
4846 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4847 +        checkCompletedNormally(f, v1);
4848 +        assertEquals(0, ran.get());
4849 +    }}
4850 +
4851 +    /**
4852 +     * default-implemented exceptionallyAsync action completes with
4853 +     * function value on source exception
4854 +     */
4855 +    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4856 +        for (boolean createIncomplete : new boolean[] { true, false })
4857 +        for (Integer v1 : new Integer[] { 1, null })
4858 +    {
4859 +        final AtomicInteger ran = new AtomicInteger(0);
4860 +        final CFException ex = new CFException();
4861 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4862 +        final DelegatedCompletionStage<Integer> d =
4863 +            new DelegatedCompletionStage<Integer>(f);
4864 +        if (!createIncomplete) f.completeExceptionally(ex);
4865 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4866 +            ((Throwable t) -> {
4867 +                assertSame(t, ex);
4868 +                ran.getAndIncrement();
4869 +                return v1;
4870 +            });
4871 +        if (createIncomplete) f.completeExceptionally(ex);
4872 +
4873 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4874 +        checkCompletedExceptionally(f, ex);
4875 +        assertEquals(1, ran.get());
4876 +    }}
4877 +
4878 +    /**
4879 +     * Under default implementation, if an "exceptionally action"
4880 +     * throws an exception, it completes exceptionally with that
4881 +     * exception
4882 +     */
4883 +    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4884 +        for (boolean createIncomplete : new boolean[] { true, false })
4885 +    {
4886 +        final AtomicInteger ran = new AtomicInteger(0);
4887 +        final CFException ex1 = new CFException();
4888 +        final CFException ex2 = new CFException();
4889 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4890 +        final DelegatedCompletionStage<Integer> d =
4891 +            new DelegatedCompletionStage<Integer>(f);
4892 +        if (!createIncomplete) f.completeExceptionally(ex1);
4893 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4894 +            ((Throwable t) -> {
4895 +                assertSame(t, ex1);
4896 +                ran.getAndIncrement();
4897 +                throw ex2;
4898 +            });
4899 +        if (createIncomplete) f.completeExceptionally(ex1);
4900 +
4901 +        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4902 +        checkCompletedExceptionally(f, ex1);
4903 +        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4904 +        assertEquals(1, ran.get());
4905 +    }}
4906 +
4907 +    /**
4908 +     * default-implemented exceptionallyCompose result completes
4909 +     * normally after normal completion of source
4910 +     */
4911 +    public void testDefaultExceptionallyCompose_normalCompletion() {
4912 +        for (boolean createIncomplete : new boolean[] { true, false })
4913 +        for (Integer v1 : new Integer[] { 1, null })
4914 +    {
4915 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4916 +        final ExceptionalCompletableFutureFunction r =
4917 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4918 +        final DelegatedCompletionStage<Integer> d =
4919 +            new DelegatedCompletionStage<Integer>(f);
4920 +        if (!createIncomplete) assertTrue(f.complete(v1));
4921 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4922 +        if (createIncomplete) assertTrue(f.complete(v1));
4923 +
4924 +        checkCompletedNormally(f, v1);
4925 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4926 +        r.assertNotInvoked();
4927 +    }}
4928 +
4929 +    /**
4930 +     * default-implemented exceptionallyCompose result completes
4931 +     * normally after exceptional completion of source
4932 +     */
4933 +    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4934 +        for (boolean createIncomplete : new boolean[] { true, false })
4935 +    {
4936 +        final CFException ex = new CFException();
4937 +        final ExceptionalCompletableFutureFunction r =
4938 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4939 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4940 +        final DelegatedCompletionStage<Integer> d =
4941 +            new DelegatedCompletionStage<Integer>(f);
4942 +        if (!createIncomplete) f.completeExceptionally(ex);
4943 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4944 +        if (createIncomplete) f.completeExceptionally(ex);
4945 +
4946 +        checkCompletedExceptionally(f, ex);
4947 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4948 +        r.assertInvoked();
4949 +    }}
4950 +
4951 +    /**
4952 +     * default-implemented exceptionallyCompose completes
4953 +     * exceptionally on exception if action does
4954 +     */
4955 +    public void testDefaultExceptionallyCompose_actionFailed() {
4956 +        for (boolean createIncomplete : new boolean[] { true, false })
4957 +    {
4958 +        final CFException ex = new CFException();
4959 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4960 +        final FailingExceptionalCompletableFutureFunction r
4961 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4962 +        final DelegatedCompletionStage<Integer> d =
4963 +            new DelegatedCompletionStage<Integer>(f);
4964 +        if (!createIncomplete) f.completeExceptionally(ex);
4965 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4966 +        if (createIncomplete) f.completeExceptionally(ex);
4967 +
4968 +        checkCompletedExceptionally(f, ex);
4969 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4970 +        r.assertInvoked();
4971 +    }}
4972 +
4973 +    /**
4974 +     * default-implemented exceptionallyComposeAsync result completes
4975 +     * normally after normal completion of source
4976 +     */
4977 +    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4978 +        for (boolean createIncomplete : new boolean[] { true, false })
4979 +        for (Integer v1 : new Integer[] { 1, null })
4980 +    {
4981 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4982 +        final ExceptionalCompletableFutureFunction r =
4983 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4984 +        final DelegatedCompletionStage<Integer> d =
4985 +            new DelegatedCompletionStage<Integer>(f);
4986 +        if (!createIncomplete) assertTrue(f.complete(v1));
4987 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4988 +        if (createIncomplete) assertTrue(f.complete(v1));
4989 +
4990 +        checkCompletedNormally(f, v1);
4991 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4992 +        r.assertNotInvoked();
4993 +    }}
4994 +
4995 +    /**
4996 +     * default-implemented exceptionallyComposeAsync result completes
4997 +     * normally after exceptional completion of source
4998 +     */
4999 +    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
5000 +        for (boolean createIncomplete : new boolean[] { true, false })
5001 +    {
5002 +        final CFException ex = new CFException();
5003 +        final ExceptionalCompletableFutureFunction r =
5004 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5005 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5006 +        final DelegatedCompletionStage<Integer> d =
5007 +            new DelegatedCompletionStage<Integer>(f);
5008 +        if (!createIncomplete) f.completeExceptionally(ex);
5009 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5010 +        if (createIncomplete) f.completeExceptionally(ex);
5011 +
5012 +        checkCompletedExceptionally(f, ex);
5013 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5014 +        r.assertInvoked();
5015 +    }}
5016 +
5017 +    /**
5018 +     * default-implemented exceptionallyComposeAsync completes
5019 +     * exceptionally on exception if action does
5020 +     */
5021 +    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5022 +        for (boolean createIncomplete : new boolean[] { true, false })
5023 +    {
5024 +        final CFException ex = new CFException();
5025 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5026 +        final FailingExceptionalCompletableFutureFunction r
5027 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5028 +        final DelegatedCompletionStage<Integer> d =
5029 +            new DelegatedCompletionStage<Integer>(f);
5030 +        if (!createIncomplete) f.completeExceptionally(ex);
5031 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5032 +        if (createIncomplete) f.completeExceptionally(ex);
5033 +
5034 +        checkCompletedExceptionally(f, ex);
5035 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5036 +        r.assertInvoked();
5037 +    }}
5038 +
5039 +    /**
5040 +     * default-implemented exceptionallyComposeAsync result completes
5041 +     * normally after normal completion of source
5042 +     */
5043 +    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5044 +        for (boolean createIncomplete : new boolean[] { true, false })
5045 +        for (Integer v1 : new Integer[] { 1, null })
5046 +    {
5047 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5048 +        final ExceptionalCompletableFutureFunction r =
5049 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5050 +        final DelegatedCompletionStage<Integer> d =
5051 +            new DelegatedCompletionStage<Integer>(f);
5052 +        if (!createIncomplete) assertTrue(f.complete(v1));
5053 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5054 +        if (createIncomplete) assertTrue(f.complete(v1));
5055 +
5056 +        checkCompletedNormally(f, v1);
5057 +        checkCompletedNormally(g.toCompletableFuture(), v1);
5058 +        r.assertNotInvoked();
5059 +    }}
5060 +
5061 +    /**
5062 +     * default-implemented exceptionallyComposeAsync result completes
5063 +     * normally after exceptional completion of source
5064 +     */
5065 +    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5066 +        for (boolean createIncomplete : new boolean[] { true, false })
5067 +    {
5068 +        final CFException ex = new CFException();
5069 +        final ExceptionalCompletableFutureFunction r =
5070 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5071 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5072 +        final DelegatedCompletionStage<Integer> d =
5073 +            new DelegatedCompletionStage<Integer>(f);
5074 +        if (!createIncomplete) f.completeExceptionally(ex);
5075 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5076 +        if (createIncomplete) f.completeExceptionally(ex);
5077 +
5078 +        checkCompletedExceptionally(f, ex);
5079 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5080 +        r.assertInvoked();
5081 +    }}
5082 +
5083 +    /**
5084 +     * default-implemented exceptionallyComposeAsync completes
5085 +     * exceptionally on exception if action does
5086 +     */
5087 +    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5088 +        for (boolean createIncomplete : new boolean[] { true, false })
5089 +    {
5090 +        final CFException ex = new CFException();
5091 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5092 +        final FailingExceptionalCompletableFutureFunction r
5093 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5094 +        final DelegatedCompletionStage<Integer> d =
5095 +            new DelegatedCompletionStage<Integer>(f);
5096 +        if (!createIncomplete) f.completeExceptionally(ex);
5097 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5098 +        if (createIncomplete) f.completeExceptionally(ex);
5099 +
5100 +        checkCompletedExceptionally(f, ex);
5101 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5102 +        r.assertInvoked();
5103 +    }}
5104 +
5105   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines