Cleanup JUnit Support by removing unused code and got rid of static class

Author: slu-it

webtester-support-junit4/src/main/java/info/novatec/testit/webtester/junit/exceptions/IllegalTestClassStructureException.java

@@ -3,10 +3,6 @@
 @SuppressWarnings("serial")
 public class IllegalTestClassStructureException extends WebTesterJUnitSupportException {
 
-    public IllegalTestClassStructureException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
     public IllegalTestClassStructureException(String message) {
         super(message);
     }

webtester-support-junit4/src/main/java/info/novatec/testit/webtester/junit/exceptions/WebTesterJUnitSupportException.java

@@ -6,10 +6,6 @@
 @SuppressWarnings("serial")
 public class WebTesterJUnitSupportException extends WebTesterException {
 
-    protected WebTesterJUnitSupportException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
     protected WebTesterJUnitSupportException(String message) {
         super(message);
     }

webtester-support-junit4/src/main/java/info/novatec/testit/webtester/junit/runner/WebTesterJUnitRunner.java

@@ -132,6 +132,7 @@
  */
 public class WebTesterJUnitRunner extends BlockJUnit4ClassRunner {
 
+    private ReflectionUtils reflectionUtils = new ReflectionUtils();
     private List<ClassTestBrowser> classBrowsers = new ArrayList<>();
     private List<MethodTestBrowser> methodBrowsers = new ArrayList<>();
 
@@ -155,7 +156,7 @@ public void evaluate() throws Throwable {
             private void initializeClassLevel() {
                 classBrowsers.clear();
                 Class<?> testClass = getTestClass().getJavaClass();
-                for (Field field : ReflectionUtils.getAllFieldsOfClassHierarchy(testClass)) {
+                for (Field field : reflectionUtils.getAllFieldsOfClassHierarchy(testClass)) {
                     boolean fieldIsStatic = Modifier.isStatic(field.getModifiers());
                     boolean fieldIsABrowser = Browser.class.isAssignableFrom(field.getType());
                     boolean fieldIsAnnotatedAsResource = field.getAnnotation(Resource.class) != null;
@@ -188,7 +189,7 @@ private void evaluateWithBeforeClassesFromSuperClass() throws Throwable {
     private boolean configurationValuesAnnotationIsUsedOnClassLevel() {
         boolean isUsed = false;
         Class<?> testClass = getTestClass().getJavaClass();
-        for (Field field : ReflectionUtils.getAllFieldsOfClassHierarchy(testClass)) {
+        for (Field field : reflectionUtils.getAllFieldsOfClassHierarchy(testClass)) {
             boolean isStatic = Modifier.isStatic(field.getModifiers());
             boolean isAnnotated = field.isAnnotationPresent(ConfigurationValue.class);
             if (isStatic && isAnnotated) {
@@ -237,7 +238,7 @@ public void evaluate() throws Throwable {
             private void initializeMethodLevel() {
                 methodBrowsers.clear();
                 Class<?> testClass = getTestClass().getJavaClass();
-                for (Field field : ReflectionUtils.getAllFieldsOfClassHierarchy(testClass)) {
+                for (Field field : reflectionUtils.getAllFieldsOfClassHierarchy(testClass)) {
                     boolean fieldIsNonStatic = !Modifier.isStatic(field.getModifiers());
                     boolean fieldIsABrowser = Browser.class.isAssignableFrom(field.getType());
                     boolean fieldIsAnnotatedAsResource = field.getAnnotation(Resource.class) != null;
@@ -269,7 +270,7 @@ private void evaluateWithBeforesFromSuperClass() throws Throwable {
     private boolean configurationValuesAnnotationIsUsedOnMethodLevel() {
         boolean isUsed = false;
         Class<?> testClass = getTestClass().getJavaClass();
-        for (Field field : ReflectionUtils.getAllFieldsOfClassHierarchy(testClass)) {
+        for (Field field : reflectionUtils.getAllFieldsOfClassHierarchy(testClass)) {
             boolean isStatic = Modifier.isStatic(field.getModifiers());
             boolean isAnnotated = field.isAnnotationPresent(ConfigurationValue.class);
             if (!isStatic && isAnnotated) {

webtester-support-junit4/src/main/java/info/novatec/testit/webtester/junit/runner/internal/TestClassPlausibilityChecker.java

@@ -23,7 +23,7 @@ public class TestClassPlausibilityChecker {
     private Set<Field> allFields;
 
     public TestClassPlausibilityChecker(Class<?> testClass) {
-        this.allFields = ReflectionUtils.getAllFieldsOfClassHierarchy(testClass);
+        this.allFields = new ReflectionUtils().getAllFieldsOfClassHierarchy(testClass);
     }
 
     public void assertPlausibilityOfTestClass() {

webtester-support-junit4/src/main/java/info/novatec/testit/webtester/junit/utils/ReflectionUtils.java

@@ -2,17 +2,11 @@
 
 import java.lang.reflect.Field;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 
-public final class ReflectionUtils {
-
-    private static final Map<Class<?>, Set<Field>> FIELDS_CACHE = new HashMap<>();
-
-    /* getting fields */
+public class ReflectionUtils {
 
     /**
      * Returns all fields of the given class hierarchy (start class and all its
@@ -23,29 +17,19 @@ public final class ReflectionUtils {
      * be returned
      * @return all fields of the given class hierarchy
      */
-    public static Set<Field> getAllFieldsOfClassHierarchy(Class<?> startClass) {
-
-        Set<Field> fields = FIELDS_CACHE.get(startClass);
-        if (fields != null) {
-            return fields;
-        }
+    public Set<Field> getAllFieldsOfClassHierarchy(Class<?> startClass) {
 
         Field[] declaredFields = startClass.getDeclaredFields();
 
-        fields = new HashSet<>(declaredFields.length);
+        Set<Field> fields = new HashSet<>(declaredFields.length);
         Collections.addAll(fields, declaredFields);
 
         Class<?> superclass = startClass.getSuperclass();
         if (superclass != null) {
             fields.addAll(getAllFieldsOfClassHierarchy(superclass));
         }
-
-        FIELDS_CACHE.put(startClass, fields);
         return fields;
 
     }
 
-    private ReflectionUtils() {
-    }
-
 }

webtester-support-junit4/src/test/java/info/novatec/testit/webtester/junit/utils/ReflectionUtilsTest.java

@@ -10,7 +10,7 @@
 
 public class ReflectionUtilsTest {
 
-    /* testGetAllFieldsOfClassHierarchy */
+    ReflectionUtils cut = new ReflectionUtils();
 
     @Test
     public final void testGetAllFieldsOfClassHierarchy() throws Exception {
@@ -19,7 +19,7 @@ public final void testGetAllFieldsOfClassHierarchy() throws Exception {
         Field fatherField = Father.class.getDeclaredField("fatherField");
         Field grandfatherField = Grandfather.class.getDeclaredField("grandfatherField");
 
-        Set<Field> fields = ReflectionUtils.getAllFieldsOfClassHierarchy(Child.class);
+        Set<Field> fields = cut.getAllFieldsOfClassHierarchy(Child.class);
 
         assertThat(fields).contains(childField, fatherField, grandfatherField);