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.201 by jsr166, Sat Sep 22 21:04:48 2018 UTC vs.
Revision 1.205 by jsr166, Sun Sep 23 00:55:03 2018 UTC

# Line 551 | Line 551 | public class CompletableFutureTest exten
551          public CompletableFuture<Integer> apply(Integer x) {
552              invoked();
553              value = x;
554 <            CompletableFuture<Integer> f = new CompletableFuture<>();
555 <            assertTrue(f.complete(inc(x)));
556 <            return f;
554 >            return CompletableFuture.completedFuture(inc(x));
555          }
556      }
557  
# Line 574 | Line 572 | public class CompletableFutureTest exten
572          ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
573          public CompletionStage<Integer> apply(Throwable x) {
574              invoked();
575 <            CompletableFuture<Integer> d = new CompletableFuture<Integer>();
578 <            d.complete(value);
579 <            return d;
575 >            return CompletableFuture.completedFuture(value);
576          }
577      }
578  
# Line 4787 | Line 4783 | public class CompletableFutureTest exten
4783       * default-implemented exceptionallyAsync action completes with
4784       * function value on source exception
4785       */
4786 <    public void testDefaulExceptionallyAsync_exceptionalCompletion() {
4786 >    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4787          for (boolean createIncomplete : new boolean[] { true, false })
4788          for (Integer v1 : new Integer[] { 1, null })
4789      {
# Line 4814 | Line 4810 | public class CompletableFutureTest exten
4810       * throws an exception, it completes exceptionally with that
4811       * exception
4812       */
4813 <    public void testDefaulExceptionallyAsync_exceptionalCompletionActionFailed() {
4813 >    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4814          for (boolean createIncomplete : new boolean[] { true, false })
4815      {
4816          final AtomicInteger a = new AtomicInteger(0);
# Line 4987 | Line 4983 | public class CompletableFutureTest exten
4983          final DelegatedCompletionStage<Integer> d =
4984              new DelegatedCompletionStage<Integer>(f);
4985          if (!createIncomplete) assertTrue(f.complete(v1));
4986 <        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r,  new ThreadExecutor());
4986 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
4987          if (createIncomplete) assertTrue(f.complete(v1));
4988  
4989          checkCompletedNormally(f, v1);
# Line 5009 | Line 5005 | public class CompletableFutureTest exten
5005          final DelegatedCompletionStage<Integer> d =
5006              new DelegatedCompletionStage<Integer>(f);
5007          if (!createIncomplete) f.completeExceptionally(ex);
5008 <        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r,  new ThreadExecutor());
5008 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5009          if (createIncomplete) f.completeExceptionally(ex);
5010  
5011          checkCompletedExceptionally(f, ex);
# Line 5032 | Line 5028 | public class CompletableFutureTest exten
5028          final DelegatedCompletionStage<Integer> d =
5029              new DelegatedCompletionStage<Integer>(f);
5030          if (!createIncomplete) f.completeExceptionally(ex);
5031 <        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r,  new ThreadExecutor());
5031 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5032          if (createIncomplete) f.completeExceptionally(ex);
5033  
5034          checkCompletedExceptionally(f, ex);

Diff Legend

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