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.171 by jsr166, Wed Aug 24 22:22:39 2016 UTC vs.
Revision 1.176 by jsr166, Wed Sep 21 18:21:56 2016 UTC

# Line 361 | 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 373 | 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 382 | 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 401 | 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 411 | 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 429 | 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 439 | 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 449 | 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 467 | 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 479 | 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 491 | 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 503 | 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 515 | 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 524 | 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 537 | 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 3577 | Line 3577 | public class CompletableFutureTest exten
3577       * copy returns a CompletableFuture that is completed normally,
3578       * with the same value, when source is.
3579       */
3580 <    public void testCopy() {
3580 >    public void testCopy_normalCompletion() {
3581 >        for (boolean createIncomplete : new boolean[] { true, false })
3582 >        for (Integer v1 : new Integer[] { 1, null })
3583 >    {
3584          CompletableFuture<Integer> f = new CompletableFuture<>();
3585 +        if (!createIncomplete) assertTrue(f.complete(v1));
3586          CompletableFuture<Integer> g = f.copy();
3587 <        checkIncomplete(f);
3588 <        checkIncomplete(g);
3589 <        f.complete(1);
3590 <        checkCompletedNormally(f, 1);
3591 <        checkCompletedNormally(g, 1);
3592 <    }
3587 >        if (createIncomplete) {
3588 >            checkIncomplete(f);
3589 >            checkIncomplete(g);
3590 >            assertTrue(f.complete(v1));
3591 >        }
3592 >        checkCompletedNormally(f, v1);
3593 >        checkCompletedNormally(g, v1);
3594 >    }}
3595  
3596      /**
3597       * copy returns a CompletableFuture that is completed exceptionally
3598       * when source is.
3599       */
3600 <    public void testCopy2() {
3600 >    public void testCopy_exceptionalCompletion() {
3601 >        for (boolean createIncomplete : new boolean[] { true, false })
3602 >    {
3603 >        CFException ex = new CFException();
3604          CompletableFuture<Integer> f = new CompletableFuture<>();
3605 +        if (!createIncomplete) f.completeExceptionally(ex);
3606          CompletableFuture<Integer> g = f.copy();
3607 <        checkIncomplete(f);
3608 <        checkIncomplete(g);
3609 <        CFException ex = new CFException();
3610 <        f.completeExceptionally(ex);
3607 >        if (createIncomplete) {
3608 >            checkIncomplete(f);
3609 >            checkIncomplete(g);
3610 >            f.completeExceptionally(ex);
3611 >        }
3612          checkCompletedExceptionally(f, ex);
3613          checkCompletedWithWrappedException(g, ex);
3614 +    }}
3615 +
3616 +    /**
3617 +     * Completion of a copy does not complete its source.
3618 +     */
3619 +    public void testCopy_oneWayPropagation() {
3620 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3621 +        assertTrue(f.copy().complete(1));
3622 +        assertTrue(f.copy().complete(null));
3623 +        assertTrue(f.copy().cancel(true));
3624 +        assertTrue(f.copy().cancel(false));
3625 +        assertTrue(f.copy().completeExceptionally(new CFException()));
3626 +        checkIncomplete(f);
3627      }
3628  
3629      /**
# Line 3964 | Line 3988 | public class CompletableFutureTest exten
3988              .collect(Collectors.toList());
3989  
3990          List<CompletionStage<Integer>> stages = new ArrayList<>();
3991 <        stages.add(new CompletableFuture<Integer>().minimalCompletionStage());
3991 >        CompletionStage<Integer> min =
3992 >            new CompletableFuture<Integer>().minimalCompletionStage();
3993 >        stages.add(min);
3994 >        stages.add(min.thenApply(x -> x));
3995          stages.add(CompletableFuture.completedStage(1));
3996          stages.add(CompletableFuture.failedStage(new CFException()));
3997  
# Line 4000 | Line 4027 | public class CompletableFutureTest exten
4027              throw new Error("Methods did not throw UOE: " + bugs);
4028      }
4029  
4030 +    /**
4031 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4032 +     * is completed normally, with the same value, when source is.
4033 +     */
4034 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4035 +        for (boolean createIncomplete : new boolean[] { true, false })
4036 +        for (Integer v1 : new Integer[] { 1, null })
4037 +    {
4038 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4039 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4040 +        if (!createIncomplete) assertTrue(f.complete(v1));
4041 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4042 +        if (createIncomplete) {
4043 +            checkIncomplete(f);
4044 +            checkIncomplete(g);
4045 +            assertTrue(f.complete(v1));
4046 +        }
4047 +        checkCompletedNormally(f, v1);
4048 +        checkCompletedNormally(g, v1);
4049 +    }}
4050 +
4051 +    /**
4052 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4053 +     */
4054 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4055 +        for (Integer v1 : new Integer[] { 1, null })
4056 +    {
4057 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4058 +        CompletionStage minimal = f.minimalCompletionStage();
4059 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4060 +        g.complete(v1);
4061 +        checkCompletedNormally(g, v1);
4062 +        checkIncomplete(f);
4063 +        checkIncomplete(minimal.toCompletableFuture());
4064 +    }}
4065 +
4066 +    /**
4067 +     * minimalStage.toCompletableFuture().join() awaits completion
4068 +     */
4069 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4070 +        for (boolean createIncomplete : new boolean[] { true, false })
4071 +        for (Integer v1 : new Integer[] { 1, null })
4072 +    {
4073 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4074 +        if (!createIncomplete) assertTrue(f.complete(v1));
4075 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4076 +        if (createIncomplete) assertTrue(f.complete(v1));
4077 +        assertEquals(v1, minimal.toCompletableFuture().join());
4078 +        assertEquals(v1, minimal.toCompletableFuture().get());
4079 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4080 +    }}
4081 +
4082 +    /**
4083 +     * Completion of a toCompletableFuture copy of a minimal stage
4084 +     * does not complete its source.
4085 +     */
4086 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4087 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4088 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4089 +        assertTrue(g.toCompletableFuture().complete(1));
4090 +        assertTrue(g.toCompletableFuture().complete(null));
4091 +        assertTrue(g.toCompletableFuture().cancel(true));
4092 +        assertTrue(g.toCompletableFuture().cancel(false));
4093 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4094 +        checkIncomplete(g.toCompletableFuture());
4095 +        f.complete(1);
4096 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4097 +    }
4098 +
4099 +    /** Demo utility method for external reliable toCompletableFuture */
4100 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4101 +        CompletableFuture<T> f = new CompletableFuture<>();
4102 +        stage.handle((T t, Throwable ex) -> {
4103 +                         if (ex != null) f.completeExceptionally(ex);
4104 +                         else f.complete(t);
4105 +                         return null;
4106 +                     });
4107 +        return f;
4108 +    }
4109 +
4110 +    /** Demo utility method to join a CompletionStage */
4111 +    static <T> T join(CompletionStage<T> stage) {
4112 +        return toCompletableFuture(stage).join();
4113 +    }
4114 +
4115 +    /**
4116 +     * Joining a minimal stage "by hand" works
4117 +     */
4118 +    public void testMinimalCompletionStage_join_by_hand() {
4119 +        for (boolean createIncomplete : new boolean[] { true, false })
4120 +        for (Integer v1 : new Integer[] { 1, null })
4121 +    {
4122 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4123 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4124 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4125 +        if (!createIncomplete) assertTrue(f.complete(v1));
4126 +        minimal.thenAccept((x) -> g.complete(x));
4127 +        if (createIncomplete) assertTrue(f.complete(v1));
4128 +        g.join();
4129 +        checkCompletedNormally(g, v1);
4130 +        checkCompletedNormally(f, v1);
4131 +        assertEquals(v1, join(minimal));
4132 +    }}
4133 +
4134      static class Monad {
4135          static class ZeroException extends RuntimeException {
4136              public ZeroException() { super("monadic zero"); }

Diff Legend

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