Skip to content

Don't use internal class Fields from Mockito #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slawekjaranowski merged 1 commit into from
Apr 23, 2022
Merged

Don't use internal class Fields from Mockito #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/main/java/org/mockito/testng/MockitoTestNGListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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;
}
}