Merge pull request #77 from mockito/fix-mockito-4.5.0

Don't use internal class Fields from Mockito
[skip release]

Author: slawekjaranowski

src/main/java/org/mockito/testng/MockitoTestNGListener.java

@@ -5,16 +5,18 @@
 package org.mockito.testng;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.mockito.InjectMocks;
 import org.mockito.Mockito;
 import org.mockito.MockitoSession;
-import org.mockito.internal.util.reflection.Fields;
 import org.mockito.internal.util.reflection.InstanceField;
 import org.mockito.quality.Strictness;
 import org.testng.IInvokedMethod;
@@ -91,7 +93,7 @@ public void beforeInvocation(IInvokedMethod method, ITestResult testResult) {
             // in order to restore state before next tests
             // https://github.com/mockito/mockito-testng/issues/28
             injectMocksFieldsValues.computeIfAbsent(testResult.getInstance(), testInstance ->
-                    Fields.allDeclaredFieldsOf(testInstance).instanceFields()
+                    allDeclaredFieldsOf(testInstance)
                             .stream()
                             .filter(field -> field.isAnnotatedBy(InjectMocks.class))
                             .collect(HashMap::new, (m, v) -> m.put(v, v.read()), HashMap::putAll));
@@ -157,4 +159,14 @@ <A extends Annotation> Optional<A> findAnnotation(ITestResult testResult, Class<
 
         return Optional.empty();
     }
+
+    private static List<InstanceField> allDeclaredFieldsOf(Object testInstance) {
+        List<InstanceField> result = new ArrayList<>();
+        for (Class<?> clazz = testInstance.getClass(); clazz != Object.class; clazz = clazz.getSuperclass()) {
+            for (Field field : clazz.getDeclaredFields()) {
+                result.add(new InstanceField(field, testInstance));
+            }
+        }
+        return result;
+    }
 }