Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Align with naming in ReflectionTestUtils

Browse Source
This commit is contained in:
Sam Brannen
2024-10-24 10:25:18 +02:00
parent fe6d9145e5
commit 2d028c39b4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideHandler.java
View File

@@ -82,7 +82,7 @@ class MockitoSpyBeanOverrideHandler extends AbstractMockitoBeanOverrideHandler {
if (StringUtils.hasLength(name)) { if (StringUtils.hasLength(name)) {
settings.name(name); settings.name(name);
} }
if (SpringMockResolver.aopAvailable) { if (SpringMockResolver.springAopPresent) {
settings.verificationStartedListeners(verificationStartedListener); settings.verificationStartedListeners(verificationStartedListener);
} }

4
spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/SpringMockResolver.java
View File

@@ -37,13 +37,13 @@ import org.springframework.util.ClassUtils;
*/ */
public class SpringMockResolver implements MockResolver { public class SpringMockResolver implements MockResolver {
static final boolean aopAvailable = ClassUtils.isPresent( static final boolean springAopPresent = ClassUtils.isPresent(
"org.springframework.aop.framework.Advised", SpringMockResolver.class.getClassLoader()); "org.springframework.aop.framework.Advised", SpringMockResolver.class.getClassLoader());
@Override @Override
public Object resolve(Object instance) { public Object resolve(Object instance) {
if (aopAvailable) { if (springAopPresent) {
return getUltimateTargetObject(instance); return getUltimateTargetObject(instance);
} }
return instance; return instance;