diff options
author | Carlo Zancanaro <carlo@zancanaro.id.au> | 2015-06-01 13:10:49 +1000 |
---|---|---|
committer | Carlo Zancanaro <carlo@zancanaro.id.au> | 2015-06-01 13:10:49 +1000 |
commit | 816a5b89c5ddb8e295b8e8e46075da3cb694b2a7 (patch) | |
tree | 4e2d6657e7de96506cf3f3e40572fbb1a2ddf6b4 /src/main/java/au/id/zancanaro/javacheck/junit/Properties.java | |
parent | a0d8c8066faadaf609e151ed0b71235a9615584a (diff) |
Fix up static analysis issues (FindBugs and Intellij IDEA analysis)
Diffstat (limited to 'src/main/java/au/id/zancanaro/javacheck/junit/Properties.java')
-rw-r--r-- | src/main/java/au/id/zancanaro/javacheck/junit/Properties.java | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/main/java/au/id/zancanaro/javacheck/junit/Properties.java b/src/main/java/au/id/zancanaro/javacheck/junit/Properties.java index 0507413..64bd9ab 100644 --- a/src/main/java/au/id/zancanaro/javacheck/junit/Properties.java +++ b/src/main/java/au/id/zancanaro/javacheck/junit/Properties.java @@ -16,12 +16,11 @@ import org.junit.runners.model.TestClass; import java.lang.reflect.*; import java.util.*; - public class Properties extends BlockJUnit4ClassRunner { private final Map<Type, Generator<?>> generators = new HashMap<>(); - public Properties(Class<?> klass) throws InitializationError { - super(klass); + public Properties(Class<?> classObject) throws InitializationError { + super(classObject); } @Override @@ -43,11 +42,11 @@ public class Properties extends BlockJUnit4ClassRunner { if (!(type instanceof ParameterizedType)) { continue; } - ParameterizedType ptype = (ParameterizedType) type; - if (!(ptype.getRawType() instanceof Class)) { + ParameterizedType parameterizedType = (ParameterizedType) type; + if (!(parameterizedType.getRawType() instanceof Class)) { continue; } - Class<?> c = (Class) ptype.getRawType(); + Class<?> c = (Class) parameterizedType.getRawType(); if (c != Generator.class) { continue; } @@ -61,7 +60,7 @@ public class Properties extends BlockJUnit4ClassRunner { error = true; } if (!error) { - result.add(ptype.getActualTypeArguments()[0]); + result.add(parameterizedType.getActualTypeArguments()[0]); } } return result; @@ -105,16 +104,16 @@ public class Properties extends BlockJUnit4ClassRunner { if (!(type instanceof ParameterizedType)) { continue; } - ParameterizedType ptype = (ParameterizedType) type; - if (!(ptype.getRawType() instanceof Class)) { + ParameterizedType parameterizedType = (ParameterizedType) type; + if (!(parameterizedType.getRawType() instanceof Class)) { continue; } - Class<?> c = (Class) ptype.getRawType(); + Class<?> c = (Class) parameterizedType.getRawType(); if (c != Generator.class) { continue; } try { - Type target = ptype.getActualTypeArguments()[0]; + Type target = parameterizedType.getActualTypeArguments()[0]; @SuppressWarnings("unchecked") Generator<Object> generator = (Generator<Object>) field.get(null); generators.put(target, generator); @@ -122,7 +121,7 @@ public class Properties extends BlockJUnit4ClassRunner { generators.put(rawTypes.get(target), generator); } } catch (IllegalAccessException ex) { - + throw new RuntimeException(ex); } } } @@ -213,7 +212,6 @@ public class Properties extends BlockJUnit4ClassRunner { if (assumptionsViolated++ == 50) { throw new Error("Violated 50 assumptions in a row: failing test"); } - ; } catch (Throwable ex) { // tree.print(new OutputStreamWriter(System.out), Arrays::toString); throw new PropertyError(method.getName(), seed, shrink(tree, ex)); |