Merge pull request #51 from webcompere/resolve-junit-private-dependency

Remove dependency on private JUnit API internals

Author: ashleyfrieze

system-stubs-junit4/README.md

@@ -9,7 +9,7 @@ project and has been rebuilt from the ground up for this version.
 <dependency>
   <groupId>uk.org.webcompere</groupId>
   <artifactId>system-stubs-junit4</artifactId>
-  <version>1.2.0</version>
+  <version>2.0.1</version>
 </dependency>
 ```
 
@@ -250,4 +250,4 @@ other situations, and need to make these work in JUnit 4 also.
 
 There are extensive tests demonstrating each of the JUnit rules. However, in some situations, you may need finer control of the System Stub objects. You can always mix using rules and core objects via the `execute` pattern. It may also be easier to combine methods from `SystemStubs` with some common rules.
 
-It is worth noting that putting common set up into a `@Rule` object is useful unless there is nothing common between test cases. In that instance, consider having multiple test classes for each configuration, or using only the most essential common setup within rules, and adding the `execute` pattern for variations.
+It is worth noting that putting common set up into a `@Rule` object is useful unless there is nothing common between test cases. In that instance, consider having multiple test classes for each configuration, or using only the most essential common setup within rules, and adding the `execute` pattern for variations.

system-stubs-jupiter/README.md

@@ -7,7 +7,7 @@ JUnit 5 unit test.
 <dependency>
   <groupId>uk.org.webcompere</groupId>
   <artifactId>system-stubs-jupiter</artifactId>
-  <version>1.2.0</version>
+  <version>2.0.1</version>
 </dependency>
 ```
 

system-stubs-jupiter/src/main/java/uk/org/webcompere/systemstubs/jupiter/SystemStubsExtension.java

@@ -1,16 +1,17 @@
 package uk.org.webcompere.systemstubs.jupiter;
 
 import org.junit.jupiter.api.extension.*;
+import org.junit.platform.commons.function.Try;
 import uk.org.webcompere.systemstubs.resource.TestResource;
 
+import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.function.Predicate;
 
 import static java.lang.reflect.Modifier.isStatic;
-import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
-import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
-import static org.junit.platform.commons.util.ReflectionUtils.tryToReadFieldValue;
+import static org.junit.platform.commons.support.HierarchyTraversalMode.TOP_DOWN;
+import static org.junit.platform.commons.support.ReflectionSupport.findFields;
 import static uk.org.webcompere.systemstubs.resource.Resources.executeCleanup;
 
 /**
@@ -49,7 +50,7 @@ public Object resolveParameter(ParameterContext parameterContext,
                                    ExtensionContext extensionContext) throws ParameterResolutionException {
         try {
             // create using default constructor, turn it on and remember it for cleanup
-            TestResource resource = (TestResource)parameterContext.getParameter().getType().newInstance();
+            TestResource resource = (TestResource) parameterContext.getParameter().getType().newInstance();
             resource.setup();
 
             activeResources.addFirst(resource);
@@ -90,14 +91,14 @@ private void setup(Field field, Object testInstance) throws Exception {
 
     private TestResource getInstantiatedTestResource(Field field, Object testInstance) {
         return tryToReadFieldValue(field, testInstance)
-                .toOptional()
-                .map(val -> (TestResource)val)
-                .orElseGet(() -> assignNewInstanceToField(field, testInstance));
+            .toOptional()
+            .map(val -> (TestResource) val)
+            .orElseGet(() -> assignNewInstanceToField(field, testInstance));
     }
 
     private TestResource assignNewInstanceToField(Field field, Object testInstance) {
         try {
-            TestResource resource = (TestResource)field.getType().newInstance();
+            TestResource resource = (TestResource) field.getType().newInstance();
             field.set(testInstance, resource);
             return resource;
         } catch (InstantiationException | IllegalAccessException e) {
@@ -106,19 +107,25 @@ private TestResource assignNewInstanceToField(Field field, Object testInstance)
     }
 
     private void setupFields(Class<?> clazz, Object testInstance, Predicate<Field> predicate) throws Exception {
-        for (Field field : findAnnotatedFields(clazz, SystemStub.class, predicate)) {
+        for (Field field : findSystemStubsFields(clazz, predicate)) {
             setup(field, testInstance);
         }
     }
 
+    private List<Field> findSystemStubsFields(Class<?> clazz, Predicate<Field> predicate) {
+        Predicate<Field> annotated = field -> field.isAnnotationPresent(SystemStub.class);
+        return findFields(clazz, annotated.and(predicate), TOP_DOWN);
+    }
+
     private void cleanupFields(Class<?> clazz, Object testInstance, Predicate<Field> predicate) throws Exception {
         LinkedList<TestResource> active = new LinkedList<>();
-        findAnnotatedFields(clazz, SystemStub.class, predicate)
+
+        findSystemStubsFields(clazz, predicate)
             .stream()
             .map(field -> tryToReadFieldValue(field, testInstance).toOptional())
             .filter(Optional::isPresent)
             .map(Optional::get)
-            .map(item -> (TestResource)item)
+            .map(TestResource.class::cast)
             .forEach(active::addFirst);
 
         executeCleanup(active);
@@ -133,4 +140,16 @@ private static boolean isStaticField(Field f) {
     private static <T> Predicate<T> not(Predicate<T> predicate) {
         return predicate.negate();
     }
+
+    @SuppressWarnings("deprecation") // "AccessibleObject.isAccessible()" is deprecated in Java 9
+    private static <T extends AccessibleObject> T makeAccessible(T object) {
+        if (!object.isAccessible()) {
+            object.setAccessible(true);
+        }
+        return object;
+    }
+
+    private static Try<Object> tryToReadFieldValue(Field field, Object instance) {
+        return Try.call(() -> makeAccessible(field).get(instance));
+    }
 }