tidying

pholser · Nov 21, 2020 · ad8d5eb · ad8d5eb
1 parent ced4673
commit ad8d5eb
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 19 deletions.
diff --git a/guava/src/main/java/com/pholser/junit/quickcheck/guava/generator/FunctionGenerator.java b/guava/src/main/java/com/pholser/junit/quickcheck/guava/generator/FunctionGenerator.java
@@ -45,8 +45,14 @@ public FunctionGenerator() {
     }
 
     @SuppressWarnings("unchecked")
-    @Override public Function<F, T> generate(SourceOfRandomness random, GenerationStatus status) {
-        return makeLambda(Function.class, componentGenerators().get(1), status);
+    @Override public Function<F, T> generate(
+        SourceOfRandomness random,
+        GenerationStatus status) {
+
+        return makeLambda(
+            Function.class,
+            componentGenerators().get(1),
+            status);
     }
 
     @Override public int numberOfNeededComponents() {

diff --git a/guava/src/main/java/com/pholser/junit/quickcheck/guava/generator/OptionalGenerator.java b/guava/src/main/java/com/pholser/junit/quickcheck/guava/generator/OptionalGenerator.java
@@ -39,7 +39,7 @@ a copy of this software and associated documentation files (the
 /**
  * Produces values of type {@link Optional}.
  */
-@SuppressWarnings("ALL")
+@SuppressWarnings("Guava")
 public class OptionalGenerator extends ComponentizedGenerator<Optional> {
     public OptionalGenerator() {
         super(Optional.class);

diff --git a/guava/src/main/java/com/pholser/junit/quickcheck/guava/generator/PredicateGenerator.java b/guava/src/main/java/com/pholser/junit/quickcheck/guava/generator/PredicateGenerator.java
@@ -46,14 +46,13 @@ public PredicateGenerator() {
         super(Predicate.class);
     }
 
-    @Override
-    public void provide(Generators provided) {
+    @Override public void provide(Generators provided) {
         super.provide(provided);
 
         generator = gen().type(boolean.class);
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("unchecked,Guava")
     @Override public Predicate<T> generate(
         SourceOfRandomness random,
         GenerationStatus status) {

diff --git a/guava/src/main/java/com/pholser/junit/quickcheck/guava/generator/SupplierGenerator.java b/guava/src/main/java/com/pholser/junit/quickcheck/guava/generator/SupplierGenerator.java
@@ -42,9 +42,15 @@ public SupplierGenerator() {
         super(Supplier.class);
     }
 
-    @SuppressWarnings("unchecked")
-    @Override public Supplier<T> generate(SourceOfRandomness random, GenerationStatus status) {
-        return makeLambda(Supplier.class, componentGenerators().get(0), status);
+    @SuppressWarnings("unchecked,Guava")
+    @Override public Supplier<T> generate(
+        SourceOfRandomness random,
+        GenerationStatus status) {
+
+        return makeLambda(
+            Supplier.class,
+            componentGenerators().get(0),
+            status);
     }
 
     @Override public int numberOfNeededComponents() {

diff --git a/.../pholser/junit/quickcheck/guava/generator/FunctionOfStringToIntPropertyParameterTest.java b/.../pholser/junit/quickcheck/guava/generator/FunctionOfStringToIntPropertyParameterTest.java
@@ -38,7 +38,9 @@ a copy of this software and associated documentation files (the
 import java.util.List;
 import java.util.Random;
 
-public class FunctionOfStringToIntPropertyParameterTest extends CorePropertyParameterTest {
+public class FunctionOfStringToIntPropertyParameterTest
+    extends CorePropertyParameterTest {
+
     @SuppressWarnings("Guava")
     public static final Function<String, Integer> TYPE_BEARER = null;
 
@@ -64,16 +66,23 @@ public class FunctionOfStringToIntPropertyParameterTest extends CorePropertyPara
     }
 
     @SuppressWarnings("Guava")
-    @Override protected void verifyEquivalenceOfPropertyParameter(int index, Object expected, Object actual)
+    @Override protected void verifyEquivalenceOfPropertyParameter(
+        int index,
+        Object expected,
+        Object actual)
         throws Exception {
+
         @SuppressWarnings("unchecked")
         Function<String, Integer> f = (Function<String, Integer>) actual;
 
         String argument = "foobar";
 
         SourceOfRandomness source = new SourceOfRandomness(new Random());
         source.setSeed(Objects.hashCode(argument));
-        Integer value = (Integer) repository.generatorFor(typeOf(getClass(), "integer")).generate(source, null);
+        Integer value =
+            (Integer)
+                repository.generatorFor(typeOf(getClass(), "integer"))
+                    .generate(source, null);
 
         for (int i = 0; i < 10000; ++i)
             assertEquals(value, f.apply(argument));

diff --git a/...java/com/pholser/junit/quickcheck/guava/generator/FunctionPropertyParameterTypesTest.java b/...java/com/pholser/junit/quickcheck/guava/generator/FunctionPropertyParameterTypesTest.java
@@ -63,16 +63,22 @@ public static class FooToZilch {
     }
 
     @Test public void superShortToInteger() throws Exception {
-        assertThat(testResult(SuperShortToExtendsInteger.class), isSuccessful());
-        assertEquals(defaultPropertyTrialCount(), SuperShortToExtendsInteger.iterations);
+        assertThat(
+            testResult(SuperShortToExtendsInteger.class),
+            isSuccessful());
+        assertEquals(
+            defaultPropertyTrialCount(),
+            SuperShortToExtendsInteger.iterations);
     }
 
     @SuppressWarnings("Guava")
     @RunWith(JUnitQuickcheck.class)
     public static class SuperShortToExtendsInteger {
         static int iterations;
 
-        @Property public void shouldHold(Function<? super Foo, ? extends Zilch> f) {
+        @Property public void shouldHold(
+            Function<? super Foo, ? extends Zilch> f) {
+
             ++iterations;
 
             Foo foo = new Foo(2);

diff --git a/...test/java/com/pholser/junit/quickcheck/guava/generator/OptionalPropertyParameterTest.java b/...test/java/com/pholser/junit/quickcheck/guava/generator/OptionalPropertyParameterTest.java
@@ -53,7 +53,10 @@ public class OptionalPropertyParameterTest {
     public static class OptionalString {
         @SuppressWarnings("Guava")
         @Property public void works(
-            Optional<@From(Encoded.class) @InCharset("US-ASCII") String> optional) {
+            Optional<
+                @From(Encoded.class)
+                @InCharset("US-ASCII")
+                    String> optional) {
 
             assumeTrue(optional.isPresent());
             assertTrue(optional.get().codePoints().allMatch(i -> i < 128));

diff --git a/...est/java/com/pholser/junit/quickcheck/guava/generator/PredicatePropertyParameterTest.java b/...est/java/com/pholser/junit/quickcheck/guava/generator/PredicatePropertyParameterTest.java
@@ -42,7 +42,9 @@ public class PredicatePropertyParameterTest {
 
     @RunWith(JUnitQuickcheck.class)
     public static class DefiniteArgType {
-        @Property public void x(@SuppressWarnings("Guava") Predicate<String> p) {
+        @Property public void x(
+            @SuppressWarnings("Guava") Predicate<String> p) {
+
             p.apply("abc");
         }
     }

diff --git a/...test/java/com/pholser/junit/quickcheck/guava/generator/SupplierPropertyParameterTest.java b/...test/java/com/pholser/junit/quickcheck/guava/generator/SupplierPropertyParameterTest.java
@@ -56,7 +56,9 @@ public static class SupplyingInts {
 
     @RunWith(JUnitQuickcheck.class)
     public static class SupplyingUnresolvedLists<T> {
-        @Property public void holds(Supplier<List<T>> source) {
+        @Property public void holds(
+            @SuppressWarnings("Guava") Supplier<List<T>> source) {
+
             for (T each : source.get()) {
                 // ensure types are ok
             }
@@ -70,7 +72,7 @@ public static class SupplyingUnresolvedLists<T> {
     @RunWith(JUnitQuickcheck.class)
     public static class SupplyingUpperBounded {
         @Property public <T extends Integer> void holds(
-            Supplier<? extends T[]> source) {
+            @SuppressWarnings("Guava") Supplier<? extends T[]> source) {
 
             T[] items = source.get();
             assumeThat(items.length, greaterThan(0));