diff options
Diffstat (limited to 'src/main/java/au/id/zancanaro/javacheck/Generators.java')
-rw-r--r-- | src/main/java/au/id/zancanaro/javacheck/Generators.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/au/id/zancanaro/javacheck/Generators.java b/src/main/java/au/id/zancanaro/javacheck/Generators.java index 4049149..5dee924 100644 --- a/src/main/java/au/id/zancanaro/javacheck/Generators.java +++ b/src/main/java/au/id/zancanaro/javacheck/Generators.java @@ -18,7 +18,7 @@ public final class Generators { public static <T> Generator<T> suchThat(Generator<T> gen, Predicate<T> predicate) { return (random, size) -> { - RoseTree<T> result = gen.generate(random, size); + ShrinkTree<T> result = gen.generate(random, size); if (predicate.test(result.getValue())) { return result.filter(predicate); } else { @@ -28,7 +28,7 @@ public final class Generators { } public static <T> Generator<T> noShrink(Generator<T> gen) { - return (random, size) -> new RoseTree<>( + return (random, size) -> new ShrinkTree<>( gen.generate(random, size).getValue(), Collections.emptyList()); } @@ -49,15 +49,15 @@ public final class Generators { public static Generator<Boolean> bool() { return (random, size) -> random.nextBoolean() ? - new RoseTree<>(true, Collections.singletonList(new RoseTree<>(false, Collections.emptyList()))) : - new RoseTree<>(false, Collections.emptyList()); + new ShrinkTree<>(true, Collections.singletonList(new ShrinkTree<>(false, Collections.emptyList()))) : + new ShrinkTree<>(false, Collections.emptyList()); } public static Generator<Integer> integer(int lower, int upper) { return (random, size) -> { int value = lower + random.nextInt(upper - lower); int bound = lower > 0 ? lower : (upper < 0 ? upper : 0); - return new RoseTree<>(value, intShrinkingIterable(value, bound)); + return new ShrinkTree<>(value, intShrinkingIterable(value, bound)); }; } @@ -69,8 +69,8 @@ public final class Generators { return sized(size -> integer(0, size)); } - private static Iterable<RoseTree<Integer>> intShrinkingIterable(final int value, final int bound) { - return () -> new Iterator<RoseTree<Integer>>() { + private static Iterable<ShrinkTree<Integer>> intShrinkingIterable(final int value, final int bound) { + return () -> new Iterator<ShrinkTree<Integer>>() { int curr = value - bound; @Override @@ -79,10 +79,10 @@ public final class Generators { } @Override - public RoseTree<Integer> next() { + public ShrinkTree<Integer> next() { int prevCurr = curr; curr = curr / 2; - return new RoseTree<>(value - prevCurr, intShrinkingIterable(value - prevCurr, bound)); + return new ShrinkTree<>(value - prevCurr, intShrinkingIterable(value - prevCurr, bound)); } }; } |