root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Sam Brannen 2025-01-02 12:49:05 +02:00
parent 2ba0022704
commit 0da4ae96b4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,20 +56,20 @@ abstract class AbstractMockitoBeanOverrideHandler extends BeanOverrideHandler {
@Override @Override
protected void trackOverrideInstance(Object mock, SingletonBeanRegistry trackingBeanRegistry) { protected void trackOverrideInstance(Object mock, SingletonBeanRegistry trackingBeanRegistry) {
getMockitoBeans(trackingBeanRegistry).add(mock); getMockBeans(trackingBeanRegistry).add(mock);
} }
private static MockitoBeans getMockitoBeans(SingletonBeanRegistry trackingBeanRegistry) { private static MockBeans getMockBeans(SingletonBeanRegistry trackingBeanRegistry) {
String beanName = MockitoBeans.class.getName(); String beanName = MockBeans.class.getName();
MockitoBeans mockitoBeans = null; MockBeans mockBeans = null;
if (trackingBeanRegistry.containsSingleton(beanName)) { if (trackingBeanRegistry.containsSingleton(beanName)) {
mockitoBeans = (MockitoBeans) trackingBeanRegistry.getSingleton(beanName); mockBeans = (MockBeans) trackingBeanRegistry.getSingleton(beanName);
} }
if (mockitoBeans == null) { if (mockBeans == null) {
mockitoBeans = new MockitoBeans(); mockBeans = new MockBeans();
trackingBeanRegistry.registerSingleton(beanName, mockitoBeans); trackingBeanRegistry.registerSingleton(beanName, mockBeans);
} }
return mockitoBeans; return mockBeans;
} }
@Override @Override

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

@ -28,7 +28,7 @@ import org.mockito.Mockito;
* @author Sam Brannen * @author Sam Brannen
* @since 6.2 * @since 6.2
*/ */
class MockitoBeans { class MockBeans {
private final List<Object> beans = new ArrayList<>(); private final List<Object> beans = new ArrayList<>();

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

@ -116,7 +116,7 @@ public class MockitoResetTestExecutionListener extends AbstractTestExecutionList
} }
} }
try { try {
beanFactory.getBean(MockitoBeans.class).resetAll(reset); beanFactory.getBean(MockBeans.class).resetAll(reset);
} }
catch (NoSuchBeanDefinitionException ex) { catch (NoSuchBeanDefinitionException ex) {
// Continue // Continue