[ViewVC] Diff of: jsr166/jsr166/src/test/tck/CompletableFutureTest.java

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.198 by dl, Mon Sep 17 11:50:55 2018 UTC vs.
Revision 1.206 by jsr166, Sun Sep 23 02:04:03 2018 UTC

+        public CompletableFuture<Integer> apply(Integer x) {
+            invoked();
+            value = x;
-<
+            CompletableFuture<Integer> f = new CompletableFuture<>();
-<
+            assertTrue(f.complete(inc(x)));
-<
+            return f;
->
+            return CompletableFuture.completedFuture(inc(x));
+        ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
+        public CompletionStage<Integer> apply(Throwable x) {
+            invoked();
-<
+            CompletableFuture<Integer> d = new CompletableFuture<Integer>();
-<
+            d.complete(value);
-<
+            return d;
->
+            return CompletableFuture.completedFuture(value);
+//         return stage.toCompletableFuture().copy().isDone();
+//     }
-+
+    // For testing default implementations
-+
+    // Only non-default interface methods defined.
-+
+    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
-+
+        final CompletableFuture<T> cf;
-+
+        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
-+
+        public CompletableFuture<T> toCompletableFuture() {
-+
+            return cf; }
-+
+        public CompletionStage<Void> thenRun
-+
+            (Runnable action) {
-+
+            return cf.thenRun(action); }
-+
+        public CompletionStage<Void> thenRunAsync
-+
+            (Runnable action) {
-+
+            return cf.thenRunAsync(action); }
-+
+        public CompletionStage<Void> thenRunAsync
-+
+            (Runnable action,
-+
+             Executor executor) {
-+
+            return cf.thenRunAsync(action, executor); }
-+
+        public CompletionStage<Void> thenAccept
-+
+            (Consumer<? super T> action) {
-+
+            return cf.thenAccept(action); }
-+
+        public CompletionStage<Void> thenAcceptAsync
-+
+            (Consumer<? super T> action) {
-+
+            return cf.thenAcceptAsync(action); }
-+
+        public CompletionStage<Void> thenAcceptAsync
-+
+            (Consumer<? super T> action,
-+
+             Executor executor) {
-+
+            return cf.thenAcceptAsync(action, executor); }
-+
+        public <U> CompletionStage<U> thenApply
-+
+            (Function<? super T,? extends U> a) {
-+
+            return cf.thenApply(a); }
-+
+        public <U> CompletionStage<U> thenApplyAsync
-+
+            (Function<? super T,? extends U> fn) {
-+
+            return cf.thenApplyAsync(fn); }
-+
+        public <U> CompletionStage<U> thenApplyAsync
-+
+            (Function<? super T,? extends U> fn,
-+
+             Executor executor) {
-+
+            return cf.thenApplyAsync(fn, executor); }
-+
+        public <U,V> CompletionStage<V> thenCombine
-+
+            (CompletionStage<? extends U> other,
-+
+             BiFunction<? super T,? super U,? extends V> fn) {
-+
+            return cf.thenCombine(other, fn); }
-+
+        public <U,V> CompletionStage<V> thenCombineAsync
-+
+            (CompletionStage<? extends U> other,
-+
+             BiFunction<? super T,? super U,? extends V> fn) {
-+
+            return cf.thenCombineAsync(other, fn); }
-+
+        public <U,V> CompletionStage<V> thenCombineAsync
-+
+            (CompletionStage<? extends U> other,
-+
+             BiFunction<? super T,? super U,? extends V> fn,
-+
+             Executor executor) {
-+
+            return cf.thenCombineAsync(other, fn, executor); }
-+
+        public <U> CompletionStage<Void> thenAcceptBoth
-+
+            (CompletionStage<? extends U> other,
-+
+             BiConsumer<? super T, ? super U> action) {
-+
+            return cf.thenAcceptBoth(other, action); }
-+
+        public <U> CompletionStage<Void> thenAcceptBothAsync
-+
+            (CompletionStage<? extends U> other,
-+
+             BiConsumer<? super T, ? super U> action) {
-+
+            return cf.thenAcceptBothAsync(other, action); }
-+
+        public <U> CompletionStage<Void> thenAcceptBothAsync
-+
+            (CompletionStage<? extends U> other,
-+
+             BiConsumer<? super T, ? super U> action,
-+
+             Executor executor) {
-+
+            return cf.thenAcceptBothAsync(other, action, executor); }
-+
+        public CompletionStage<Void> runAfterBoth
-+
+            (CompletionStage<?> other,
-+
+             Runnable action) {
-+
+            return cf.runAfterBoth(other, action); }
-+
+        public CompletionStage<Void> runAfterBothAsync
-+
+            (CompletionStage<?> other,
-+
+             Runnable action) {
-+
+            return cf.runAfterBothAsync(other, action); }
-+
+        public CompletionStage<Void> runAfterBothAsync
-+
+            (CompletionStage<?> other,
-+
+             Runnable action,
-+
+             Executor executor) {
-+
+            return cf.runAfterBothAsync(other, action, executor); }
-+
+        public <U> CompletionStage<U> applyToEither
-+
+            (CompletionStage<? extends T> other,
-+
+             Function<? super T, U> fn) {
-+
+            return cf.applyToEither(other, fn); }
-+
+        public <U> CompletionStage<U> applyToEitherAsync
-+
+            (CompletionStage<? extends T> other,
-+
+             Function<? super T, U> fn) {
-+
+            return cf.applyToEitherAsync(other, fn); }
-+
+        public <U> CompletionStage<U> applyToEitherAsync
-+
+            (CompletionStage<? extends T> other,
-+
+             Function<? super T, U> fn,
-+
+             Executor executor) {
-+
+            return cf.applyToEitherAsync(other, fn, executor); }
-+
+        public CompletionStage<Void> acceptEither
-+
+            (CompletionStage<? extends T> other,
-+
+             Consumer<? super T> action) {
-+
+            return cf.acceptEither(other, action); }
-+
+        public CompletionStage<Void> acceptEitherAsync
-+
+            (CompletionStage<? extends T> other,
-+
+             Consumer<? super T> action) {
-+
+            return cf.acceptEitherAsync(other, action); }
-+
+        public CompletionStage<Void> acceptEitherAsync
-+
+            (CompletionStage<? extends T> other,
-+
+             Consumer<? super T> action,
-+
+             Executor executor) {
-+
+            return cf.acceptEitherAsync(other, action, executor); }
-+
+        public CompletionStage<Void> runAfterEither
-+
+            (CompletionStage<?> other,
-+
+             Runnable action) {
-+
+            return cf.runAfterEither(other, action); }
-+
+        public CompletionStage<Void> runAfterEitherAsync
-+
+            (CompletionStage<?> other,
-+
+             Runnable action) {
-+
+            return cf.runAfterEitherAsync(other, action); }
-+
+        public CompletionStage<Void> runAfterEitherAsync
-+
+            (CompletionStage<?> other,
-+
+             Runnable action,
-+
+             Executor executor) {
-+
+            return cf.runAfterEitherAsync(other, action, executor); }
-+
+        public <U> CompletionStage<U> thenCompose
-+
+            (Function<? super T, ? extends CompletionStage<U>> fn) {
-+
+            return cf.thenCompose(fn); }
-+
+        public <U> CompletionStage<U> thenComposeAsync
-+
+            (Function<? super T, ? extends CompletionStage<U>> fn) {
-+
+            return cf.thenComposeAsync(fn); }
-+
+        public <U> CompletionStage<U> thenComposeAsync
-+
+            (Function<? super T, ? extends CompletionStage<U>> fn,
-+
+             Executor executor) {
-+
+            return cf.thenComposeAsync(fn, executor); }
-+
+        public <U> CompletionStage<U> handle
-+
+            (BiFunction<? super T, Throwable, ? extends U> fn) {
-+
+            return cf.handle(fn); }
-+
+        public <U> CompletionStage<U> handleAsync
-+
+            (BiFunction<? super T, Throwable, ? extends U> fn) {
-+
+            return cf.handleAsync(fn); }
-+
+        public <U> CompletionStage<U> handleAsync
-+
+            (BiFunction<? super T, Throwable, ? extends U> fn,
-+
+             Executor executor) {
-+
+            return cf.handleAsync(fn, executor); }
-+
+        public CompletionStage<T> whenComplete
-+
+            (BiConsumer<? super T, ? super Throwable> action) {
-+
+            return cf.whenComplete(action); }
-+
+        public CompletionStage<T> whenCompleteAsync
-+
+            (BiConsumer<? super T, ? super Throwable> action) {
-+
+            return cf.whenCompleteAsync(action); }
-+
+        public CompletionStage<T> whenCompleteAsync
-+
+            (BiConsumer<? super T, ? super Throwable> action,
-+
+             Executor executor) {
-+
+            return cf.whenCompleteAsync(action, executor); }
-+
+        public CompletionStage<T> exceptionally
-+
+            (Function<Throwable, ? extends T> fn) {
-+
+            return cf.exceptionally(fn); }
-+
+    }
-+
-+
+    /**
-+
+     * default-implemented exceptionallyAsync action is not invoked when
-+
+     * source completes normally, and source result is propagated
-+
+     */
-+
+    public void testDefaultExceptionallyAsync_normalCompletion() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+        for (Integer v1 : new Integer[] { 1, null })
-+
+    {
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) assertTrue(f.complete(v1));
-+
+        final CompletionStage<Integer> g = d.exceptionallyAsync
-+
+            ((Throwable t) -> {
-+
+                threadFail("should not be called");
-+
+                return null;            // unreached
-+
+            });
-+
+        if (createIncomplete) assertTrue(f.complete(v1));
-+
-+
+        checkCompletedNormally(g.toCompletableFuture(), v1);
-+
+    }}
-+
-+
+    /**
-+
+     * default-implemented exceptionallyAsync action completes with
-+
+     * function value on source exception
-+
+     */
-+
+    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+        for (Integer v1 : new Integer[] { 1, null })
-+
+    {
-+
+        final AtomicInteger a = new AtomicInteger(0);
-+
+        final CFException ex = new CFException();
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) f.completeExceptionally(ex);
-+
+        final CompletionStage<Integer> g = d.exceptionallyAsync
-+
+            ((Throwable t) -> {
-+
+                threadAssertSame(t, ex);
-+
+                a.getAndIncrement();
-+
+                return v1;
-+
+            });
-+
+        if (createIncomplete) f.completeExceptionally(ex);
-+
-+
+        checkCompletedNormally(g.toCompletableFuture(), v1);
-+
+        assertEquals(1, a.get());
-+
+    }}
-+
-+
+    /**
-+
+     * Under default implementation, if an "exceptionally action"
-+
+     * throws an exception, it completes exceptionally with that
-+
+     * exception
-+
+     */
-+
+    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+    {
-+
+        final AtomicInteger a = new AtomicInteger(0);
-+
+        final CFException ex1 = new CFException();
-+
+        final CFException ex2 = new CFException();
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) f.completeExceptionally(ex1);
-+
+        final CompletionStage<Integer> g = d.exceptionallyAsync
-+
+            ((Throwable t) -> {
-+
+                threadAssertSame(t, ex1);
-+
+                a.getAndIncrement();
-+
+                throw ex2;
-+
+            });
-+
+        if (createIncomplete) f.completeExceptionally(ex1);
-+
-+
+        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
-+
+        checkCompletedExceptionally(f, ex1);
-+
+        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
-+
+        assertEquals(1, a.get());
-+
+    }}
-+
-+
+    /**
-+
+     * default exceptionallyCompose result completes normally after normal
-+
+     * completion of source
-+
+     */
-+
+    public void testDefaultExceptionallyCompose_normalCompletion() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+        for (Integer v1 : new Integer[] { 1, null })
-+
+    {
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final ExceptionalCompletableFutureFunction r =
-+
+            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) assertTrue(f.complete(v1));
-+
+        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
-+
+        if (createIncomplete) assertTrue(f.complete(v1));
-+
-+
+        checkCompletedNormally(f, v1);
-+
+        checkCompletedNormally(g.toCompletableFuture(), v1);
-+
+        r.assertNotInvoked();
-+
+    }}
-+
-+
+    /**
-+
+     * default-implemented exceptionallyCompose result completes
-+
+     * normally after exceptional completion of source
-+
+     */
-+
+    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+    {
-+
+        final CFException ex = new CFException();
-+
+        final ExceptionalCompletableFutureFunction r =
-+
+            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) f.completeExceptionally(ex);
-+
+        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
-+
+        if (createIncomplete) f.completeExceptionally(ex);
-+
-+
+        checkCompletedExceptionally(f, ex);
-+
+        checkCompletedNormally(g.toCompletableFuture(), r.value);
-+
+        r.assertInvoked();
-+
+    }}
-+
-+
+    /**
-+
+     * default-implemented exceptionallyCompose completes
-+
+     * exceptionally on exception if action does
-+
+     */
-+
+    public void testDefaultExceptionallyCompose_actionFailed() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+        for (Integer v1 : new Integer[] { 1, null })
-+
+    {
-+
+        final CFException ex = new CFException();
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final FailingExceptionalCompletableFutureFunction r
-+
+            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) f.completeExceptionally(ex);
-+
+        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
-+
+        if (createIncomplete) f.completeExceptionally(ex);
-+
-+
+        checkCompletedExceptionally(f, ex);
-+
+        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
-+
+        r.assertInvoked();
-+
+    }}
-+
-+
+    /**
-+
+     * default exceptionallyComposeAsync result completes normally after normal
-+
+     * completion of source
-+
+     */
-+
+    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+        for (Integer v1 : new Integer[] { 1, null })
-+
+    {
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final ExceptionalCompletableFutureFunction r =
-+
+            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) assertTrue(f.complete(v1));
-+
+        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
-+
+        if (createIncomplete) assertTrue(f.complete(v1));
-+
-+
+        checkCompletedNormally(f, v1);
-+
+        checkCompletedNormally(g.toCompletableFuture(), v1);
-+
+        r.assertNotInvoked();
-+
+    }}
-+
-+
+    /**
-+
+     * default-implemented exceptionallyComposeAsync result completes
-+
+     * normally after exceptional completion of source
-+
+     */
-+
+    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+    {
-+
+        final CFException ex = new CFException();
-+
+        final ExceptionalCompletableFutureFunction r =
-+
+            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) f.completeExceptionally(ex);
-+
+        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
-+
+        if (createIncomplete) f.completeExceptionally(ex);
-+
-+
+        checkCompletedExceptionally(f, ex);
-+
+        checkCompletedNormally(g.toCompletableFuture(), r.value);
-+
+        r.assertInvoked();
-+
+    }}
-+
-+
+    /**
-+
+     * default-implemented exceptionallyComposeAsync completes
-+
+     * exceptionally on exception if action does
-+
+     */
-+
+    public void testDefaultExceptionallyComposeAsync_actionFailed() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+        for (Integer v1 : new Integer[] { 1, null })
-+
+    {
-+
+        final CFException ex = new CFException();
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final FailingExceptionalCompletableFutureFunction r
-+
+            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) f.completeExceptionally(ex);
-+
+        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
-+
+        if (createIncomplete) f.completeExceptionally(ex);
-+
-+
+        checkCompletedExceptionally(f, ex);
-+
+        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
-+
+        r.assertInvoked();
-+
+    }}
-+
-+
-+
+    /**
-+
+     * default exceptionallyComposeAsync result completes normally after normal
-+
+     * completion of source
-+
+     */
-+
+    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+        for (Integer v1 : new Integer[] { 1, null })
-+
+    {
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final ExceptionalCompletableFutureFunction r =
-+
+            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) assertTrue(f.complete(v1));
-+
+        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
-+
+        if (createIncomplete) assertTrue(f.complete(v1));
-+
-+
+        checkCompletedNormally(f, v1);
-+
+        checkCompletedNormally(g.toCompletableFuture(), v1);
-+
+        r.assertNotInvoked();
-+
+    }}
-+
-+
+    /**
-+
+     * default-implemented exceptionallyComposeAsync result completes
-+
+     * normally after exceptional completion of source
-+
+     */
-+
+    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+    {
-+
+        final CFException ex = new CFException();
-+
+        final ExceptionalCompletableFutureFunction r =
-+
+            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) f.completeExceptionally(ex);
-+
+        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
-+
+        if (createIncomplete) f.completeExceptionally(ex);
-+
-+
+        checkCompletedExceptionally(f, ex);
-+
+        checkCompletedNormally(g.toCompletableFuture(), r.value);
-+
+        r.assertInvoked();
-+
+    }}
-+
-+
+    /**
-+
+     * default-implemented exceptionallyComposeAsync completes
-+
+     * exceptionally on exception if action does
-+
+     */
-+
+    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
-+
+        for (boolean createIncomplete : new boolean[] { true, false })
-+
+        for (Integer v1 : new Integer[] { 1, null })
-+
+    {
-+
+        final CFException ex = new CFException();
-+
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
-+
+        final FailingExceptionalCompletableFutureFunction r
-+
+            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
-+
+        final DelegatedCompletionStage<Integer> d =
-+
+            new DelegatedCompletionStage<Integer>(f);
-+
+        if (!createIncomplete) f.completeExceptionally(ex);
-+
+        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
-+
+        if (createIncomplete) f.completeExceptionally(ex);
-+
-+
+        checkCompletedExceptionally(f, ex);
-+
+        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
-+
+        r.assertInvoked();
-+
+    }}
-+

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents): Revision 1.198 by dl, Mon Sep 17 11:50:55 2018 UTC vs. Revision 1.206 by jsr166, Sun Sep 23 02:04:03 2018 UTC

Diff Legend

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.198 by dl, Mon Sep 17 11:50:55 2018 UTC vs.
Revision 1.206 by jsr166, Sun Sep 23 02:04:03 2018 UTC