Skip to content

Commit 0da4ae9

Browse files
committed
Rename internal MockitoBeans class to MockBeans
This is a prerequisite for gh-33925 which will introduce a public @MockitoBeans container annotation in the same package.
1 parent 2ba0022 commit 0da4ae9

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/AbstractMockitoBeanOverrideHandler.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@ MockReset getReset() {
5656

5757
@Override
5858
protected void trackOverrideInstance(Object mock, SingletonBeanRegistry trackingBeanRegistry) {
59-
getMockitoBeans(trackingBeanRegistry).add(mock);
59+
getMockBeans(trackingBeanRegistry).add(mock);
6060
}
6161

62-
private static MockitoBeans getMockitoBeans(SingletonBeanRegistry trackingBeanRegistry) {
63-
String beanName = MockitoBeans.class.getName();
64-
MockitoBeans mockitoBeans = null;
62+
private static MockBeans getMockBeans(SingletonBeanRegistry trackingBeanRegistry) {
63+
String beanName = MockBeans.class.getName();
64+
MockBeans mockBeans = null;
6565
if (trackingBeanRegistry.containsSingleton(beanName)) {
66-
mockitoBeans = (MockitoBeans) trackingBeanRegistry.getSingleton(beanName);
66+
mockBeans = (MockBeans) trackingBeanRegistry.getSingleton(beanName);
6767
}
68-
if (mockitoBeans == null) {
69-
mockitoBeans = new MockitoBeans();
70-
trackingBeanRegistry.registerSingleton(beanName, mockitoBeans);
68+
if (mockBeans == null) {
69+
mockBeans = new MockBeans();
70+
trackingBeanRegistry.registerSingleton(beanName, mockBeans);
7171
}
72-
return mockitoBeans;
72+
return mockBeans;
7373
}
7474

7575
@Override
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* @author Sam Brannen
2929
* @since 6.2
3030
*/
31-
class MockitoBeans {
31+
class MockBeans {
3232

3333
private final List<Object> beans = new ArrayList<>();
3434

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private static void resetMocks(ConfigurableApplicationContext applicationContext
116116
}
117117
}
118118
try {
119-
beanFactory.getBean(MockitoBeans.class).resetAll(reset);
119+
beanFactory.getBean(MockBeans.class).resetAll(reset);
120120
}
121121
catch (NoSuchBeanDefinitionException ex) {
122122
// Continue

0 commit comments

Comments
 (0)