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

Migrate to Mockito.mock(T...) where feasible

Browse Source
This commit is contained in:
Sam Brannen
2023-01-19 14:32:29 +01:00
parent c3d123fef7
commit c4c786596f
369 changed files with 2267 additions and 2707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@@ -1255,7 +1255,7 @@ class DefaultListableBeanFactoryTests {
@Test
void expressionInStringArray() {
BeanExpressionResolver beanExpressionResolver = mock(BeanExpressionResolver.class);
BeanExpressionResolver beanExpressionResolver = mock();
given(beanExpressionResolver.evaluate(eq("#{foo}"), any(BeanExpressionContext.class)))
.willReturn("classpath:/org/springframework/beans/factory/xml/util.properties");
lbf.setBeanExpressionResolver(beanExpressionResolver);
@@ -2618,9 +2618,9 @@ class DefaultListableBeanFactoryTests {
@Test
void resolveEmbeddedValue() {
StringValueResolver r1 = mock(StringValueResolver.class);
StringValueResolver r2 = mock(StringValueResolver.class);
StringValueResolver r3 = mock(StringValueResolver.class);
StringValueResolver r1 = mock();
StringValueResolver r2 = mock();
StringValueResolver r3 = mock();
lbf.addEmbeddedValueResolver(r1);
lbf.addEmbeddedValueResolver(r2);
lbf.addEmbeddedValueResolver(r3);

6
spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java
View File

@@ -93,8 +93,8 @@ public class ParameterResolutionTests {
@Test
public void resolveDependencyPreconditionsForParameter() {
assertThatIllegalArgumentException().isThrownBy(() ->
ParameterResolutionDelegate.resolveDependency(null, 0, null, mock(AutowireCapableBeanFactory.class)))
assertThatIllegalArgumentException()
.isThrownBy(() -> ParameterResolutionDelegate.resolveDependency(null, 0, null, mock()))
.withMessageContaining("Parameter must not be null");
}
@@ -121,7 +121,7 @@ public class ParameterResolutionTests {
public void resolveDependencyForAnnotatedParametersInTopLevelClassConstructor() throws Exception {
Constructor<?> constructor = AutowirableClass.class.getConstructor(String.class, String.class, String.class, String.class);
AutowireCapableBeanFactory beanFactory = mock(AutowireCapableBeanFactory.class);
AutowireCapableBeanFactory beanFactory = mock();
// Configure the mocked BeanFactory to return the DependencyDescriptor for convenience and
// to avoid using an ArgumentCaptor.
given(beanFactory.resolveDependency(any(), isNull())).willAnswer(invocation -> invocation.getArgument(0));

4
spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java
View File

@@ -175,14 +175,14 @@ class AotServicesTests {
AotServices<TestService> loaded = AotServices.factoriesAndBeans(loader, beanFactory).load(TestService.class);
assertThat(loaded.getSource(loaded.asList().get(0))).isEqualTo(Source.SPRING_FACTORIES_LOADER);
assertThat(loaded.getSource(loaded.asList().get(1))).isEqualTo(Source.BEAN_FACTORY);
TestService missing = mock(TestService.class);
TestService missing = mock();
assertThatIllegalStateException().isThrownBy(()->loaded.getSource(missing));
}
@Test
void getSourceWhenMissingThrowsException() {
AotServices<TestService> loaded = AotServices.factories().load(TestService.class);
TestService missing = mock(TestService.class);
TestService missing = mock();
assertThatIllegalStateException().isThrownBy(()->loaded.getSource(missing));
}

2
spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java
View File

@@ -115,7 +115,7 @@ class AutowiredMethodArgumentsResolverTests {
@Test
void resolveRequiredWithMultipleDependenciesReturnsValue() {
Environment environment = mock(Environment.class);
Environment environment = mock();
this.beanFactory.registerSingleton("test", "testValue");
this.beanFactory.registerSingleton("environment", environment);
RegisteredBean registeredBean = registerTestBean(this.beanFactory);

6
spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java
View File

@@ -110,13 +110,11 @@ class BeanDefinitionMethodGeneratorFactoryTests {
@Test
void getBeanDefinitionMethodGeneratorAddsContributionsFromProcessors() {
DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
BeanRegistrationAotContribution beanContribution = mock(
BeanRegistrationAotContribution.class);
BeanRegistrationAotContribution beanContribution = mock();
BeanRegistrationAotProcessor processorBean = registeredBean -> beanContribution;
beanFactory.registerSingleton("processorBean", processorBean);
MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader();
BeanRegistrationAotContribution loaderContribution = mock(
BeanRegistrationAotContribution.class);
BeanRegistrationAotContribution loaderContribution = mock();
BeanRegistrationAotProcessor loaderProcessor = registeredBean -> loaderContribution;
springFactoriesLoader.addInstance(BeanRegistrationAotProcessor.class,
loaderProcessor);

6
spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanInstanceSupplierTests.java
View File

@@ -425,7 +425,7 @@ class BeanInstanceSupplierTests {
@ParameterizedResolverTest(Sources.MULTI_ARGS)
void resolveArgumentsWithMultiArgsConstructor(Source source) {
ResourceLoader resourceLoader = new DefaultResourceLoader();
Environment environment = mock(Environment.class);
Environment environment = mock();
this.beanFactory.registerResolvableDependency(ResourceLoader.class,
resourceLoader);
this.beanFactory.registerSingleton("environment", environment);
@@ -442,7 +442,7 @@ class BeanInstanceSupplierTests {
@ParameterizedResolverTest(Sources.MIXED_ARGS)
void resolveArgumentsWithMixedArgsConstructorWithUserValue(Source source) {
ResourceLoader resourceLoader = new DefaultResourceLoader();
Environment environment = mock(Environment.class);
Environment environment = mock();
this.beanFactory.registerResolvableDependency(ResourceLoader.class,
resourceLoader);
this.beanFactory.registerSingleton("environment", environment);
@@ -463,7 +463,7 @@ class BeanInstanceSupplierTests {
@ParameterizedResolverTest(Sources.MIXED_ARGS)
void resolveArgumentsWithMixedArgsConstructorWithUserBeanReference(Source source) {
ResourceLoader resourceLoader = new DefaultResourceLoader();
Environment environment = mock(Environment.class);
Environment environment = mock();
this.beanFactory.registerResolvableDependency(ResourceLoader.class,
resourceLoader);
this.beanFactory.registerSingleton("environment", environment);

2
spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
View File

@@ -50,7 +50,7 @@ public class CustomScopeConfigurerTests {
@Test
public void testSunnyDayWithBonaFideScopeInstance() {
Scope scope = mock(Scope.class);
Scope scope = mock();
factory.registerScope(FOO_SCOPE, scope);
Map<String, Object> scopes = new HashMap<>();
scopes.put(FOO_SCOPE, scope);

2
spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
View File

@@ -109,7 +109,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
final String targetBeanName = "singleton";
final String expectedSingleton = "Alicia Keys";
BeanFactory beanFactory = mock(BeanFactory.class);
BeanFactory beanFactory = mock();
given(beanFactory.getBean(targetBeanName)).willReturn(expectedSingleton);
ObjectFactoryCreatingFactoryBean factory = new ObjectFactoryCreatingFactoryBean();

2
spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
View File

@@ -252,7 +252,7 @@ public class ServiceLocatorFactoryBeanTests {
@Test
public void testRequiresListableBeanFactoryAndChokesOnAnythingElse() throws Exception {
BeanFactory beanFactory = mock(BeanFactory.class);
BeanFactory beanFactory = mock();
try {
ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean();
factory.setBeanFactory(beanFactory);

2
spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
View File

@@ -47,7 +47,7 @@ public class FailFastProblemReporterTests {
Problem problem = new Problem("VGER", new Location(new DescriptiveResource("here")),
null, new IllegalArgumentException());
Log log = mock(Log.class);
Log log = mock();
FailFastProblemReporter reporter = new FailFastProblemReporter();
reporter.setLogger(log);

4
spring-beans/src/test/java/org/springframework/beans/factory/support/RootBeanDefinitionTests.java
View File

@@ -36,7 +36,7 @@ class RootBeanDefinitionTests {
@Test
void setInstanceSetResolvedFactoryMethod() {
InstanceSupplier<?> instanceSupplier = mock(InstanceSupplier.class);
InstanceSupplier<?> instanceSupplier = mock();
Method method = ReflectionUtils.findMethod(String.class, "toString");
given(instanceSupplier.getFactoryMethod()).willReturn(method);
RootBeanDefinition beanDefinition = new RootBeanDefinition(String.class);
@@ -47,7 +47,7 @@ class RootBeanDefinitionTests {
@Test
void setInstanceDoesNotOverrideResolvedFactoryMethodWithNull() {
InstanceSupplier<?> instanceSupplier = mock(InstanceSupplier.class);
InstanceSupplier<?> instanceSupplier = mock();
given(instanceSupplier.getFactoryMethod()).willReturn(null);
Method method = ReflectionUtils.findMethod(String.class, "toString");
RootBeanDefinition beanDefinition = new RootBeanDefinition(String.class);

11
spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.beans.factory.wiring;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.testfixture.beans.TestBean;
@@ -37,16 +36,16 @@ import static org.mockito.Mockito.verify;
public class BeanConfigurerSupportTests {
@Test
public void supplyIncompatibleBeanFactoryImplementation() throws Exception {
public void supplyIncompatibleBeanFactoryImplementation() {
assertThatIllegalArgumentException().isThrownBy(() ->
new StubBeanConfigurerSupport().setBeanFactory(mock(BeanFactory.class)));
new StubBeanConfigurerSupport().setBeanFactory(mock()));
}
@Test
public void configureBeanDoesNothingIfBeanWiringInfoResolverResolvesToNull() throws Exception {
TestBean beanInstance = new TestBean();
BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class);
BeanWiringInfoResolver resolver = mock();
BeanConfigurerSupport configurer = new StubBeanConfigurerSupport();
configurer.setBeanWiringInfoResolver(resolver);
@@ -90,7 +89,7 @@ public class BeanConfigurerSupportTests {
DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
factory.registerBeanDefinition("spouse", builder.getBeanDefinition());
BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class);
BeanWiringInfoResolver resolver = mock();
given(resolver.resolveWiringInfo(beanInstance)).willReturn(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_NAME, false));
BeanConfigurerSupport configurer = new StubBeanConfigurerSupport();
@@ -110,7 +109,7 @@ public class BeanConfigurerSupportTests {
DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
factory.registerBeanDefinition("Mmm, I fancy a salad!", builder.getBeanDefinition());
BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class);
BeanWiringInfoResolver resolver = mock();
given(resolver.resolveWiringInfo(beanInstance)).willReturn(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_TYPE, false));
BeanConfigurerSupport configurer = new StubBeanConfigurerSupport();

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/ResourceEntityResolverTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.beans.factory.xml;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.Mockito;
import org.xml.sax.InputSource;
import org.springframework.core.io.Resource;
@@ -27,6 +26,7 @@ import org.springframework.lang.Nullable;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.Mockito.mock;
/**
* Unit tests for ResourceEntityResolver.
@@ -68,7 +68,7 @@ class ResourceEntityResolverTests {
@ParameterizedTest
@ValueSource(strings = { "https://example.org/schema.dtd", "https://example.org/schema.xsd" })
void resolveEntityCallsFallbackThatReturnsInputSource(String systemId) throws Exception {
InputSource expected = Mockito.mock(InputSource.class);
InputSource expected = mock();
ConfigurableFallbackEntityResolver resolver = new ConfigurableFallbackEntityResolver(expected);
assertThat(resolver.resolveEntity("testPublicId", systemId)).isSameAs(expected);