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.170 by jsr166, Mon Jul 18 19:30:49 2016 UTC vs.
Revision 1.173 by jsr166, Wed Sep 21 06:03:17 2016 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 362 | Line 361 | public class CompletableFutureTest exten
361          checkCompletedNormally(f, "test");
362      }
363  
364 <    abstract class CheckedAction {
364 >    abstract static class CheckedAction {
365          int invocationCount = 0;
366          final ExecutionMode m;
367          CheckedAction(ExecutionMode m) { this.m = m; }
# Line 374 | Line 373 | public class CompletableFutureTest exten
373          void assertInvoked() { assertEquals(1, invocationCount); }
374      }
375  
376 <    abstract class CheckedIntegerAction extends CheckedAction {
376 >    abstract static class CheckedIntegerAction extends CheckedAction {
377          Integer value;
378          CheckedIntegerAction(ExecutionMode m) { super(m); }
379          void assertValue(Integer expected) {
# Line 383 | Line 382 | public class CompletableFutureTest exten
382          }
383      }
384  
385 <    class IntegerSupplier extends CheckedAction
385 >    static class IntegerSupplier extends CheckedAction
386          implements Supplier<Integer>
387      {
388          final Integer value;
# Line 402 | Line 401 | public class CompletableFutureTest exten
401          return (x == null) ? null : x + 1;
402      }
403  
404 <    class NoopConsumer extends CheckedIntegerAction
404 >    static class NoopConsumer extends CheckedIntegerAction
405          implements Consumer<Integer>
406      {
407          NoopConsumer(ExecutionMode m) { super(m); }
# Line 412 | Line 411 | public class CompletableFutureTest exten
411          }
412      }
413  
414 <    class IncFunction extends CheckedIntegerAction
414 >    static class IncFunction extends CheckedIntegerAction
415          implements Function<Integer,Integer>
416      {
417          IncFunction(ExecutionMode m) { super(m); }
# Line 430 | Line 429 | public class CompletableFutureTest exten
429              - ((y == null) ? 99 : y.intValue());
430      }
431  
432 <    class SubtractAction extends CheckedIntegerAction
432 >    static class SubtractAction extends CheckedIntegerAction
433          implements BiConsumer<Integer, Integer>
434      {
435          SubtractAction(ExecutionMode m) { super(m); }
# Line 440 | Line 439 | public class CompletableFutureTest exten
439          }
440      }
441  
442 <    class SubtractFunction extends CheckedIntegerAction
442 >    static class SubtractFunction extends CheckedIntegerAction
443          implements BiFunction<Integer, Integer, Integer>
444      {
445          SubtractFunction(ExecutionMode m) { super(m); }
# Line 450 | Line 449 | public class CompletableFutureTest exten
449          }
450      }
451  
452 <    class Noop extends CheckedAction implements Runnable {
452 >    static class Noop extends CheckedAction implements Runnable {
453          Noop(ExecutionMode m) { super(m); }
454          public void run() {
455              invoked();
456          }
457      }
458  
459 <    class FailingSupplier extends CheckedAction
459 >    static class FailingSupplier extends CheckedAction
460          implements Supplier<Integer>
461      {
462          final CFException ex;
# Line 468 | Line 467 | public class CompletableFutureTest exten
467          }
468      }
469  
470 <    class FailingConsumer extends CheckedIntegerAction
470 >    static class FailingConsumer extends CheckedIntegerAction
471          implements Consumer<Integer>
472      {
473          final CFException ex;
# Line 480 | Line 479 | public class CompletableFutureTest exten
479          }
480      }
481  
482 <    class FailingBiConsumer extends CheckedIntegerAction
482 >    static class FailingBiConsumer extends CheckedIntegerAction
483          implements BiConsumer<Integer, Integer>
484      {
485          final CFException ex;
# Line 492 | Line 491 | public class CompletableFutureTest exten
491          }
492      }
493  
494 <    class FailingFunction extends CheckedIntegerAction
494 >    static class FailingFunction extends CheckedIntegerAction
495          implements Function<Integer, Integer>
496      {
497          final CFException ex;
# Line 504 | Line 503 | public class CompletableFutureTest exten
503          }
504      }
505  
506 <    class FailingBiFunction extends CheckedIntegerAction
506 >    static class FailingBiFunction extends CheckedIntegerAction
507          implements BiFunction<Integer, Integer, Integer>
508      {
509          final CFException ex;
# Line 516 | Line 515 | public class CompletableFutureTest exten
515          }
516      }
517  
518 <    class FailingRunnable extends CheckedAction implements Runnable {
518 >    static class FailingRunnable extends CheckedAction implements Runnable {
519          final CFException ex;
520          FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
521          public void run() {
# Line 525 | Line 524 | public class CompletableFutureTest exten
524          }
525      }
526  
527 <    class CompletableFutureInc extends CheckedIntegerAction
527 >    static class CompletableFutureInc extends CheckedIntegerAction
528          implements Function<Integer, CompletableFuture<Integer>>
529      {
530          CompletableFutureInc(ExecutionMode m) { super(m); }
# Line 538 | Line 537 | public class CompletableFutureTest exten
537          }
538      }
539  
540 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
540 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
541          implements Function<Integer, CompletableFuture<Integer>>
542      {
543          final CFException ex;
# Line 3965 | Line 3964 | public class CompletableFutureTest exten
3964              .collect(Collectors.toList());
3965  
3966          List<CompletionStage<Integer>> stages = new ArrayList<>();
3967 <        stages.add(new CompletableFuture<Integer>().minimalCompletionStage());
3967 >        CompletionStage<Integer> min =
3968 >            new CompletableFuture<Integer>().minimalCompletionStage();
3969 >        stages.add(min);
3970 >        stages.add(min.thenApply(x -> x));
3971          stages.add(CompletableFuture.completedStage(1));
3972          stages.add(CompletableFuture.failedStage(new CFException()));
3973  
# Line 4001 | Line 4003 | public class CompletableFutureTest exten
4003              throw new Error("Methods did not throw UOE: " + bugs);
4004      }
4005  
4006 +    /**
4007 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4008 +     */
4009 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4010 +        for (Integer v1 : new Integer[] { 1, null })
4011 +    {
4012 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4013 +        CompletionStage minimal = f.minimalCompletionStage();
4014 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4015 +        g.complete(v1);
4016 +        checkCompletedNormally(g, v1);
4017 +        checkIncomplete(f);
4018 +        checkIncomplete(minimal.toCompletableFuture());
4019 +    }}
4020 +
4021 +    /**
4022 +     * minimalStage.toCompletableFuture().join() awaits completion
4023 +     */
4024 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4025 +        for (boolean createIncomplete : new boolean[] { true, false })
4026 +        for (Integer v1 : new Integer[] { 1, null })
4027 +    {
4028 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4029 +        if (!createIncomplete) assertTrue(f.complete(v1));
4030 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4031 +        if (createIncomplete) assertTrue(f.complete(v1));
4032 +        assertEquals(v1, minimal.toCompletableFuture().join());
4033 +        assertEquals(v1, minimal.toCompletableFuture().get());
4034 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4035 +    }}
4036 +
4037 +    /** Demo utility method for external reliable toCompletableFuture */
4038 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4039 +        CompletableFuture<T> f = new CompletableFuture<>();
4040 +        stage.handle((T t, Throwable ex) -> {
4041 +                         if (ex != null) f.completeExceptionally(ex);
4042 +                         else f.complete(t);
4043 +                         return null;
4044 +                     });
4045 +        return f;
4046 +    }
4047 +
4048 +    /** Demo utility method to join a CompletionStage */
4049 +    static <T> T join(CompletionStage<T> stage) {
4050 +        return toCompletableFuture(stage).join();
4051 +    }
4052 +
4053 +    /**
4054 +     * Joining a minimal stage "by hand" works
4055 +     */
4056 +    public void testMinimalCompletionStage_join_by_hand() {
4057 +        for (boolean createIncomplete : new boolean[] { true, false })
4058 +        for (Integer v1 : new Integer[] { 1, null })
4059 +    {
4060 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4061 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4062 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4063 +        if (!createIncomplete) assertTrue(f.complete(v1));
4064 +        minimal.thenAccept((x) -> g.complete(x));
4065 +        if (createIncomplete) assertTrue(f.complete(v1));
4066 +        g.join();
4067 +        checkCompletedNormally(g, v1);
4068 +        checkCompletedNormally(f, v1);
4069 +        assertEquals(v1, join(minimal));
4070 +    }}
4071 +
4072      static class Monad {
4073          static class ZeroException extends RuntimeException {
4074              public ZeroException() { super("monadic zero"); }

Diff Legend

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