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.168 by jsr166, Mon Jul 18 17:19:01 2016 UTC vs.
Revision 1.211 by jsr166, Mon Sep 24 14:45:19 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 +        for (Integer v1 : new Integer[] { 1, null })
3203 +    {
3204 +        final CFException ex = new CFException();
3205 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3206 +        final FailingExceptionalCompletableFutureFunction r
3207 +            = new FailingExceptionalCompletableFutureFunction(m);
3208 +        if (!createIncomplete) f.completeExceptionally(ex);
3209 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3210 +        if (createIncomplete) f.completeExceptionally(ex);
3211 +
3212 +        checkCompletedExceptionally(f, ex);
3213 +        checkCompletedWithWrappedException(g, r.ex);
3214 +        r.assertInvoked();
3215 +    }}
3216 +
3217 +    /**
3218 +     * exceptionallyCompose result completes exceptionally if the
3219 +     * result of the action does
3220 +     */
3221 +    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3222 +        for (ExecutionMode m : ExecutionMode.values())
3223 +        for (int order = 0; order < 6; order++)
3224 +        for (Integer v1 : new Integer[] { 1, null })
3225 +    {
3226 +        final CFException ex0 = new CFException();
3227 +        final CFException ex = new CFException();
3228 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3229 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3230 +        final CompletableFuture<Integer> h;
3231 +        // Test all permutations of orders
3232 +        switch (order) {
3233 +        case 0:
3234 +            assertTrue(f.completeExceptionally(ex0));
3235 +            assertTrue(g.completeExceptionally(ex));
3236 +            h = m.exceptionallyCompose(f, (x -> g));
3237 +            break;
3238 +        case 1:
3239 +            assertTrue(f.completeExceptionally(ex0));
3240 +            h = m.exceptionallyCompose(f, (x -> g));
3241 +            assertTrue(g.completeExceptionally(ex));
3242 +            break;
3243 +        case 2:
3244 +            assertTrue(g.completeExceptionally(ex));
3245 +            assertTrue(f.completeExceptionally(ex0));
3246 +            h = m.exceptionallyCompose(f, (x -> g));
3247 +            break;
3248 +        case 3:
3249 +            assertTrue(g.completeExceptionally(ex));
3250 +            h = m.exceptionallyCompose(f, (x -> g));
3251 +            assertTrue(f.completeExceptionally(ex0));
3252 +            break;
3253 +        case 4:
3254 +            h = m.exceptionallyCompose(f, (x -> g));
3255 +            assertTrue(f.completeExceptionally(ex0));
3256 +            assertTrue(g.completeExceptionally(ex));
3257 +            break;
3258 +        case 5:
3259 +            h = m.exceptionallyCompose(f, (x -> g));
3260 +            assertTrue(f.completeExceptionally(ex0));
3261 +            assertTrue(g.completeExceptionally(ex));
3262 +            break;
3263 +        default: throw new AssertionError();
3264 +        }
3265 +
3266 +        checkCompletedExceptionally(g, ex);
3267 +        checkCompletedWithWrappedException(h, ex);
3268 +        checkCompletedExceptionally(f, ex0);
3269 +    }}
3270 +
3271      // other static methods
3272  
3273      /**
# Line 3239 | Line 3431 | public class CompletableFutureTest exten
3431      /**
3432       * Completion methods throw NullPointerException with null arguments
3433       */
3434 +    @SuppressWarnings("FutureReturnValueIgnored")
3435      public void testNPE() {
3436          CompletableFuture<Integer> f = new CompletableFuture<>();
3437          CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 3258 | Line 3451 | public class CompletableFutureTest exten
3451  
3452              () -> f.thenApply(null),
3453              () -> f.thenApplyAsync(null),
3454 <            () -> f.thenApplyAsync((x) -> x, null),
3454 >            () -> f.thenApplyAsync(x -> x, null),
3455              () -> f.thenApplyAsync(null, exec),
3456  
3457              () -> f.thenAccept(null),
3458              () -> f.thenAcceptAsync(null),
3459 <            () -> f.thenAcceptAsync((x) -> {} , null),
3459 >            () -> f.thenAcceptAsync(x -> {} , null),
3460              () -> f.thenAcceptAsync(null, exec),
3461  
3462              () -> f.thenRun(null),
# Line 3298 | Line 3491 | public class CompletableFutureTest exten
3491              () -> f.applyToEither(g, null),
3492              () -> f.applyToEitherAsync(g, null),
3493              () -> f.applyToEitherAsync(g, null, exec),
3494 <            () -> f.applyToEither(nullFuture, (x) -> x),
3495 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3496 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3497 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3494 >            () -> f.applyToEither(nullFuture, x -> x),
3495 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3496 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3497 >            () -> f.applyToEitherAsync(g, x -> x, null),
3498  
3499              () -> f.acceptEither(g, null),
3500              () -> f.acceptEitherAsync(g, null),
3501              () -> f.acceptEitherAsync(g, null, exec),
3502 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3503 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3504 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3505 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3502 >            () -> f.acceptEither(nullFuture, x -> {}),
3503 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3504 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3505 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3506  
3507              () -> f.runAfterEither(g, null),
3508              () -> f.runAfterEitherAsync(g, null),
# Line 3375 | Line 3568 | public class CompletableFutureTest exten
3568          for (CompletableFuture<Integer> src : srcs) {
3569              List<CompletableFuture<?>> fs = new ArrayList<>();
3570              fs.add(src.thenRunAsync(() -> {}, e));
3571 <            fs.add(src.thenAcceptAsync((z) -> {}, e));
3572 <            fs.add(src.thenApplyAsync((z) -> z, e));
3571 >            fs.add(src.thenAcceptAsync(z -> {}, e));
3572 >            fs.add(src.thenApplyAsync(z -> z, e));
3573  
3574              fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3575              fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3576              fs.add(src.runAfterBothAsync(src, () -> {}, e));
3577  
3578 <            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3579 <            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3578 >            fs.add(src.applyToEitherAsync(src, z -> z, e));
3579 >            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3580              fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3581  
3582 <            fs.add(src.thenComposeAsync((z) -> null, e));
3582 >            fs.add(src.thenComposeAsync(z -> null, e));
3583              fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3584              fs.add(src.handleAsync((z, t) -> null, e));
3585  
# Line 3419 | Line 3612 | public class CompletableFutureTest exten
3612          {
3613              List<CompletableFuture<?>> fs = new ArrayList<>();
3614  
3615 <            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3616 <            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3615 >            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3616 >            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3617  
3618 <            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3619 <            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3618 >            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3619 >            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3620  
3621              fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3622              fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
# Line 3462 | Line 3655 | public class CompletableFutureTest exten
3655  
3656          List<CompletableFuture<?>> fs = new ArrayList<>();
3657          fs.add(incomplete.thenRunAsync(() -> {}, e));
3658 <        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3659 <        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3658 >        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3659 >        fs.add(incomplete.thenApplyAsync(z -> z, e));
3660  
3661          fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3662          fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3663          fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3664  
3665 <        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3666 <        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3665 >        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3666 >        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3667          fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3668  
3669 <        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3669 >        fs.add(incomplete.thenComposeAsync(z -> null, e));
3670          fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3671          fs.add(incomplete.handleAsync((z, t) -> null, e));
3672  
# Line 3533 | Line 3726 | public class CompletableFutureTest exten
3726       */
3727      public void testCompletedStage() {
3728          AtomicInteger x = new AtomicInteger(0);
3729 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3729 >        AtomicReference<Throwable> r = new AtomicReference<>();
3730          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3731          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3732          assertEquals(x.get(), 1);
# Line 3578 | Line 3771 | public class CompletableFutureTest exten
3771       * copy returns a CompletableFuture that is completed normally,
3772       * with the same value, when source is.
3773       */
3774 <    public void testCopy() {
3774 >    public void testCopy_normalCompletion() {
3775 >        for (boolean createIncomplete : new boolean[] { true, false })
3776 >        for (Integer v1 : new Integer[] { 1, null })
3777 >    {
3778          CompletableFuture<Integer> f = new CompletableFuture<>();
3779 +        if (!createIncomplete) assertTrue(f.complete(v1));
3780          CompletableFuture<Integer> g = f.copy();
3781 <        checkIncomplete(f);
3782 <        checkIncomplete(g);
3783 <        f.complete(1);
3784 <        checkCompletedNormally(f, 1);
3785 <        checkCompletedNormally(g, 1);
3786 <    }
3781 >        if (createIncomplete) {
3782 >            checkIncomplete(f);
3783 >            checkIncomplete(g);
3784 >            assertTrue(f.complete(v1));
3785 >        }
3786 >        checkCompletedNormally(f, v1);
3787 >        checkCompletedNormally(g, v1);
3788 >    }}
3789  
3790      /**
3791       * copy returns a CompletableFuture that is completed exceptionally
3792       * when source is.
3793       */
3794 <    public void testCopy2() {
3794 >    public void testCopy_exceptionalCompletion() {
3795 >        for (boolean createIncomplete : new boolean[] { true, false })
3796 >    {
3797 >        CFException ex = new CFException();
3798          CompletableFuture<Integer> f = new CompletableFuture<>();
3799 +        if (!createIncomplete) f.completeExceptionally(ex);
3800          CompletableFuture<Integer> g = f.copy();
3801 <        checkIncomplete(f);
3802 <        checkIncomplete(g);
3803 <        CFException ex = new CFException();
3804 <        f.completeExceptionally(ex);
3801 >        if (createIncomplete) {
3802 >            checkIncomplete(f);
3803 >            checkIncomplete(g);
3804 >            f.completeExceptionally(ex);
3805 >        }
3806          checkCompletedExceptionally(f, ex);
3807          checkCompletedWithWrappedException(g, ex);
3808 +    }}
3809 +
3810 +    /**
3811 +     * Completion of a copy does not complete its source.
3812 +     */
3813 +    public void testCopy_oneWayPropagation() {
3814 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3815 +        assertTrue(f.copy().complete(1));
3816 +        assertTrue(f.copy().complete(null));
3817 +        assertTrue(f.copy().cancel(true));
3818 +        assertTrue(f.copy().cancel(false));
3819 +        assertTrue(f.copy().completeExceptionally(new CFException()));
3820 +        checkIncomplete(f);
3821      }
3822  
3823      /**
# Line 3611 | Line 3828 | public class CompletableFutureTest exten
3828          CompletableFuture<Integer> f = new CompletableFuture<>();
3829          CompletionStage<Integer> g = f.minimalCompletionStage();
3830          AtomicInteger x = new AtomicInteger(0);
3831 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3831 >        AtomicReference<Throwable> r = new AtomicReference<>();
3832          checkIncomplete(f);
3833          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3834          f.complete(1);
# Line 3628 | Line 3845 | public class CompletableFutureTest exten
3845          CompletableFuture<Integer> f = new CompletableFuture<>();
3846          CompletionStage<Integer> g = f.minimalCompletionStage();
3847          AtomicInteger x = new AtomicInteger(0);
3848 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3848 >        AtomicReference<Throwable> r = new AtomicReference<>();
3849          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3850          checkIncomplete(f);
3851          CFException ex = new CFException();
# Line 3646 | Line 3863 | public class CompletableFutureTest exten
3863          CFException ex = new CFException();
3864          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3865          AtomicInteger x = new AtomicInteger(0);
3866 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3866 >        AtomicReference<Throwable> r = new AtomicReference<>();
3867          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3868          assertEquals(x.get(), 0);
3869          assertEquals(r.get(), ex);
# Line 3670 | Line 3887 | public class CompletableFutureTest exten
3887      public void testCompleteAsync2() {
3888          CompletableFuture<Integer> f = new CompletableFuture<>();
3889          CFException ex = new CFException();
3890 <        f.completeAsync(() -> {if (true) throw ex; return 1;});
3890 >        f.completeAsync(() -> { throw ex; });
3891          try {
3892              f.join();
3893              shouldThrow();
# Line 3700 | Line 3917 | public class CompletableFutureTest exten
3917          CompletableFuture<Integer> f = new CompletableFuture<>();
3918          CFException ex = new CFException();
3919          ThreadExecutor executor = new ThreadExecutor();
3920 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3920 >        f.completeAsync(() -> { throw ex; }, executor);
3921          try {
3922              f.join();
3923              shouldThrow();
# Line 3859 | Line 4076 | public class CompletableFutureTest exten
4076          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4077              = new ArrayList<>();
4078  
4079 <        funs.add((y) -> m.thenRun(y, noopRunnable));
4080 <        funs.add((y) -> m.thenAccept(y, noopConsumer));
4081 <        funs.add((y) -> m.thenApply(y, incFunction));
4082 <
4083 <        funs.add((y) -> m.runAfterEither(y, incomplete, noopRunnable));
4084 <        funs.add((y) -> m.acceptEither(y, incomplete, noopConsumer));
4085 <        funs.add((y) -> m.applyToEither(y, incomplete, incFunction));
4086 <
4087 <        funs.add((y) -> m.runAfterBoth(y, v42, noopRunnable));
4088 <        funs.add((y) -> m.runAfterBoth(v42, y, noopRunnable));
4089 <        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4090 <        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4091 <        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
4092 <        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
4093 <
4094 <        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4095 <
4096 <        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
4097 <
4098 <        funs.add((y) -> CompletableFuture.allOf(y));
4099 <        funs.add((y) -> CompletableFuture.allOf(y, v42));
4100 <        funs.add((y) -> CompletableFuture.allOf(v42, y));
4101 <        funs.add((y) -> CompletableFuture.anyOf(y));
4102 <        funs.add((y) -> CompletableFuture.anyOf(y, incomplete));
4103 <        funs.add((y) -> CompletableFuture.anyOf(incomplete, y));
4079 >        funs.add(y -> m.thenRun(y, noopRunnable));
4080 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4081 >        funs.add(y -> m.thenApply(y, incFunction));
4082 >
4083 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4084 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4085 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4086 >
4087 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4088 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4089 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4090 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4091 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4092 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4093 >
4094 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4095 >
4096 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4097 >
4098 >        funs.add(y -> CompletableFuture.allOf(y));
4099 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4100 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4101 >        funs.add(y -> CompletableFuture.anyOf(y));
4102 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4103 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4104  
4105          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4106                   fun : funs) {
# Line 3940 | Line 4157 | public class CompletableFutureTest exten
4157      public void testMinimalCompletionStage_minimality() {
4158          if (!testImplementationDetails) return;
4159          Function<Method, String> toSignature =
4160 <            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
4160 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4161          Predicate<Method> isNotStatic =
4162 <            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
4162 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4163          List<Method> minimalMethods =
4164              Stream.of(Object.class, CompletionStage.class)
4165 <            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
4165 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4166              .filter(isNotStatic)
4167              .collect(Collectors.toList());
4168          // Methods from CompletableFuture permitted NOT to throw UOE
# Line 3961 | Line 4178 | public class CompletableFutureTest exten
4178              .collect(Collectors.toSet());
4179          List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4180              .filter(isNotStatic)
4181 <            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4181 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4182              .collect(Collectors.toList());
4183  
4184          List<CompletionStage<Integer>> stages = new ArrayList<>();
4185 <        stages.add(new CompletableFuture<Integer>().minimalCompletionStage());
4185 >        CompletionStage<Integer> min =
4186 >            new CompletableFuture<Integer>().minimalCompletionStage();
4187 >        stages.add(min);
4188 >        stages.add(min.thenApply(x -> x));
4189          stages.add(CompletableFuture.completedStage(1));
4190          stages.add(CompletableFuture.failedStage(new CFException()));
4191  
# Line 4001 | Line 4221 | public class CompletableFutureTest exten
4221              throw new Error("Methods did not throw UOE: " + bugs);
4222      }
4223  
4224 +    /**
4225 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4226 +     * is completed normally, with the same value, when source is.
4227 +     */
4228 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4229 +        for (boolean createIncomplete : new boolean[] { true, false })
4230 +        for (Integer v1 : new Integer[] { 1, null })
4231 +    {
4232 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4233 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4234 +        if (!createIncomplete) assertTrue(f.complete(v1));
4235 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4236 +        if (createIncomplete) {
4237 +            checkIncomplete(f);
4238 +            checkIncomplete(g);
4239 +            assertTrue(f.complete(v1));
4240 +        }
4241 +        checkCompletedNormally(f, v1);
4242 +        checkCompletedNormally(g, v1);
4243 +    }}
4244 +
4245 +    /**
4246 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4247 +     * is completed exceptionally when source is.
4248 +     */
4249 +    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4250 +        for (boolean createIncomplete : new boolean[] { true, false })
4251 +    {
4252 +        CFException ex = new CFException();
4253 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4254 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4255 +        if (!createIncomplete) f.completeExceptionally(ex);
4256 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4257 +        if (createIncomplete) {
4258 +            checkIncomplete(f);
4259 +            checkIncomplete(g);
4260 +            f.completeExceptionally(ex);
4261 +        }
4262 +        checkCompletedExceptionally(f, ex);
4263 +        checkCompletedWithWrappedException(g, ex);
4264 +    }}
4265 +
4266 +    /**
4267 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4268 +     */
4269 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4270 +        for (Integer v1 : new Integer[] { 1, null })
4271 +    {
4272 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4273 +        CompletionStage minimal = f.minimalCompletionStage();
4274 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4275 +        assertTrue(g.complete(v1));
4276 +        checkCompletedNormally(g, v1);
4277 +        checkIncomplete(f);
4278 +        checkIncomplete(minimal.toCompletableFuture());
4279 +    }}
4280 +
4281 +    /**
4282 +     * minimalStage.toCompletableFuture().join() awaits completion
4283 +     */
4284 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4285 +        for (boolean createIncomplete : new boolean[] { true, false })
4286 +        for (Integer v1 : new Integer[] { 1, null })
4287 +    {
4288 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4289 +        if (!createIncomplete) assertTrue(f.complete(v1));
4290 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4291 +        if (createIncomplete) assertTrue(f.complete(v1));
4292 +        assertEquals(v1, minimal.toCompletableFuture().join());
4293 +        assertEquals(v1, minimal.toCompletableFuture().get());
4294 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4295 +    }}
4296 +
4297 +    /**
4298 +     * Completion of a toCompletableFuture copy of a minimal stage
4299 +     * does not complete its source.
4300 +     */
4301 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4302 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4303 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4304 +        assertTrue(g.toCompletableFuture().complete(1));
4305 +        assertTrue(g.toCompletableFuture().complete(null));
4306 +        assertTrue(g.toCompletableFuture().cancel(true));
4307 +        assertTrue(g.toCompletableFuture().cancel(false));
4308 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4309 +        checkIncomplete(g.toCompletableFuture());
4310 +        f.complete(1);
4311 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4312 +    }
4313 +
4314 +    /** Demo utility method for external reliable toCompletableFuture */
4315 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4316 +        CompletableFuture<T> f = new CompletableFuture<>();
4317 +        stage.handle((T t, Throwable ex) -> {
4318 +                         if (ex != null) f.completeExceptionally(ex);
4319 +                         else f.complete(t);
4320 +                         return null;
4321 +                     });
4322 +        return f;
4323 +    }
4324 +
4325 +    /** Demo utility method to join a CompletionStage */
4326 +    static <T> T join(CompletionStage<T> stage) {
4327 +        return toCompletableFuture(stage).join();
4328 +    }
4329 +
4330 +    /**
4331 +     * Joining a minimal stage "by hand" works
4332 +     */
4333 +    public void testMinimalCompletionStage_join_by_hand() {
4334 +        for (boolean createIncomplete : new boolean[] { true, false })
4335 +        for (Integer v1 : new Integer[] { 1, null })
4336 +    {
4337 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4338 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4339 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4340 +        if (!createIncomplete) assertTrue(f.complete(v1));
4341 +        minimal.thenAccept(x -> g.complete(x));
4342 +        if (createIncomplete) assertTrue(f.complete(v1));
4343 +        g.join();
4344 +        checkCompletedNormally(g, v1);
4345 +        checkCompletedNormally(f, v1);
4346 +        assertEquals(v1, join(minimal));
4347 +    }}
4348 +
4349      static class Monad {
4350          static class ZeroException extends RuntimeException {
4351              public ZeroException() { super("monadic zero"); }
# Line 4017 | Line 4362 | public class CompletableFutureTest exten
4362          static <T,U,V> Function<T, CompletableFuture<V>> compose
4363              (Function<T, CompletableFuture<U>> f,
4364               Function<U, CompletableFuture<V>> g) {
4365 <            return (x) -> f.apply(x).thenCompose(g);
4365 >            return x -> f.apply(x).thenCompose(g);
4366          }
4367  
4368          static void assertZero(CompletableFuture<?> f) {
4369              try {
4370                  f.getNow(null);
4371 <                throw new AssertionFailedError("should throw");
4371 >                throw new AssertionError("should throw");
4372              } catch (CompletionException success) {
4373                  assertTrue(success.getCause() instanceof ZeroException);
4374              }
# Line 4097 | Line 4442 | public class CompletableFutureTest exten
4442  
4443          // Some mutually non-commutative functions
4444          Function<Long, CompletableFuture<Long>> triple
4445 <            = (x) -> Monad.unit(3 * x);
4445 >            = x -> Monad.unit(3 * x);
4446          Function<Long, CompletableFuture<Long>> inc
4447 <            = (x) -> Monad.unit(x + 1);
4447 >            = x -> Monad.unit(x + 1);
4448  
4449          // unit is a right identity: m >>= unit === m
4450          Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
# Line 4111 | Line 4456 | public class CompletableFutureTest exten
4456          // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4457          Monad.assertFutureEquals(
4458              unit.apply(5L).thenCompose(inc).thenCompose(triple),
4459 <            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4459 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4460  
4461          // The case for CompletableFuture as an additive monad is weaker...
4462  
# Line 4121 | Line 4466 | public class CompletableFutureTest exten
4466          // left zero: zero >>= f === zero
4467          Monad.assertZero(zero.thenCompose(inc));
4468          // right zero: f >>= (\x -> zero) === zero
4469 <        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4469 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4470  
4471          // f plus zero === f
4472          Monad.assertFutureEquals(Monad.unit(5L),
# Line 4148 | Line 4493 | public class CompletableFutureTest exten
4493      }
4494  
4495      /** Test long recursive chains of CompletableFutures with cascading completions */
4496 +    @SuppressWarnings("FutureReturnValueIgnored")
4497      public void testRecursiveChains() throws Throwable {
4498          for (ExecutionMode m : ExecutionMode.values())
4499          for (boolean addDeadEnds : new boolean[] { true, false })
# Line 4172 | Line 4518 | public class CompletableFutureTest exten
4518       * A single CompletableFuture with many dependents.
4519       * A demo of scalability - runtime is O(n).
4520       */
4521 +    @SuppressWarnings("FutureReturnValueIgnored")
4522      public void testManyDependents() throws Throwable {
4523          final int n = expensiveTests ? 1_000_000 : 10;
4524          final CompletableFuture<Void> head = new CompletableFuture<>();
# Line 4179 | Line 4526 | public class CompletableFutureTest exten
4526          final AtomicInteger count = new AtomicInteger(0);
4527          for (int i = 0; i < n; i++) {
4528              head.thenRun(() -> count.getAndIncrement());
4529 <            head.thenAccept((x) -> count.getAndIncrement());
4530 <            head.thenApply((x) -> count.getAndIncrement());
4529 >            head.thenAccept(x -> count.getAndIncrement());
4530 >            head.thenApply(x -> count.getAndIncrement());
4531  
4532              head.runAfterBoth(complete, () -> count.getAndIncrement());
4533              head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
# Line 4190 | Line 4537 | public class CompletableFutureTest exten
4537              complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4538  
4539              head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4540 <            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4541 <            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4540 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4541 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4542              new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4543 <            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4544 <            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4543 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4544 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4545          }
4546          head.complete(null);
4547          assertEquals(5 * 3 * n, count.get());
4548      }
4549  
4550      /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4551 +    @SuppressWarnings("FutureReturnValueIgnored")
4552      public void testCoCompletionGarbageRetention() throws Throwable {
4553          final int n = expensiveTests ? 1_000_000 : 10;
4554          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
# Line 4211 | Line 4559 | public class CompletableFutureTest exten
4559              f.complete(null);
4560  
4561              f = new CompletableFuture<>();
4562 <            f.acceptEither(incomplete, (x) -> {});
4562 >            f.acceptEither(incomplete, x -> {});
4563              f.complete(null);
4564  
4565              f = new CompletableFuture<>();
4566 <            f.applyToEither(incomplete, (x) -> x);
4566 >            f.applyToEither(incomplete, x -> x);
4567              f.complete(null);
4568  
4569              f = new CompletableFuture<>();
4570 <            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4570 >            CompletableFuture.anyOf(f, incomplete);
4571              f.complete(null);
4572          }
4573  
# Line 4229 | Line 4577 | public class CompletableFutureTest exten
4577              f.complete(null);
4578  
4579              f = new CompletableFuture<>();
4580 <            incomplete.acceptEither(f, (x) -> {});
4580 >            incomplete.acceptEither(f, x -> {});
4581              f.complete(null);
4582  
4583              f = new CompletableFuture<>();
4584 <            incomplete.applyToEither(f, (x) -> x);
4584 >            incomplete.applyToEither(f, x -> x);
4585              f.complete(null);
4586  
4587              f = new CompletableFuture<>();
4588 <            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4588 >            CompletableFuture.anyOf(incomplete, f);
4589              f.complete(null);
4590          }
4591      }
4592  
4593      /**
4594 <     * Checks for garbage retention with anyOf.
4595 <     * Following used to fail with OOME:
4596 <     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testAnyOfGarbageRetention tck
4594 >     * Reproduction recipe for:
4595 >     * 8160402: Garbage retention with CompletableFuture.anyOf
4596 >     * 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
4597       */
4598      public void testAnyOfGarbageRetention() throws Throwable {
4599          for (Integer v : new Integer[] { 1, null })
# Line 4279 | Line 4627 | public class CompletableFutureTest exten
4627      /**
4628       * Checks for garbage retention when a dependent future is
4629       * cancelled and garbage-collected.
4630 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4631       *
4632       * As of 2016-07, fails with OOME:
4633       * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
# Line 4290 | Line 4639 | public class CompletableFutureTest exten
4639              assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4640      }
4641  
4642 +    /**
4643 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4644 +     * is invoked many times.
4645 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4646 +     *
4647 +     * As of 2016-07, fails with OOME:
4648 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4649 +     */
4650 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4651 +        final int n = expensiveTests ? 900_000 : 10;
4652 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4653 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4654 +        for (int i = 0; i < n; i++)
4655 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4656 +    }
4657 +
4658   //     static <U> U join(CompletionStage<U> stage) {
4659   //         CompletableFuture<U> f = new CompletableFuture<>();
4660   //         stage.whenComplete((v, ex) -> {
# Line 4314 | Line 4679 | public class CompletableFutureTest exten
4679   //         return stage.toCompletableFuture().copy().isDone();
4680   //     }
4681  
4682 +    // For testing default implementations
4683 +    // Only non-default interface methods defined.
4684 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4685 +        final CompletableFuture<T> cf;
4686 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4687 +        public CompletableFuture<T> toCompletableFuture() {
4688 +            return cf; }
4689 +        public CompletionStage<Void> thenRun
4690 +            (Runnable action) {
4691 +            return cf.thenRun(action); }
4692 +        public CompletionStage<Void> thenRunAsync
4693 +            (Runnable action) {
4694 +            return cf.thenRunAsync(action); }
4695 +        public CompletionStage<Void> thenRunAsync
4696 +            (Runnable action,
4697 +             Executor executor) {
4698 +            return cf.thenRunAsync(action, executor); }
4699 +        public CompletionStage<Void> thenAccept
4700 +            (Consumer<? super T> action) {
4701 +            return cf.thenAccept(action); }
4702 +        public CompletionStage<Void> thenAcceptAsync
4703 +            (Consumer<? super T> action) {
4704 +            return cf.thenAcceptAsync(action); }
4705 +        public CompletionStage<Void> thenAcceptAsync
4706 +            (Consumer<? super T> action,
4707 +             Executor executor) {
4708 +            return cf.thenAcceptAsync(action, executor); }
4709 +        public <U> CompletionStage<U> thenApply
4710 +            (Function<? super T,? extends U> a) {
4711 +            return cf.thenApply(a); }
4712 +        public <U> CompletionStage<U> thenApplyAsync
4713 +            (Function<? super T,? extends U> fn) {
4714 +            return cf.thenApplyAsync(fn); }
4715 +        public <U> CompletionStage<U> thenApplyAsync
4716 +            (Function<? super T,? extends U> fn,
4717 +             Executor executor) {
4718 +            return cf.thenApplyAsync(fn, executor); }
4719 +        public <U,V> CompletionStage<V> thenCombine
4720 +            (CompletionStage<? extends U> other,
4721 +             BiFunction<? super T,? super U,? extends V> fn) {
4722 +            return cf.thenCombine(other, fn); }
4723 +        public <U,V> CompletionStage<V> thenCombineAsync
4724 +            (CompletionStage<? extends U> other,
4725 +             BiFunction<? super T,? super U,? extends V> fn) {
4726 +            return cf.thenCombineAsync(other, fn); }
4727 +        public <U,V> CompletionStage<V> thenCombineAsync
4728 +            (CompletionStage<? extends U> other,
4729 +             BiFunction<? super T,? super U,? extends V> fn,
4730 +             Executor executor) {
4731 +            return cf.thenCombineAsync(other, fn, executor); }
4732 +        public <U> CompletionStage<Void> thenAcceptBoth
4733 +            (CompletionStage<? extends U> other,
4734 +             BiConsumer<? super T, ? super U> action) {
4735 +            return cf.thenAcceptBoth(other, action); }
4736 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4737 +            (CompletionStage<? extends U> other,
4738 +             BiConsumer<? super T, ? super U> action) {
4739 +            return cf.thenAcceptBothAsync(other, action); }
4740 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4741 +            (CompletionStage<? extends U> other,
4742 +             BiConsumer<? super T, ? super U> action,
4743 +             Executor executor) {
4744 +            return cf.thenAcceptBothAsync(other, action, executor); }
4745 +        public CompletionStage<Void> runAfterBoth
4746 +            (CompletionStage<?> other,
4747 +             Runnable action) {
4748 +            return cf.runAfterBoth(other, action); }
4749 +        public CompletionStage<Void> runAfterBothAsync
4750 +            (CompletionStage<?> other,
4751 +             Runnable action) {
4752 +            return cf.runAfterBothAsync(other, action); }
4753 +        public CompletionStage<Void> runAfterBothAsync
4754 +            (CompletionStage<?> other,
4755 +             Runnable action,
4756 +             Executor executor) {
4757 +            return cf.runAfterBothAsync(other, action, executor); }
4758 +        public <U> CompletionStage<U> applyToEither
4759 +            (CompletionStage<? extends T> other,
4760 +             Function<? super T, U> fn) {
4761 +            return cf.applyToEither(other, fn); }
4762 +        public <U> CompletionStage<U> applyToEitherAsync
4763 +            (CompletionStage<? extends T> other,
4764 +             Function<? super T, U> fn) {
4765 +            return cf.applyToEitherAsync(other, fn); }
4766 +        public <U> CompletionStage<U> applyToEitherAsync
4767 +            (CompletionStage<? extends T> other,
4768 +             Function<? super T, U> fn,
4769 +             Executor executor) {
4770 +            return cf.applyToEitherAsync(other, fn, executor); }
4771 +        public CompletionStage<Void> acceptEither
4772 +            (CompletionStage<? extends T> other,
4773 +             Consumer<? super T> action) {
4774 +            return cf.acceptEither(other, action); }
4775 +        public CompletionStage<Void> acceptEitherAsync
4776 +            (CompletionStage<? extends T> other,
4777 +             Consumer<? super T> action) {
4778 +            return cf.acceptEitherAsync(other, action); }
4779 +        public CompletionStage<Void> acceptEitherAsync
4780 +            (CompletionStage<? extends T> other,
4781 +             Consumer<? super T> action,
4782 +             Executor executor) {
4783 +            return cf.acceptEitherAsync(other, action, executor); }
4784 +        public CompletionStage<Void> runAfterEither
4785 +            (CompletionStage<?> other,
4786 +             Runnable action) {
4787 +            return cf.runAfterEither(other, action); }
4788 +        public CompletionStage<Void> runAfterEitherAsync
4789 +            (CompletionStage<?> other,
4790 +             Runnable action) {
4791 +            return cf.runAfterEitherAsync(other, action); }
4792 +        public CompletionStage<Void> runAfterEitherAsync
4793 +            (CompletionStage<?> other,
4794 +             Runnable action,
4795 +             Executor executor) {
4796 +            return cf.runAfterEitherAsync(other, action, executor); }
4797 +        public <U> CompletionStage<U> thenCompose
4798 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4799 +            return cf.thenCompose(fn); }
4800 +        public <U> CompletionStage<U> thenComposeAsync
4801 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4802 +            return cf.thenComposeAsync(fn); }
4803 +        public <U> CompletionStage<U> thenComposeAsync
4804 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4805 +             Executor executor) {
4806 +            return cf.thenComposeAsync(fn, executor); }
4807 +        public <U> CompletionStage<U> handle
4808 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4809 +            return cf.handle(fn); }
4810 +        public <U> CompletionStage<U> handleAsync
4811 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4812 +            return cf.handleAsync(fn); }
4813 +        public <U> CompletionStage<U> handleAsync
4814 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4815 +             Executor executor) {
4816 +            return cf.handleAsync(fn, executor); }
4817 +        public CompletionStage<T> whenComplete
4818 +            (BiConsumer<? super T, ? super Throwable> action) {
4819 +            return cf.whenComplete(action); }
4820 +        public CompletionStage<T> whenCompleteAsync
4821 +            (BiConsumer<? super T, ? super Throwable> action) {
4822 +            return cf.whenCompleteAsync(action); }
4823 +        public CompletionStage<T> whenCompleteAsync
4824 +            (BiConsumer<? super T, ? super Throwable> action,
4825 +             Executor executor) {
4826 +            return cf.whenCompleteAsync(action, executor); }
4827 +        public CompletionStage<T> exceptionally
4828 +            (Function<Throwable, ? extends T> fn) {
4829 +            return cf.exceptionally(fn); }
4830 +    }
4831 +
4832 +    /**
4833 +     * default-implemented exceptionallyAsync action is not invoked when
4834 +     * source completes normally, and source result is propagated
4835 +     */
4836 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4837 +        for (boolean createIncomplete : new boolean[] { true, false })
4838 +        for (Integer v1 : new Integer[] { 1, null })
4839 +    {
4840 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4841 +        final DelegatedCompletionStage<Integer> d =
4842 +            new DelegatedCompletionStage<Integer>(f);
4843 +        if (!createIncomplete) assertTrue(f.complete(v1));
4844 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4845 +            ((Throwable t) -> {
4846 +                threadFail("should not be called");
4847 +                return null;            // unreached
4848 +            });
4849 +        if (createIncomplete) assertTrue(f.complete(v1));
4850 +
4851 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4852 +    }}
4853 +
4854 +    /**
4855 +     * default-implemented exceptionallyAsync action completes with
4856 +     * function value on source exception
4857 +     */
4858 +    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4859 +        for (boolean createIncomplete : new boolean[] { true, false })
4860 +        for (Integer v1 : new Integer[] { 1, null })
4861 +    {
4862 +        final AtomicInteger a = new AtomicInteger(0);
4863 +        final CFException ex = new CFException();
4864 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4865 +        final DelegatedCompletionStage<Integer> d =
4866 +            new DelegatedCompletionStage<Integer>(f);
4867 +        if (!createIncomplete) f.completeExceptionally(ex);
4868 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4869 +            ((Throwable t) -> {
4870 +                threadAssertSame(t, ex);
4871 +                a.getAndIncrement();
4872 +                return v1;
4873 +            });
4874 +        if (createIncomplete) f.completeExceptionally(ex);
4875 +
4876 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4877 +        assertEquals(1, a.get());
4878 +    }}
4879 +
4880 +    /**
4881 +     * Under default implementation, if an "exceptionally action"
4882 +     * throws an exception, it completes exceptionally with that
4883 +     * exception
4884 +     */
4885 +    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4886 +        for (boolean createIncomplete : new boolean[] { true, false })
4887 +    {
4888 +        final AtomicInteger a = new AtomicInteger(0);
4889 +        final CFException ex1 = new CFException();
4890 +        final CFException ex2 = new CFException();
4891 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4892 +        final DelegatedCompletionStage<Integer> d =
4893 +            new DelegatedCompletionStage<Integer>(f);
4894 +        if (!createIncomplete) f.completeExceptionally(ex1);
4895 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4896 +            ((Throwable t) -> {
4897 +                threadAssertSame(t, ex1);
4898 +                a.getAndIncrement();
4899 +                throw ex2;
4900 +            });
4901 +        if (createIncomplete) f.completeExceptionally(ex1);
4902 +
4903 +        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4904 +        checkCompletedExceptionally(f, ex1);
4905 +        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4906 +        assertEquals(1, a.get());
4907 +    }}
4908 +
4909 +    /**
4910 +     * default exceptionallyCompose result completes normally after normal
4911 +     * completion of source
4912 +     */
4913 +    public void testDefaultExceptionallyCompose_normalCompletion() {
4914 +        for (boolean createIncomplete : new boolean[] { true, false })
4915 +        for (Integer v1 : new Integer[] { 1, null })
4916 +    {
4917 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4918 +        final ExceptionalCompletableFutureFunction r =
4919 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4920 +        final DelegatedCompletionStage<Integer> d =
4921 +            new DelegatedCompletionStage<Integer>(f);
4922 +        if (!createIncomplete) assertTrue(f.complete(v1));
4923 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4924 +        if (createIncomplete) assertTrue(f.complete(v1));
4925 +
4926 +        checkCompletedNormally(f, v1);
4927 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4928 +        r.assertNotInvoked();
4929 +    }}
4930 +
4931 +    /**
4932 +     * default-implemented exceptionallyCompose result completes
4933 +     * normally after exceptional completion of source
4934 +     */
4935 +    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4936 +        for (boolean createIncomplete : new boolean[] { true, false })
4937 +    {
4938 +        final CFException ex = new CFException();
4939 +        final ExceptionalCompletableFutureFunction r =
4940 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4941 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4942 +        final DelegatedCompletionStage<Integer> d =
4943 +            new DelegatedCompletionStage<Integer>(f);
4944 +        if (!createIncomplete) f.completeExceptionally(ex);
4945 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4946 +        if (createIncomplete) f.completeExceptionally(ex);
4947 +
4948 +        checkCompletedExceptionally(f, ex);
4949 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4950 +        r.assertInvoked();
4951 +    }}
4952 +
4953 +    /**
4954 +     * default-implemented exceptionallyCompose completes
4955 +     * exceptionally on exception if action does
4956 +     */
4957 +    public void testDefaultExceptionallyCompose_actionFailed() {
4958 +        for (boolean createIncomplete : new boolean[] { true, false })
4959 +        for (Integer v1 : new Integer[] { 1, null })
4960 +    {
4961 +        final CFException ex = new CFException();
4962 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4963 +        final FailingExceptionalCompletableFutureFunction r
4964 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4965 +        final DelegatedCompletionStage<Integer> d =
4966 +            new DelegatedCompletionStage<Integer>(f);
4967 +        if (!createIncomplete) f.completeExceptionally(ex);
4968 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4969 +        if (createIncomplete) f.completeExceptionally(ex);
4970 +
4971 +        checkCompletedExceptionally(f, ex);
4972 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4973 +        r.assertInvoked();
4974 +    }}
4975 +
4976 +    /**
4977 +     * default exceptionallyComposeAsync result completes normally after normal
4978 +     * completion of source
4979 +     */
4980 +    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4981 +        for (boolean createIncomplete : new boolean[] { true, false })
4982 +        for (Integer v1 : new Integer[] { 1, null })
4983 +    {
4984 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4985 +        final ExceptionalCompletableFutureFunction r =
4986 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4987 +        final DelegatedCompletionStage<Integer> d =
4988 +            new DelegatedCompletionStage<Integer>(f);
4989 +        if (!createIncomplete) assertTrue(f.complete(v1));
4990 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4991 +        if (createIncomplete) assertTrue(f.complete(v1));
4992 +
4993 +        checkCompletedNormally(f, v1);
4994 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4995 +        r.assertNotInvoked();
4996 +    }}
4997 +
4998 +    /**
4999 +     * default-implemented exceptionallyComposeAsync result completes
5000 +     * normally after exceptional completion of source
5001 +     */
5002 +    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
5003 +        for (boolean createIncomplete : new boolean[] { true, false })
5004 +    {
5005 +        final CFException ex = new CFException();
5006 +        final ExceptionalCompletableFutureFunction r =
5007 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5008 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5009 +        final DelegatedCompletionStage<Integer> d =
5010 +            new DelegatedCompletionStage<Integer>(f);
5011 +        if (!createIncomplete) f.completeExceptionally(ex);
5012 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5013 +        if (createIncomplete) f.completeExceptionally(ex);
5014 +
5015 +        checkCompletedExceptionally(f, ex);
5016 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5017 +        r.assertInvoked();
5018 +    }}
5019 +
5020 +    /**
5021 +     * default-implemented exceptionallyComposeAsync completes
5022 +     * exceptionally on exception if action does
5023 +     */
5024 +    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5025 +        for (boolean createIncomplete : new boolean[] { true, false })
5026 +        for (Integer v1 : new Integer[] { 1, null })
5027 +    {
5028 +        final CFException ex = new CFException();
5029 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5030 +        final FailingExceptionalCompletableFutureFunction r
5031 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5032 +        final DelegatedCompletionStage<Integer> d =
5033 +            new DelegatedCompletionStage<Integer>(f);
5034 +        if (!createIncomplete) f.completeExceptionally(ex);
5035 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5036 +        if (createIncomplete) f.completeExceptionally(ex);
5037 +
5038 +        checkCompletedExceptionally(f, ex);
5039 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5040 +        r.assertInvoked();
5041 +    }}
5042 +
5043 +
5044 +    /**
5045 +     * default exceptionallyComposeAsync result completes normally after normal
5046 +     * completion of source
5047 +     */
5048 +    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5049 +        for (boolean createIncomplete : new boolean[] { true, false })
5050 +        for (Integer v1 : new Integer[] { 1, null })
5051 +    {
5052 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5053 +        final ExceptionalCompletableFutureFunction r =
5054 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5055 +        final DelegatedCompletionStage<Integer> d =
5056 +            new DelegatedCompletionStage<Integer>(f);
5057 +        if (!createIncomplete) assertTrue(f.complete(v1));
5058 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5059 +        if (createIncomplete) assertTrue(f.complete(v1));
5060 +
5061 +        checkCompletedNormally(f, v1);
5062 +        checkCompletedNormally(g.toCompletableFuture(), v1);
5063 +        r.assertNotInvoked();
5064 +    }}
5065 +
5066 +    /**
5067 +     * default-implemented exceptionallyComposeAsync result completes
5068 +     * normally after exceptional completion of source
5069 +     */
5070 +    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5071 +        for (boolean createIncomplete : new boolean[] { true, false })
5072 +    {
5073 +        final CFException ex = new CFException();
5074 +        final ExceptionalCompletableFutureFunction r =
5075 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5076 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5077 +        final DelegatedCompletionStage<Integer> d =
5078 +            new DelegatedCompletionStage<Integer>(f);
5079 +        if (!createIncomplete) f.completeExceptionally(ex);
5080 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5081 +        if (createIncomplete) f.completeExceptionally(ex);
5082 +
5083 +        checkCompletedExceptionally(f, ex);
5084 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5085 +        r.assertInvoked();
5086 +    }}
5087 +
5088 +    /**
5089 +     * default-implemented exceptionallyComposeAsync completes
5090 +     * exceptionally on exception if action does
5091 +     */
5092 +    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5093 +        for (boolean createIncomplete : new boolean[] { true, false })
5094 +        for (Integer v1 : new Integer[] { 1, null })
5095 +    {
5096 +        final CFException ex = new CFException();
5097 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5098 +        final FailingExceptionalCompletableFutureFunction r
5099 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5100 +        final DelegatedCompletionStage<Integer> d =
5101 +            new DelegatedCompletionStage<Integer>(f);
5102 +        if (!createIncomplete) f.completeExceptionally(ex);
5103 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5104 +        if (createIncomplete) f.completeExceptionally(ex);
5105 +
5106 +        checkCompletedExceptionally(f, ex);
5107 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5108 +        r.assertInvoked();
5109 +    }}
5110 +
5111   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines