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

Fix Mockito deprecations

This commit is contained in:
Christoph Dreis 2019-10-30 18:13:02 +01:00 committed by Juergen Hoeller
parent 4beb25b318
commit 3c17178b16
14 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
View File

@ -29,7 +29,7 @@ import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Tests for various parameter binding scenarios with before advice. * Tests for various parameter binding scenarios with before advice.
@ -129,7 +129,7 @@ public class AfterReturningAdviceBindingTests {
public void testNoInvokeWhenReturningParameterTypeDoesNotMatch() { public void testNoInvokeWhenReturningParameterTypeDoesNotMatch() {
testBeanProxy.setSpouse(this.testBeanProxy); testBeanProxy.setSpouse(this.testBeanProxy);
testBeanProxy.getSpouse(); testBeanProxy.getSpouse();
verifyZeroInteractions(mockCollaborator); verifyNoInteractions(mockCollaborator);
} }
@Test @Test

6
spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
View File

@ -27,7 +27,7 @@ import org.springframework.instrument.classloading.LoadTimeWeaver;
import static org.mockito.ArgumentMatchers.isA; import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Unit tests for @EnableLoadTimeWeaving * Unit tests for @EnableLoadTimeWeaving
@ -50,7 +50,7 @@ public class EnableLoadTimeWeavingTests {
ctx.register(EnableLTWConfig_withAjWeavingDisabled.class); ctx.register(EnableLTWConfig_withAjWeavingDisabled.class);
ctx.refresh(); ctx.refresh();
LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class); LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class);
verifyZeroInteractions(loadTimeWeaver); verifyNoInteractions(loadTimeWeaver);
} }
@Test @Test
@ -61,7 +61,7 @@ public class EnableLoadTimeWeavingTests {
LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class); LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class);
// no expectations -> a class file transformer should NOT be added // no expectations -> a class file transformer should NOT be added
// because no META-INF/aop.xml is present on the classpath // because no META-INF/aop.xml is present on the classpath
verifyZeroInteractions(loadTimeWeaver); verifyNoInteractions(loadTimeWeaver);
} }
@Test @Test

4
spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
View File

@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* @author Rod Johnson * @author Rod Johnson
@ -175,7 +175,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
.withMessageContaining("businessInterface"); .withMessageContaining("businessInterface");
// Expect no methods on home // Expect no methods on home
verifyZeroInteractions(home); verifyNoInteractions(home);
} }

4
spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
View File

@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* @author Rod Johnson * @author Rod Johnson
@ -260,7 +260,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
.withMessageContaining("businessInterface"); .withMessageContaining("businessInterface");
// Expect no methods on home // Expect no methods on home
verifyZeroInteractions(home); verifyNoInteractions(home);
} }

6
spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java
View File

@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* @author Arjen Poutsma * @author Arjen Poutsma
@ -98,7 +98,7 @@ class ListenableFutureTaskTests {
task.addCallback(successCallback, failureCallback); task.addCallback(successCallback, failureCallback);
task.run(); task.run();
verify(successCallback).onSuccess(s); verify(successCallback).onSuccess(s);
verifyZeroInteractions(failureCallback); verifyNoInteractions(failureCallback);
assertThat(task.get()).isSameAs(s); assertThat(task.get()).isSameAs(s);
assertThat(task.completable().get()).isSameAs(s); assertThat(task.completable().get()).isSameAs(s);
@ -119,7 +119,7 @@ class ListenableFutureTaskTests {
task.addCallback(successCallback, failureCallback); task.addCallback(successCallback, failureCallback);
task.run(); task.run();
verify(failureCallback).onFailure(ex); verify(failureCallback).onFailure(ex);
verifyZeroInteractions(successCallback); verifyNoInteractions(successCallback);
assertThatExceptionOfType(ExecutionException.class).isThrownBy( assertThatExceptionOfType(ExecutionException.class).isThrownBy(
task::get) task::get)

4
spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java
View File

@ -53,7 +53,7 @@ import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Unit tests for {@link DefaultRSocketRequesterBuilder}. * Unit tests for {@link DefaultRSocketRequesterBuilder}.
@ -85,7 +85,7 @@ public class DefaultRSocketRequesterBuilderTests {
.rsocketStrategies(strategiesConfigurer) .rsocketStrategies(strategiesConfigurer)
.connect(this.transport); .connect(this.transport);
verifyZeroInteractions(this.transport); verifyNoInteractions(this.transport);
assertThat(this.rsocketFactoryConfigurer.rsocketFactory()).isNull(); assertThat(this.rsocketFactoryConfigurer.rsocketFactory()).isNull();
} }

9
spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java
View File

@ -36,6 +36,7 @@ import org.springframework.messaging.support.MessageBuilder;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.ORIGINAL_DESTINATION; import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.ORIGINAL_DESTINATION;
@ -173,19 +174,19 @@ public class UserDestinationMessageHandlerTests {
// no destination // no destination
this.handler.handleMessage(createWith(SimpMessageType.MESSAGE, "joe", "123", null)); this.handler.handleMessage(createWith(SimpMessageType.MESSAGE, "joe", "123", null));
Mockito.verifyZeroInteractions(this.brokerChannel); verifyNoInteractions(this.brokerChannel);
// not a user destination // not a user destination
this.handler.handleMessage(createWith(SimpMessageType.MESSAGE, "joe", "123", "/queue/foo")); this.handler.handleMessage(createWith(SimpMessageType.MESSAGE, "joe", "123", "/queue/foo"));
Mockito.verifyZeroInteractions(this.brokerChannel); verifyNoInteractions(this.brokerChannel);
// subscribe + not a user destination // subscribe + not a user destination
this.handler.handleMessage(createWith(SimpMessageType.SUBSCRIBE, "joe", "123", "/queue/foo")); this.handler.handleMessage(createWith(SimpMessageType.SUBSCRIBE, "joe", "123", "/queue/foo"));
Mockito.verifyZeroInteractions(this.brokerChannel); verifyNoInteractions(this.brokerChannel);
// no match on message type // no match on message type
this.handler.handleMessage(createWith(SimpMessageType.CONNECT, "joe", "123", "user/joe/queue/foo")); this.handler.handleMessage(createWith(SimpMessageType.CONNECT, "joe", "123", "user/joe/queue/foo"));
Mockito.verifyZeroInteractions(this.brokerChannel); verifyNoInteractions(this.brokerChannel);
} }

4
spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java
View File

@ -38,8 +38,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Unit tests for {@link ExecutorSubscribableChannel}. * Unit tests for {@link ExecutorSubscribableChannel}.
@ -126,7 +126,7 @@ public class ExecutorSubscribableChannelTests {
catch (MessageDeliveryException actualException) { catch (MessageDeliveryException actualException) {
assertThat(actualException.getCause()).isEqualTo(ex); assertThat(actualException.getCause()).isEqualTo(ex);
} }
verifyZeroInteractions(secondHandler); verifyNoInteractions(secondHandler);
} }
@Test @Test

4
spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java
View File

@ -37,7 +37,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Abstract support class to test {@link TransactionAspectSupport} with reactive methods. * Abstract support class to test {@link TransactionAspectSupport} with reactive methods.
@ -79,7 +79,7 @@ public abstract class AbstractReactiveTransactionAspectTests {
checkReactiveTransaction(false); checkReactiveTransaction(false);
// expect no calls // expect no calls
verifyZeroInteractions(rtm); verifyNoInteractions(rtm);
} }
/** /**

4
spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
View File

@ -42,7 +42,7 @@ import static org.mockito.BDDMockito.willThrow;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Mock object based tests for transaction aspects. A true unit test in that it * Mock object based tests for transaction aspects. A true unit test in that it
@ -90,7 +90,7 @@ public abstract class AbstractTransactionAspectTests {
checkTransactionStatus(false); checkTransactionStatus(false);
// expect no calls // expect no calls
verifyZeroInteractions(ptm); verifyNoInteractions(ptm);
} }
/** /**

4
spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
View File

@ -45,7 +45,7 @@ import org.springframework.transaction.TransactionStatus;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* Test cases for AOP transaction management. * Test cases for AOP transaction management.
@ -148,7 +148,7 @@ public class BeanFactoryTransactionTests {
assertThat(testBean.getAge() == 666).as("Age should not be " + testBean.getAge()).isTrue(); assertThat(testBean.getAge() == 666).as("Age should not be " + testBean.getAge()).isTrue();
// Expect no methods // Expect no methods
verifyZeroInteractions(ptm); verifyNoInteractions(ptm);
// Install facade expecting a call // Install facade expecting a call
final TransactionStatus ts = mock(TransactionStatus.class); final TransactionStatus ts = mock(TransactionStatus.class);

4
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
View File

@ -41,8 +41,8 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Unit tests for {@link DefaultWebClient}. * Unit tests for {@link DefaultWebClient}.
@ -303,7 +303,7 @@ public class DefaultWebClientTests {
) )
.build(); .build();
Mono<ClientResponse> exchange = client.get().uri("/path").exchange(); Mono<ClientResponse> exchange = client.get().uri("/path").exchange();
verifyZeroInteractions(this.exchangeFunction); verifyNoInteractions(this.exchangeFunction);
exchange.block(Duration.ofSeconds(10)); exchange.block(Duration.ofSeconds(10));
ClientRequest request = verifyAndGetRequest(); ClientRequest request = verifyAndGetRequest();
assertThat(request.headers().getFirst("Custom")).isEqualTo("value"); assertThat(request.headers().getFirst("Custom")).isEqualTo("value");

4
spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java
View File

@ -27,7 +27,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoInteractions;
/** /**
* A test fixture with HandlerExecutionChain and mock handler interceptors. * A test fixture with HandlerExecutionChain and mock handler interceptors.
@ -120,7 +120,7 @@ public class HandlerExecutionChainTests {
@Test @Test
public void exceptionBeforePreHandle() throws Exception { public void exceptionBeforePreHandle() throws Exception {
this.chain.triggerAfterCompletion(this.request, this.response, null); this.chain.triggerAfterCompletion(this.request, this.response, null);
verifyZeroInteractions(this.interceptor1, this.interceptor2, this.interceptor3); verifyNoInteractions(this.interceptor1, this.interceptor2, this.interceptor3);
} }
@Test @Test

4
spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java
View File

@ -66,8 +66,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
/** /**
* Test fixture for {@link StompSubProtocolHandler} tests. * Test fixture for {@link StompSubProtocolHandler} tests.
@ -402,7 +402,7 @@ public class StompSubProtocolHandlerTests {
this.protocolHandler.afterSessionStarted(this.session, this.channel); this.protocolHandler.afterSessionStarted(this.session, this.channel);
this.protocolHandler.handleMessageFromClient(this.session, textMessage, this.channel); this.protocolHandler.handleMessageFromClient(this.session, textMessage, this.channel);
verifyZeroInteractions(this.channel); verifyNoInteractions(this.channel);
assertThat(this.session.getSentMessages().size()).isEqualTo(1); assertThat(this.session.getSentMessages().size()).isEqualTo(1);
TextMessage actual = (TextMessage) this.session.getSentMessages().get(0); TextMessage actual = (TextMessage) this.session.getSentMessages().get(0);
assertThat(actual.getPayload().startsWith("ERROR")).isTrue(); assertThat(actual.getPayload().startsWith("ERROR")).isTrue();