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.214 by jsr166, Mon Sep 24 18:09:30 2018 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      {
855        final AtomicInteger a = new AtomicInteger(0);
929          final CompletableFuture<Integer> f = new CompletableFuture<>();
930          if (!createIncomplete) assertTrue(f.complete(v1));
931 <        final CompletableFuture<Integer> g = f.exceptionally
932 <            ((Throwable t) -> {
860 <                a.getAndIncrement();
931 >        final CompletableFuture<Integer> g = m.exceptionally
932 >            (f, (Throwable t) -> {
933                  threadFail("should not be called");
934                  return null;            // unreached
935              });
# Line 865 | Line 937 | public class CompletableFutureTest exten
937  
938          checkCompletedNormally(g, v1);
939          checkCompletedNormally(f, v1);
868        assertEquals(0, a.get());
940      }}
941  
942      /**
# Line 873 | Line 944 | public class CompletableFutureTest exten
944       * exception
945       */
946      public void testExceptionally_exceptionalCompletion() {
947 +        for (ExecutionMode m : ExecutionMode.values())
948          for (boolean createIncomplete : new boolean[] { true, false })
949          for (Integer v1 : new Integer[] { 1, null })
950      {
# Line 880 | Line 952 | public class CompletableFutureTest exten
952          final CFException ex = new CFException();
953          final CompletableFuture<Integer> f = new CompletableFuture<>();
954          if (!createIncomplete) f.completeExceptionally(ex);
955 <        final CompletableFuture<Integer> g = f.exceptionally
956 <            ((Throwable t) -> {
957 <                ExecutionMode.SYNC.checkExecutionMode();
955 >        final CompletableFuture<Integer> g = m.exceptionally
956 >            (f, (Throwable t) -> {
957 >                m.checkExecutionMode();
958                  threadAssertSame(t, ex);
959                  a.getAndIncrement();
960                  return v1;
# Line 898 | Line 970 | public class CompletableFutureTest exten
970       * exceptionally with that exception
971       */
972      public void testExceptionally_exceptionalCompletionActionFailed() {
973 +        for (ExecutionMode m : ExecutionMode.values())
974          for (boolean createIncomplete : new boolean[] { true, false })
975      {
976          final AtomicInteger a = new AtomicInteger(0);
# Line 905 | Line 978 | public class CompletableFutureTest exten
978          final CFException ex2 = new CFException();
979          final CompletableFuture<Integer> f = new CompletableFuture<>();
980          if (!createIncomplete) f.completeExceptionally(ex1);
981 <        final CompletableFuture<Integer> g = f.exceptionally
982 <            ((Throwable t) -> {
983 <                ExecutionMode.SYNC.checkExecutionMode();
981 >        final CompletableFuture<Integer> g = m.exceptionally
982 >            (f, (Throwable t) -> {
983 >                m.checkExecutionMode();
984                  threadAssertSame(t, ex1);
985                  a.getAndIncrement();
986                  throw ex2;
# Line 1243 | Line 1316 | public class CompletableFutureTest exten
1316          r.assertInvoked();
1317      }}
1318  
1319 +    @SuppressWarnings("FutureReturnValueIgnored")
1320      public void testRunAsync_rejectingExecutor() {
1321          CountingRejectingExecutor e = new CountingRejectingExecutor();
1322          try {
# Line 1289 | Line 1363 | public class CompletableFutureTest exten
1363          r.assertInvoked();
1364      }}
1365  
1366 +    @SuppressWarnings("FutureReturnValueIgnored")
1367      public void testSupplyAsync_rejectingExecutor() {
1368          CountingRejectingExecutor e = new CountingRejectingExecutor();
1369          try {
# Line 2563 | Line 2638 | public class CompletableFutureTest exten
2638  
2639          // unspecified behavior - both source completions available
2640          try {
2641 <            assertEquals(null, h0.join());
2641 >            assertNull(h0.join());
2642              rs[0].assertValue(v1);
2643          } catch (CompletionException ok) {
2644              checkCompletedWithWrappedException(h0, ex);
2645              rs[0].assertNotInvoked();
2646          }
2647          try {
2648 <            assertEquals(null, h1.join());
2648 >            assertNull(h1.join());
2649              rs[1].assertValue(v1);
2650          } catch (CompletionException ok) {
2651              checkCompletedWithWrappedException(h1, ex);
2652              rs[1].assertNotInvoked();
2653          }
2654          try {
2655 <            assertEquals(null, h2.join());
2655 >            assertNull(h2.join());
2656              rs[2].assertValue(v1);
2657          } catch (CompletionException ok) {
2658              checkCompletedWithWrappedException(h2, ex);
2659              rs[2].assertNotInvoked();
2660          }
2661          try {
2662 <            assertEquals(null, h3.join());
2662 >            assertNull(h3.join());
2663              rs[3].assertValue(v1);
2664          } catch (CompletionException ok) {
2665              checkCompletedWithWrappedException(h3, ex);
# Line 2823 | Line 2898 | public class CompletableFutureTest exten
2898  
2899          // unspecified behavior - both source completions available
2900          try {
2901 <            assertEquals(null, h0.join());
2901 >            assertNull(h0.join());
2902              rs[0].assertInvoked();
2903          } catch (CompletionException ok) {
2904              checkCompletedWithWrappedException(h0, ex);
2905              rs[0].assertNotInvoked();
2906          }
2907          try {
2908 <            assertEquals(null, h1.join());
2908 >            assertNull(h1.join());
2909              rs[1].assertInvoked();
2910          } catch (CompletionException ok) {
2911              checkCompletedWithWrappedException(h1, ex);
2912              rs[1].assertNotInvoked();
2913          }
2914          try {
2915 <            assertEquals(null, h2.join());
2915 >            assertNull(h2.join());
2916              rs[2].assertInvoked();
2917          } catch (CompletionException ok) {
2918              checkCompletedWithWrappedException(h2, ex);
2919              rs[2].assertNotInvoked();
2920          }
2921          try {
2922 <            assertEquals(null, h3.join());
2922 >            assertNull(h3.join());
2923              rs[3].assertInvoked();
2924          } catch (CompletionException ok) {
2925              checkCompletedWithWrappedException(h3, ex);
# Line 3076 | Line 3151 | public class CompletableFutureTest exten
3151          checkCompletedNormally(f, v1);
3152      }}
3153  
3154 +    /**
3155 +     * exceptionallyCompose result completes normally after normal
3156 +     * completion of source
3157 +     */
3158 +    public void testExceptionallyCompose_normalCompletion() {
3159 +        for (ExecutionMode m : ExecutionMode.values())
3160 +        for (boolean createIncomplete : new boolean[] { true, false })
3161 +        for (Integer v1 : new Integer[] { 1, null })
3162 +    {
3163 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3164 +        final ExceptionalCompletableFutureFunction r =
3165 +            new ExceptionalCompletableFutureFunction(m);
3166 +        if (!createIncomplete) assertTrue(f.complete(v1));
3167 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3168 +        if (createIncomplete) assertTrue(f.complete(v1));
3169 +
3170 +        checkCompletedNormally(f, v1);
3171 +        checkCompletedNormally(g, v1);
3172 +        r.assertNotInvoked();
3173 +    }}
3174 +
3175 +    /**
3176 +     * exceptionallyCompose result completes normally after exceptional
3177 +     * completion of source
3178 +     */
3179 +    public void testExceptionallyCompose_exceptionalCompletion() {
3180 +        for (ExecutionMode m : ExecutionMode.values())
3181 +        for (boolean createIncomplete : new boolean[] { true, false })
3182 +    {
3183 +        final CFException ex = new CFException();
3184 +        final ExceptionalCompletableFutureFunction r =
3185 +            new ExceptionalCompletableFutureFunction(m);
3186 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3187 +        if (!createIncomplete) f.completeExceptionally(ex);
3188 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3189 +        if (createIncomplete) f.completeExceptionally(ex);
3190 +
3191 +        checkCompletedExceptionally(f, ex);
3192 +        checkCompletedNormally(g, r.value);
3193 +        r.assertInvoked();
3194 +    }}
3195 +
3196 +    /**
3197 +     * exceptionallyCompose completes exceptionally on exception if action does
3198 +     */
3199 +    public void testExceptionallyCompose_actionFailed() {
3200 +        for (ExecutionMode m : ExecutionMode.values())
3201 +        for (boolean createIncomplete : new boolean[] { true, false })
3202 +    {
3203 +        final CFException ex = new CFException();
3204 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3205 +        final FailingExceptionalCompletableFutureFunction r
3206 +            = new FailingExceptionalCompletableFutureFunction(m);
3207 +        if (!createIncomplete) f.completeExceptionally(ex);
3208 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3209 +        if (createIncomplete) f.completeExceptionally(ex);
3210 +
3211 +        checkCompletedExceptionally(f, ex);
3212 +        checkCompletedWithWrappedException(g, r.ex);
3213 +        r.assertInvoked();
3214 +    }}
3215 +
3216 +    /**
3217 +     * exceptionallyCompose result completes exceptionally if the
3218 +     * result of the action does
3219 +     */
3220 +    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3221 +        for (ExecutionMode m : ExecutionMode.values())
3222 +        for (int order = 0; order < 6; order++)
3223 +    {
3224 +        final CFException ex0 = new CFException();
3225 +        final CFException ex = new CFException();
3226 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3227 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3228 +        final CompletableFuture<Integer> h;
3229 +        // Test all permutations of orders
3230 +        switch (order) {
3231 +        case 0:
3232 +            assertTrue(f.completeExceptionally(ex0));
3233 +            assertTrue(g.completeExceptionally(ex));
3234 +            h = m.exceptionallyCompose(f, (x -> g));
3235 +            break;
3236 +        case 1:
3237 +            assertTrue(f.completeExceptionally(ex0));
3238 +            h = m.exceptionallyCompose(f, (x -> g));
3239 +            assertTrue(g.completeExceptionally(ex));
3240 +            break;
3241 +        case 2:
3242 +            assertTrue(g.completeExceptionally(ex));
3243 +            assertTrue(f.completeExceptionally(ex0));
3244 +            h = m.exceptionallyCompose(f, (x -> g));
3245 +            break;
3246 +        case 3:
3247 +            assertTrue(g.completeExceptionally(ex));
3248 +            h = m.exceptionallyCompose(f, (x -> g));
3249 +            assertTrue(f.completeExceptionally(ex0));
3250 +            break;
3251 +        case 4:
3252 +            h = m.exceptionallyCompose(f, (x -> g));
3253 +            assertTrue(f.completeExceptionally(ex0));
3254 +            assertTrue(g.completeExceptionally(ex));
3255 +            break;
3256 +        case 5:
3257 +            h = m.exceptionallyCompose(f, (x -> g));
3258 +            assertTrue(f.completeExceptionally(ex0));
3259 +            assertTrue(g.completeExceptionally(ex));
3260 +            break;
3261 +        default: throw new AssertionError();
3262 +        }
3263 +
3264 +        checkCompletedExceptionally(g, ex);
3265 +        checkCompletedWithWrappedException(h, ex);
3266 +        checkCompletedExceptionally(f, ex0);
3267 +    }}
3268 +
3269      // other static methods
3270  
3271      /**
# Line 3239 | Line 3429 | public class CompletableFutureTest exten
3429      /**
3430       * Completion methods throw NullPointerException with null arguments
3431       */
3432 +    @SuppressWarnings("FutureReturnValueIgnored")
3433      public void testNPE() {
3434          CompletableFuture<Integer> f = new CompletableFuture<>();
3435          CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 3258 | Line 3449 | public class CompletableFutureTest exten
3449  
3450              () -> f.thenApply(null),
3451              () -> f.thenApplyAsync(null),
3452 <            () -> f.thenApplyAsync((x) -> x, null),
3452 >            () -> f.thenApplyAsync(x -> x, null),
3453              () -> f.thenApplyAsync(null, exec),
3454  
3455              () -> f.thenAccept(null),
3456              () -> f.thenAcceptAsync(null),
3457 <            () -> f.thenAcceptAsync((x) -> {} , null),
3457 >            () -> f.thenAcceptAsync(x -> {} , null),
3458              () -> f.thenAcceptAsync(null, exec),
3459  
3460              () -> f.thenRun(null),
# Line 3298 | Line 3489 | public class CompletableFutureTest exten
3489              () -> f.applyToEither(g, null),
3490              () -> f.applyToEitherAsync(g, null),
3491              () -> f.applyToEitherAsync(g, null, exec),
3492 <            () -> f.applyToEither(nullFuture, (x) -> x),
3493 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3494 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3495 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3492 >            () -> f.applyToEither(nullFuture, x -> x),
3493 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3494 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3495 >            () -> f.applyToEitherAsync(g, x -> x, null),
3496  
3497              () -> f.acceptEither(g, null),
3498              () -> f.acceptEitherAsync(g, null),
3499              () -> f.acceptEitherAsync(g, null, exec),
3500 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3501 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3502 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3503 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3500 >            () -> f.acceptEither(nullFuture, x -> {}),
3501 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3502 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3503 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3504  
3505              () -> f.runAfterEither(g, null),
3506              () -> f.runAfterEitherAsync(g, null),
# Line 3375 | Line 3566 | public class CompletableFutureTest exten
3566          for (CompletableFuture<Integer> src : srcs) {
3567              List<CompletableFuture<?>> fs = new ArrayList<>();
3568              fs.add(src.thenRunAsync(() -> {}, e));
3569 <            fs.add(src.thenAcceptAsync((z) -> {}, e));
3570 <            fs.add(src.thenApplyAsync((z) -> z, e));
3569 >            fs.add(src.thenAcceptAsync(z -> {}, e));
3570 >            fs.add(src.thenApplyAsync(z -> z, e));
3571  
3572              fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3573              fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3574              fs.add(src.runAfterBothAsync(src, () -> {}, e));
3575  
3576 <            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3577 <            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3576 >            fs.add(src.applyToEitherAsync(src, z -> z, e));
3577 >            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3578              fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3579  
3580 <            fs.add(src.thenComposeAsync((z) -> null, e));
3580 >            fs.add(src.thenComposeAsync(z -> null, e));
3581              fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3582              fs.add(src.handleAsync((z, t) -> null, e));
3583  
# Line 3419 | Line 3610 | public class CompletableFutureTest exten
3610          {
3611              List<CompletableFuture<?>> fs = new ArrayList<>();
3612  
3613 <            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3614 <            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3613 >            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3614 >            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3615  
3616 <            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3617 <            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3616 >            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3617 >            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3618  
3619              fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3620              fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
# Line 3462 | Line 3653 | public class CompletableFutureTest exten
3653  
3654          List<CompletableFuture<?>> fs = new ArrayList<>();
3655          fs.add(incomplete.thenRunAsync(() -> {}, e));
3656 <        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3657 <        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3656 >        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3657 >        fs.add(incomplete.thenApplyAsync(z -> z, e));
3658  
3659          fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3660          fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3661          fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3662  
3663 <        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3664 <        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3663 >        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3664 >        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3665          fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3666  
3667 <        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3667 >        fs.add(incomplete.thenComposeAsync(z -> null, e));
3668          fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3669          fs.add(incomplete.handleAsync((z, t) -> null, e));
3670  
# Line 3533 | Line 3724 | public class CompletableFutureTest exten
3724       */
3725      public void testCompletedStage() {
3726          AtomicInteger x = new AtomicInteger(0);
3727 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3727 >        AtomicReference<Throwable> r = new AtomicReference<>();
3728          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3729          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3730          assertEquals(x.get(), 1);
# Line 3578 | Line 3769 | public class CompletableFutureTest exten
3769       * copy returns a CompletableFuture that is completed normally,
3770       * with the same value, when source is.
3771       */
3772 <    public void testCopy() {
3772 >    public void testCopy_normalCompletion() {
3773 >        for (boolean createIncomplete : new boolean[] { true, false })
3774 >        for (Integer v1 : new Integer[] { 1, null })
3775 >    {
3776          CompletableFuture<Integer> f = new CompletableFuture<>();
3777 +        if (!createIncomplete) assertTrue(f.complete(v1));
3778          CompletableFuture<Integer> g = f.copy();
3779 <        checkIncomplete(f);
3780 <        checkIncomplete(g);
3781 <        f.complete(1);
3782 <        checkCompletedNormally(f, 1);
3783 <        checkCompletedNormally(g, 1);
3784 <    }
3779 >        if (createIncomplete) {
3780 >            checkIncomplete(f);
3781 >            checkIncomplete(g);
3782 >            assertTrue(f.complete(v1));
3783 >        }
3784 >        checkCompletedNormally(f, v1);
3785 >        checkCompletedNormally(g, v1);
3786 >    }}
3787  
3788      /**
3789       * copy returns a CompletableFuture that is completed exceptionally
3790       * when source is.
3791       */
3792 <    public void testCopy2() {
3792 >    public void testCopy_exceptionalCompletion() {
3793 >        for (boolean createIncomplete : new boolean[] { true, false })
3794 >    {
3795 >        CFException ex = new CFException();
3796          CompletableFuture<Integer> f = new CompletableFuture<>();
3797 +        if (!createIncomplete) f.completeExceptionally(ex);
3798          CompletableFuture<Integer> g = f.copy();
3799 <        checkIncomplete(f);
3800 <        checkIncomplete(g);
3801 <        CFException ex = new CFException();
3802 <        f.completeExceptionally(ex);
3799 >        if (createIncomplete) {
3800 >            checkIncomplete(f);
3801 >            checkIncomplete(g);
3802 >            f.completeExceptionally(ex);
3803 >        }
3804          checkCompletedExceptionally(f, ex);
3805          checkCompletedWithWrappedException(g, ex);
3806 +    }}
3807 +
3808 +    /**
3809 +     * Completion of a copy does not complete its source.
3810 +     */
3811 +    public void testCopy_oneWayPropagation() {
3812 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3813 +        assertTrue(f.copy().complete(1));
3814 +        assertTrue(f.copy().complete(null));
3815 +        assertTrue(f.copy().cancel(true));
3816 +        assertTrue(f.copy().cancel(false));
3817 +        assertTrue(f.copy().completeExceptionally(new CFException()));
3818 +        checkIncomplete(f);
3819      }
3820  
3821      /**
# Line 3611 | Line 3826 | public class CompletableFutureTest exten
3826          CompletableFuture<Integer> f = new CompletableFuture<>();
3827          CompletionStage<Integer> g = f.minimalCompletionStage();
3828          AtomicInteger x = new AtomicInteger(0);
3829 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3829 >        AtomicReference<Throwable> r = new AtomicReference<>();
3830          checkIncomplete(f);
3831          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3832          f.complete(1);
# Line 3628 | Line 3843 | public class CompletableFutureTest exten
3843          CompletableFuture<Integer> f = new CompletableFuture<>();
3844          CompletionStage<Integer> g = f.minimalCompletionStage();
3845          AtomicInteger x = new AtomicInteger(0);
3846 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3846 >        AtomicReference<Throwable> r = new AtomicReference<>();
3847          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3848          checkIncomplete(f);
3849          CFException ex = new CFException();
# Line 3646 | Line 3861 | public class CompletableFutureTest exten
3861          CFException ex = new CFException();
3862          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3863          AtomicInteger x = new AtomicInteger(0);
3864 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3864 >        AtomicReference<Throwable> r = new AtomicReference<>();
3865          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3866          assertEquals(x.get(), 0);
3867          assertEquals(r.get(), ex);
# Line 3670 | Line 3885 | public class CompletableFutureTest exten
3885      public void testCompleteAsync2() {
3886          CompletableFuture<Integer> f = new CompletableFuture<>();
3887          CFException ex = new CFException();
3888 <        f.completeAsync(() -> {if (true) throw ex; return 1;});
3888 >        f.completeAsync(() -> { throw ex; });
3889          try {
3890              f.join();
3891              shouldThrow();
# Line 3700 | Line 3915 | public class CompletableFutureTest exten
3915          CompletableFuture<Integer> f = new CompletableFuture<>();
3916          CFException ex = new CFException();
3917          ThreadExecutor executor = new ThreadExecutor();
3918 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3918 >        f.completeAsync(() -> { throw ex; }, executor);
3919          try {
3920              f.join();
3921              shouldThrow();
# Line 3852 | Line 4067 | public class CompletableFutureTest exten
4067          final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4068          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4069  
4070 +        final Runnable noopRunnable = new Noop(m);
4071 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4072 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
4073 +
4074          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4075              = new ArrayList<>();
4076  
4077 <        funs.add((y) -> m.thenRun(y, new Noop(m)));
4078 <        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
4079 <        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
4080 <
4081 <        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
4082 <        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
4083 <        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
4084 <
4085 <        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
4086 <        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
4087 <        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4088 <        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4089 <        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
4090 <        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
4091 <
4092 <        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4093 <
4094 <        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
4095 <
4096 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
4097 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
4098 <        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
4099 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
4100 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
4101 <        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
4077 >        funs.add(y -> m.thenRun(y, noopRunnable));
4078 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4079 >        funs.add(y -> m.thenApply(y, incFunction));
4080 >
4081 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4082 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4083 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4084 >
4085 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4086 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4087 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4088 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4089 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4090 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4091 >
4092 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4093 >
4094 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4095 >
4096 >        funs.add(y -> CompletableFuture.allOf(y));
4097 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4098 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4099 >        funs.add(y -> CompletableFuture.anyOf(y));
4100 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4101 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4102  
4103          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4104                   fun : funs) {
4105              CompletableFuture<Integer> f = new CompletableFuture<>();
4106              f.completeExceptionally(ex);
4107 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4107 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4108              checkCompletedWithWrappedException(src, ex);
4109              CompletableFuture<?> dep = fun.apply(src);
4110              checkCompletedWithWrappedException(dep, ex);
# Line 3895 | Line 4114 | public class CompletableFutureTest exten
4114          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4115                   fun : funs) {
4116              CompletableFuture<Integer> f = new CompletableFuture<>();
4117 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4117 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4118              CompletableFuture<?> dep = fun.apply(src);
4119              f.completeExceptionally(ex);
4120              checkCompletedWithWrappedException(src, ex);
# Line 3909 | Line 4128 | public class CompletableFutureTest exten
4128              CompletableFuture<Integer> f = new CompletableFuture<>();
4129              f.cancel(mayInterruptIfRunning);
4130              checkCancelled(f);
4131 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4131 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4132              checkCompletedWithWrappedCancellationException(src);
4133              CompletableFuture<?> dep = fun.apply(src);
4134              checkCompletedWithWrappedCancellationException(dep);
# Line 3920 | Line 4139 | public class CompletableFutureTest exten
4139          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4140                   fun : funs) {
4141              CompletableFuture<Integer> f = new CompletableFuture<>();
4142 <            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
4142 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4143              CompletableFuture<?> dep = fun.apply(src);
4144              f.cancel(mayInterruptIfRunning);
4145              checkCancelled(f);
# Line 3931 | Line 4150 | public class CompletableFutureTest exten
4150      }}
4151  
4152      /**
4153 <     * Minimal completion stages throw UOE for all non-CompletionStage methods
4153 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
4154       */
4155      public void testMinimalCompletionStage_minimality() {
4156          if (!testImplementationDetails) return;
4157          Function<Method, String> toSignature =
4158 <            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
4158 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4159          Predicate<Method> isNotStatic =
4160 <            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
4160 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4161          List<Method> minimalMethods =
4162              Stream.of(Object.class, CompletionStage.class)
4163 <            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
4163 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4164              .filter(isNotStatic)
4165              .collect(Collectors.toList());
4166          // Methods from CompletableFuture permitted NOT to throw UOE
# Line 3957 | Line 4176 | public class CompletableFutureTest exten
4176              .collect(Collectors.toSet());
4177          List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4178              .filter(isNotStatic)
4179 <            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4179 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4180              .collect(Collectors.toList());
4181  
4182 <        CompletionStage<Integer> minimalStage =
4182 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4183 >        CompletionStage<Integer> min =
4184              new CompletableFuture<Integer>().minimalCompletionStage();
4185 +        stages.add(min);
4186 +        stages.add(min.thenApply(x -> x));
4187 +        stages.add(CompletableFuture.completedStage(1));
4188 +        stages.add(CompletableFuture.failedStage(new CFException()));
4189  
4190          List<Method> bugs = new ArrayList<>();
4191          for (Method method : allMethods) {
# Line 3977 | Line 4201 | public class CompletableFutureTest exten
4201                  else if (parameterTypes[i] == long.class)
4202                      args[i] = 0L;
4203              }
4204 <            try {
4205 <                method.invoke(minimalStage, args);
4206 <                bugs.add(method);
3983 <            }
3984 <            catch (java.lang.reflect.InvocationTargetException expected) {
3985 <                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4204 >            for (CompletionStage<Integer> stage : stages) {
4205 >                try {
4206 >                    method.invoke(stage, args);
4207                      bugs.add(method);
3987                    // expected.getCause().printStackTrace();
4208                  }
4209 +                catch (java.lang.reflect.InvocationTargetException expected) {
4210 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4211 +                        bugs.add(method);
4212 +                        // expected.getCause().printStackTrace();
4213 +                    }
4214 +                }
4215 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4216              }
3990            catch (ReflectiveOperationException bad) { throw new Error(bad); }
4217          }
4218          if (!bugs.isEmpty())
4219 <            throw new Error("Methods did not throw UOE: " + bugs.toString());
4219 >            throw new Error("Methods did not throw UOE: " + bugs);
4220      }
4221  
4222 +    /**
4223 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4224 +     * is completed normally, with the same value, when source is.
4225 +     */
4226 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4227 +        for (boolean createIncomplete : new boolean[] { true, false })
4228 +        for (Integer v1 : new Integer[] { 1, null })
4229 +    {
4230 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4231 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4232 +        if (!createIncomplete) assertTrue(f.complete(v1));
4233 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4234 +        if (createIncomplete) {
4235 +            checkIncomplete(f);
4236 +            checkIncomplete(g);
4237 +            assertTrue(f.complete(v1));
4238 +        }
4239 +        checkCompletedNormally(f, v1);
4240 +        checkCompletedNormally(g, v1);
4241 +    }}
4242 +
4243 +    /**
4244 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4245 +     * is completed exceptionally when source is.
4246 +     */
4247 +    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4248 +        for (boolean createIncomplete : new boolean[] { true, false })
4249 +    {
4250 +        CFException ex = new CFException();
4251 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4252 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4253 +        if (!createIncomplete) f.completeExceptionally(ex);
4254 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4255 +        if (createIncomplete) {
4256 +            checkIncomplete(f);
4257 +            checkIncomplete(g);
4258 +            f.completeExceptionally(ex);
4259 +        }
4260 +        checkCompletedExceptionally(f, ex);
4261 +        checkCompletedWithWrappedException(g, ex);
4262 +    }}
4263 +
4264 +    /**
4265 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4266 +     */
4267 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4268 +        for (Integer v1 : new Integer[] { 1, null })
4269 +    {
4270 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4271 +        CompletionStage minimal = f.minimalCompletionStage();
4272 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4273 +        assertTrue(g.complete(v1));
4274 +        checkCompletedNormally(g, v1);
4275 +        checkIncomplete(f);
4276 +        checkIncomplete(minimal.toCompletableFuture());
4277 +    }}
4278 +
4279 +    /**
4280 +     * minimalStage.toCompletableFuture().join() awaits completion
4281 +     */
4282 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4283 +        for (boolean createIncomplete : new boolean[] { true, false })
4284 +        for (Integer v1 : new Integer[] { 1, null })
4285 +    {
4286 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4287 +        if (!createIncomplete) assertTrue(f.complete(v1));
4288 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4289 +        if (createIncomplete) assertTrue(f.complete(v1));
4290 +        assertEquals(v1, minimal.toCompletableFuture().join());
4291 +        assertEquals(v1, minimal.toCompletableFuture().get());
4292 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4293 +    }}
4294 +
4295 +    /**
4296 +     * Completion of a toCompletableFuture copy of a minimal stage
4297 +     * does not complete its source.
4298 +     */
4299 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4300 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4301 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4302 +        assertTrue(g.toCompletableFuture().complete(1));
4303 +        assertTrue(g.toCompletableFuture().complete(null));
4304 +        assertTrue(g.toCompletableFuture().cancel(true));
4305 +        assertTrue(g.toCompletableFuture().cancel(false));
4306 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4307 +        checkIncomplete(g.toCompletableFuture());
4308 +        f.complete(1);
4309 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4310 +    }
4311 +
4312 +    /** Demo utility method for external reliable toCompletableFuture */
4313 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4314 +        CompletableFuture<T> f = new CompletableFuture<>();
4315 +        stage.handle((T t, Throwable ex) -> {
4316 +                         if (ex != null) f.completeExceptionally(ex);
4317 +                         else f.complete(t);
4318 +                         return null;
4319 +                     });
4320 +        return f;
4321 +    }
4322 +
4323 +    /** Demo utility method to join a CompletionStage */
4324 +    static <T> T join(CompletionStage<T> stage) {
4325 +        return toCompletableFuture(stage).join();
4326 +    }
4327 +
4328 +    /**
4329 +     * Joining a minimal stage "by hand" works
4330 +     */
4331 +    public void testMinimalCompletionStage_join_by_hand() {
4332 +        for (boolean createIncomplete : new boolean[] { true, false })
4333 +        for (Integer v1 : new Integer[] { 1, null })
4334 +    {
4335 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4336 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4337 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4338 +        if (!createIncomplete) assertTrue(f.complete(v1));
4339 +        minimal.thenAccept(x -> g.complete(x));
4340 +        if (createIncomplete) assertTrue(f.complete(v1));
4341 +        g.join();
4342 +        checkCompletedNormally(g, v1);
4343 +        checkCompletedNormally(f, v1);
4344 +        assertEquals(v1, join(minimal));
4345 +    }}
4346 +
4347      static class Monad {
4348          static class ZeroException extends RuntimeException {
4349              public ZeroException() { super("monadic zero"); }
# Line 4009 | Line 4360 | public class CompletableFutureTest exten
4360          static <T,U,V> Function<T, CompletableFuture<V>> compose
4361              (Function<T, CompletableFuture<U>> f,
4362               Function<U, CompletableFuture<V>> g) {
4363 <            return (x) -> f.apply(x).thenCompose(g);
4363 >            return x -> f.apply(x).thenCompose(g);
4364          }
4365  
4366          static void assertZero(CompletableFuture<?> f) {
4367              try {
4368                  f.getNow(null);
4369 <                throw new AssertionFailedError("should throw");
4369 >                throw new AssertionError("should throw");
4370              } catch (CompletionException success) {
4371                  assertTrue(success.getCause() instanceof ZeroException);
4372              }
# Line 4089 | Line 4440 | public class CompletableFutureTest exten
4440  
4441          // Some mutually non-commutative functions
4442          Function<Long, CompletableFuture<Long>> triple
4443 <            = (x) -> Monad.unit(3 * x);
4443 >            = x -> Monad.unit(3 * x);
4444          Function<Long, CompletableFuture<Long>> inc
4445 <            = (x) -> Monad.unit(x + 1);
4445 >            = x -> Monad.unit(x + 1);
4446  
4447          // unit is a right identity: m >>= unit === m
4448          Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
# Line 4103 | Line 4454 | public class CompletableFutureTest exten
4454          // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4455          Monad.assertFutureEquals(
4456              unit.apply(5L).thenCompose(inc).thenCompose(triple),
4457 <            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4457 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4458  
4459          // The case for CompletableFuture as an additive monad is weaker...
4460  
# Line 4113 | Line 4464 | public class CompletableFutureTest exten
4464          // left zero: zero >>= f === zero
4465          Monad.assertZero(zero.thenCompose(inc));
4466          // right zero: f >>= (\x -> zero) === zero
4467 <        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4467 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4468  
4469          // f plus zero === f
4470          Monad.assertFutureEquals(Monad.unit(5L),
# Line 4140 | Line 4491 | public class CompletableFutureTest exten
4491      }
4492  
4493      /** Test long recursive chains of CompletableFutures with cascading completions */
4494 +    @SuppressWarnings("FutureReturnValueIgnored")
4495      public void testRecursiveChains() throws Throwable {
4496          for (ExecutionMode m : ExecutionMode.values())
4497          for (boolean addDeadEnds : new boolean[] { true, false })
# Line 4164 | Line 4516 | public class CompletableFutureTest exten
4516       * A single CompletableFuture with many dependents.
4517       * A demo of scalability - runtime is O(n).
4518       */
4519 +    @SuppressWarnings("FutureReturnValueIgnored")
4520      public void testManyDependents() throws Throwable {
4521          final int n = expensiveTests ? 1_000_000 : 10;
4522          final CompletableFuture<Void> head = new CompletableFuture<>();
# Line 4171 | Line 4524 | public class CompletableFutureTest exten
4524          final AtomicInteger count = new AtomicInteger(0);
4525          for (int i = 0; i < n; i++) {
4526              head.thenRun(() -> count.getAndIncrement());
4527 <            head.thenAccept((x) -> count.getAndIncrement());
4528 <            head.thenApply((x) -> count.getAndIncrement());
4527 >            head.thenAccept(x -> count.getAndIncrement());
4528 >            head.thenApply(x -> count.getAndIncrement());
4529  
4530              head.runAfterBoth(complete, () -> count.getAndIncrement());
4531              head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
# Line 4182 | Line 4535 | public class CompletableFutureTest exten
4535              complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4536  
4537              head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4538 <            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4539 <            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4538 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4539 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4540              new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4541 <            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4542 <            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4541 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4542 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4543          }
4544          head.complete(null);
4545          assertEquals(5 * 3 * n, count.get());
4546      }
4547  
4548      /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4549 +    @SuppressWarnings("FutureReturnValueIgnored")
4550      public void testCoCompletionGarbageRetention() throws Throwable {
4551          final int n = expensiveTests ? 1_000_000 : 10;
4552          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
# Line 4203 | Line 4557 | public class CompletableFutureTest exten
4557              f.complete(null);
4558  
4559              f = new CompletableFuture<>();
4560 <            f.acceptEither(incomplete, (x) -> {});
4560 >            f.acceptEither(incomplete, x -> {});
4561              f.complete(null);
4562  
4563              f = new CompletableFuture<>();
4564 <            f.applyToEither(incomplete, (x) -> x);
4564 >            f.applyToEither(incomplete, x -> x);
4565              f.complete(null);
4566  
4567              f = new CompletableFuture<>();
4568 <            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4568 >            CompletableFuture.anyOf(f, incomplete);
4569              f.complete(null);
4570          }
4571  
# Line 4221 | Line 4575 | public class CompletableFutureTest exten
4575              f.complete(null);
4576  
4577              f = new CompletableFuture<>();
4578 <            incomplete.acceptEither(f, (x) -> {});
4578 >            incomplete.acceptEither(f, x -> {});
4579              f.complete(null);
4580  
4581              f = new CompletableFuture<>();
4582 <            incomplete.applyToEither(f, (x) -> x);
4582 >            incomplete.applyToEither(f, x -> x);
4583              f.complete(null);
4584  
4585              f = new CompletableFuture<>();
4586 <            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4586 >            CompletableFuture.anyOf(incomplete, f);
4587              f.complete(null);
4588          }
4589      }
4590  
4591 <    /*
4592 <     * Tests below currently fail in stress mode due to memory retention.
4593 <     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck
4591 >    /**
4592 >     * Reproduction recipe for:
4593 >     * 8160402: Garbage retention with CompletableFuture.anyOf
4594 >     * 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
4595       */
4241
4242    /** Checks for garbage retention with anyOf. */
4596      public void testAnyOfGarbageRetention() throws Throwable {
4597          for (Integer v : new Integer[] { 1, null })
4598      {
# Line 4253 | Line 4606 | public class CompletableFutureTest exten
4606              checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4607      }}
4608  
4609 <    /** Checks for garbage retention with allOf. */
4609 >    /**
4610 >     * Checks for garbage retention with allOf.
4611 >     *
4612 >     * As of 2016-07, fails with OOME:
4613 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4614 >     */
4615      public void testCancelledAllOfGarbageRetention() throws Throwable {
4616          final int n = expensiveTests ? 100_000 : 10;
4617          CompletableFuture<Integer>[] fs
# Line 4264 | Line 4622 | public class CompletableFutureTest exten
4622              assertTrue(CompletableFuture.allOf(fs).cancel(false));
4623      }
4624  
4625 +    /**
4626 +     * Checks for garbage retention when a dependent future is
4627 +     * cancelled and garbage-collected.
4628 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4629 +     *
4630 +     * As of 2016-07, fails with OOME:
4631 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4632 +     */
4633 +    public void testCancelledGarbageRetention() throws Throwable {
4634 +        final int n = expensiveTests ? 100_000 : 10;
4635 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4636 +        for (int i = 0; i < n; i++)
4637 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4638 +    }
4639 +
4640 +    /**
4641 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4642 +     * is invoked many times.
4643 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4644 +     *
4645 +     * As of 2016-07, fails with OOME:
4646 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4647 +     */
4648 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4649 +        final int n = expensiveTests ? 900_000 : 10;
4650 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4651 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4652 +        for (int i = 0; i < n; i++)
4653 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4654 +    }
4655 +
4656   //     static <U> U join(CompletionStage<U> stage) {
4657   //         CompletableFuture<U> f = new CompletableFuture<>();
4658   //         stage.whenComplete((v, ex) -> {
# Line 4288 | Line 4677 | public class CompletableFutureTest exten
4677   //         return stage.toCompletableFuture().copy().isDone();
4678   //     }
4679  
4680 +    // For testing default implementations
4681 +    // Only non-default interface methods defined.
4682 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4683 +        final CompletableFuture<T> cf;
4684 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4685 +        public CompletableFuture<T> toCompletableFuture() {
4686 +            return cf; }
4687 +        public CompletionStage<Void> thenRun
4688 +            (Runnable action) {
4689 +            return cf.thenRun(action); }
4690 +        public CompletionStage<Void> thenRunAsync
4691 +            (Runnable action) {
4692 +            return cf.thenRunAsync(action); }
4693 +        public CompletionStage<Void> thenRunAsync
4694 +            (Runnable action,
4695 +             Executor executor) {
4696 +            return cf.thenRunAsync(action, executor); }
4697 +        public CompletionStage<Void> thenAccept
4698 +            (Consumer<? super T> action) {
4699 +            return cf.thenAccept(action); }
4700 +        public CompletionStage<Void> thenAcceptAsync
4701 +            (Consumer<? super T> action) {
4702 +            return cf.thenAcceptAsync(action); }
4703 +        public CompletionStage<Void> thenAcceptAsync
4704 +            (Consumer<? super T> action,
4705 +             Executor executor) {
4706 +            return cf.thenAcceptAsync(action, executor); }
4707 +        public <U> CompletionStage<U> thenApply
4708 +            (Function<? super T,? extends U> a) {
4709 +            return cf.thenApply(a); }
4710 +        public <U> CompletionStage<U> thenApplyAsync
4711 +            (Function<? super T,? extends U> fn) {
4712 +            return cf.thenApplyAsync(fn); }
4713 +        public <U> CompletionStage<U> thenApplyAsync
4714 +            (Function<? super T,? extends U> fn,
4715 +             Executor executor) {
4716 +            return cf.thenApplyAsync(fn, executor); }
4717 +        public <U,V> CompletionStage<V> thenCombine
4718 +            (CompletionStage<? extends U> other,
4719 +             BiFunction<? super T,? super U,? extends V> fn) {
4720 +            return cf.thenCombine(other, fn); }
4721 +        public <U,V> CompletionStage<V> thenCombineAsync
4722 +            (CompletionStage<? extends U> other,
4723 +             BiFunction<? super T,? super U,? extends V> fn) {
4724 +            return cf.thenCombineAsync(other, fn); }
4725 +        public <U,V> CompletionStage<V> thenCombineAsync
4726 +            (CompletionStage<? extends U> other,
4727 +             BiFunction<? super T,? super U,? extends V> fn,
4728 +             Executor executor) {
4729 +            return cf.thenCombineAsync(other, fn, executor); }
4730 +        public <U> CompletionStage<Void> thenAcceptBoth
4731 +            (CompletionStage<? extends U> other,
4732 +             BiConsumer<? super T, ? super U> action) {
4733 +            return cf.thenAcceptBoth(other, action); }
4734 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4735 +            (CompletionStage<? extends U> other,
4736 +             BiConsumer<? super T, ? super U> action) {
4737 +            return cf.thenAcceptBothAsync(other, action); }
4738 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4739 +            (CompletionStage<? extends U> other,
4740 +             BiConsumer<? super T, ? super U> action,
4741 +             Executor executor) {
4742 +            return cf.thenAcceptBothAsync(other, action, executor); }
4743 +        public CompletionStage<Void> runAfterBoth
4744 +            (CompletionStage<?> other,
4745 +             Runnable action) {
4746 +            return cf.runAfterBoth(other, action); }
4747 +        public CompletionStage<Void> runAfterBothAsync
4748 +            (CompletionStage<?> other,
4749 +             Runnable action) {
4750 +            return cf.runAfterBothAsync(other, action); }
4751 +        public CompletionStage<Void> runAfterBothAsync
4752 +            (CompletionStage<?> other,
4753 +             Runnable action,
4754 +             Executor executor) {
4755 +            return cf.runAfterBothAsync(other, action, executor); }
4756 +        public <U> CompletionStage<U> applyToEither
4757 +            (CompletionStage<? extends T> other,
4758 +             Function<? super T, U> fn) {
4759 +            return cf.applyToEither(other, fn); }
4760 +        public <U> CompletionStage<U> applyToEitherAsync
4761 +            (CompletionStage<? extends T> other,
4762 +             Function<? super T, U> fn) {
4763 +            return cf.applyToEitherAsync(other, fn); }
4764 +        public <U> CompletionStage<U> applyToEitherAsync
4765 +            (CompletionStage<? extends T> other,
4766 +             Function<? super T, U> fn,
4767 +             Executor executor) {
4768 +            return cf.applyToEitherAsync(other, fn, executor); }
4769 +        public CompletionStage<Void> acceptEither
4770 +            (CompletionStage<? extends T> other,
4771 +             Consumer<? super T> action) {
4772 +            return cf.acceptEither(other, action); }
4773 +        public CompletionStage<Void> acceptEitherAsync
4774 +            (CompletionStage<? extends T> other,
4775 +             Consumer<? super T> action) {
4776 +            return cf.acceptEitherAsync(other, action); }
4777 +        public CompletionStage<Void> acceptEitherAsync
4778 +            (CompletionStage<? extends T> other,
4779 +             Consumer<? super T> action,
4780 +             Executor executor) {
4781 +            return cf.acceptEitherAsync(other, action, executor); }
4782 +        public CompletionStage<Void> runAfterEither
4783 +            (CompletionStage<?> other,
4784 +             Runnable action) {
4785 +            return cf.runAfterEither(other, action); }
4786 +        public CompletionStage<Void> runAfterEitherAsync
4787 +            (CompletionStage<?> other,
4788 +             Runnable action) {
4789 +            return cf.runAfterEitherAsync(other, action); }
4790 +        public CompletionStage<Void> runAfterEitherAsync
4791 +            (CompletionStage<?> other,
4792 +             Runnable action,
4793 +             Executor executor) {
4794 +            return cf.runAfterEitherAsync(other, action, executor); }
4795 +        public <U> CompletionStage<U> thenCompose
4796 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4797 +            return cf.thenCompose(fn); }
4798 +        public <U> CompletionStage<U> thenComposeAsync
4799 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4800 +            return cf.thenComposeAsync(fn); }
4801 +        public <U> CompletionStage<U> thenComposeAsync
4802 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4803 +             Executor executor) {
4804 +            return cf.thenComposeAsync(fn, executor); }
4805 +        public <U> CompletionStage<U> handle
4806 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4807 +            return cf.handle(fn); }
4808 +        public <U> CompletionStage<U> handleAsync
4809 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4810 +            return cf.handleAsync(fn); }
4811 +        public <U> CompletionStage<U> handleAsync
4812 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4813 +             Executor executor) {
4814 +            return cf.handleAsync(fn, executor); }
4815 +        public CompletionStage<T> whenComplete
4816 +            (BiConsumer<? super T, ? super Throwable> action) {
4817 +            return cf.whenComplete(action); }
4818 +        public CompletionStage<T> whenCompleteAsync
4819 +            (BiConsumer<? super T, ? super Throwable> action) {
4820 +            return cf.whenCompleteAsync(action); }
4821 +        public CompletionStage<T> whenCompleteAsync
4822 +            (BiConsumer<? super T, ? super Throwable> action,
4823 +             Executor executor) {
4824 +            return cf.whenCompleteAsync(action, executor); }
4825 +        public CompletionStage<T> exceptionally
4826 +            (Function<Throwable, ? extends T> fn) {
4827 +            return cf.exceptionally(fn); }
4828 +    }
4829 +
4830 +    /**
4831 +     * default-implemented exceptionallyAsync action is not invoked when
4832 +     * source completes normally, and source result is propagated
4833 +     */
4834 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4835 +        for (boolean createIncomplete : new boolean[] { true, false })
4836 +        for (Integer v1 : new Integer[] { 1, null })
4837 +    {
4838 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4839 +        final DelegatedCompletionStage<Integer> d =
4840 +            new DelegatedCompletionStage<Integer>(f);
4841 +        if (!createIncomplete) assertTrue(f.complete(v1));
4842 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4843 +            ((Throwable t) -> {
4844 +                threadFail("should not be called");
4845 +                return null;            // unreached
4846 +            });
4847 +        if (createIncomplete) assertTrue(f.complete(v1));
4848 +
4849 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4850 +    }}
4851 +
4852 +    /**
4853 +     * default-implemented exceptionallyAsync action completes with
4854 +     * function value on source exception
4855 +     */
4856 +    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4857 +        for (boolean createIncomplete : new boolean[] { true, false })
4858 +        for (Integer v1 : new Integer[] { 1, null })
4859 +    {
4860 +        final AtomicInteger a = new AtomicInteger(0);
4861 +        final CFException ex = new CFException();
4862 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4863 +        final DelegatedCompletionStage<Integer> d =
4864 +            new DelegatedCompletionStage<Integer>(f);
4865 +        if (!createIncomplete) f.completeExceptionally(ex);
4866 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4867 +            ((Throwable t) -> {
4868 +                threadAssertSame(t, ex);
4869 +                a.getAndIncrement();
4870 +                return v1;
4871 +            });
4872 +        if (createIncomplete) f.completeExceptionally(ex);
4873 +
4874 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4875 +        assertEquals(1, a.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 a = 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 +                threadAssertSame(t, ex1);
4896 +                a.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, a.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