diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/AbstractMockitoBeanOverrideHandler.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/AbstractMockitoBeanOverrideHandler.java index 3e7b39275fb..a90980fe66c 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/AbstractMockitoBeanOverrideHandler.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/AbstractMockitoBeanOverrideHandler.java @@ -56,20 +56,20 @@ abstract class AbstractMockitoBeanOverrideHandler extends BeanOverrideHandler { @Override protected void trackOverrideInstance(Object mock, SingletonBeanRegistry trackingBeanRegistry) { - getMockitoBeans(trackingBeanRegistry).add(mock); + getMockBeans(trackingBeanRegistry).add(mock); } - private static MockitoBeans getMockitoBeans(SingletonBeanRegistry trackingBeanRegistry) { - String beanName = MockitoBeans.class.getName(); - MockitoBeans mockitoBeans = null; + private static MockBeans getMockBeans(SingletonBeanRegistry trackingBeanRegistry) { + String beanName = MockBeans.class.getName(); + MockBeans mockBeans = null; if (trackingBeanRegistry.containsSingleton(beanName)) { - mockitoBeans = (MockitoBeans) trackingBeanRegistry.getSingleton(beanName); + mockBeans = (MockBeans) trackingBeanRegistry.getSingleton(beanName); } - if (mockitoBeans == null) { - mockitoBeans = new MockitoBeans(); - trackingBeanRegistry.registerSingleton(beanName, mockitoBeans); + if (mockBeans == null) { + mockBeans = new MockBeans(); + trackingBeanRegistry.registerSingleton(beanName, mockBeans); } - return mockitoBeans; + return mockBeans; } @Override diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeans.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockBeans.java similarity index 98% rename from spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeans.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockBeans.java index 1c636f629d2..d57c3fe411a 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeans.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockBeans.java @@ -28,7 +28,7 @@ import org.mockito.Mockito; * @author Sam Brannen * @since 6.2 */ -class MockitoBeans { +class MockBeans { private final List beans = new ArrayList<>(); diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java index f4556a26192..be850476584 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java @@ -116,7 +116,7 @@ public class MockitoResetTestExecutionListener extends AbstractTestExecutionList } } try { - beanFactory.getBean(MockitoBeans.class).resetAll(reset); + beanFactory.getBean(MockBeans.class).resetAll(reset); } catch (NoSuchBeanDefinitionException ex) { // Continue