From 798b51f4a3e83c136904c495f65b3686a51fc930 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 8 May 2019 13:45:42 -0700 Subject: [PATCH] Migrate to BDD Mockito Migrate all tests to consistently use BDD Mockito. Also add checksyle rule to enforce going forwards. --- .../DefaultListableBeanFactoryTests.java | 9 +-- .../annotation/ParameterResolutionTests.java | 4 +- ...ApplicationListenerMethodAdapterTests.java | 4 +- .../core/io/buffer/DataBufferUtilsTests.java | 51 +++++++++-------- .../MessagingMessageListenerAdapterTests.java | 3 +- .../core/GenericMessagingTemplateTests.java | 22 ++++---- .../MessageMethodArgumentResolverTests.java | 4 +- .../DefaultRSocketRequesterBuilderTests.java | 4 +- .../SimpleBrokerMessageHandlerTests.java | 4 +- .../simp/stomp/DefaultStompSessionTests.java | 16 +++--- .../DefaultUserDestinationResolverTests.java | 10 ++-- .../user/MultiServerUserRegistryTests.java | 18 +++--- .../UserDestinationMessageHandlerTests.java | 5 +- .../user/UserRegistryMessageHandlerTests.java | 16 +++--- ...tPublishingTestExecutionListenerTests.java | 10 ++-- .../jupiter/DisabledIfConditionTests.java | 10 ++-- .../statements/SpringFailOnTimeoutTests.java | 12 ++-- .../support/TestPropertySourceUtilsTests.java | 4 +- .../DelegatingWebConnectionTests.java | 12 ++-- .../MockMvcConnectionBuilderSupportTests.java | 4 +- .../WebConnectionHtmlUnitDriverTests.java | 4 +- ...bstractReactiveTransactionAspectTests.java | 32 +++++------ ...mponentsClientHttpRequestFactoryTests.java | 10 ++-- .../client/SimpleClientHttpResponseTests.java | 4 +- .../codec/EncoderHttpMessageWriterTests.java | 8 +-- .../MultipartHttpMessageWriterTests.java | 4 +- .../codec/support/CodecConfigurerTests.java | 34 +++++------ .../ResourceHttpMessageConverterTests.java | 4 +- ...onentsHttpInvokerRequestExecutorTests.java | 12 ++-- .../async/WebAsyncManagerTimeoutTests.java | 3 +- ...ethodReturnValueHandlerCompositeTests.java | 12 ++-- .../DefaultWebSessionManagerTests.java | 26 ++++----- .../web/reactive/DispatcherHandlerTests.java | 10 ++-- .../DelegatingWebFluxConfigurationTests.java | 6 +- .../DefaultClientRequestBuilderTests.java | 8 +-- .../client/DefaultClientResponseTests.java | 56 +++++++++---------- .../client/DefaultWebClientTests.java | 6 +- .../client/ExchangeFilterFunctionsTests.java | 6 +- .../support/ClientResponseWrapperTests.java | 28 +++++----- .../server/DefaultRenderingResponseTests.java | 12 ++-- .../function/server/HeadersWrapperTests.java | 18 +++--- .../function/server/RouterFunctionsTests.java | 10 ++-- .../support/ServerRequestWrapperTests.java | 32 +++++------ .../resource/ResourceWebHandlerTests.java | 8 +-- .../method/InvocableHandlerMethodTests.java | 6 +- ...nAttributeMethodArgumentResolverTests.java | 10 ++-- .../function/RouterFunctionsTests.java | 10 ++-- .../annotation/ResponseBodyEmitterTests.java | 4 +- .../ResourceHttpRequestHandlerTests.java | 8 +-- .../resource/ResourceUrlProviderTests.java | 4 +- .../view/script/ScriptTemplateViewTests.java | 3 +- .../StompSubProtocolHandlerTests.java | 8 +-- .../messaging/WebSocketStompClientTests.java | 8 +-- .../sockjs/client/SockJsClientTests.java | 3 +- src/checkstyle/checkstyle.xml | 7 +++ 55 files changed, 322 insertions(+), 324 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index 22f1f3b3e6..cdb2a9b49d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -45,7 +45,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Ignore; import org.junit.Test; -import org.mockito.ArgumentMatchers; import org.springframework.beans.BeansException; import org.springframework.beans.MutablePropertyValues; @@ -112,13 +111,13 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; /** * Tests properties population and autowire behavior. @@ -135,8 +134,6 @@ public class DefaultListableBeanFactoryTests { private static final Log factoryLog = LogFactory.getLog(DefaultListableBeanFactory.class); - - @Test public void testUnreferencedSingletonWasInstantiated() { KnowsIfInstantiated.clearInstantiationRecord(); @@ -1240,8 +1237,8 @@ public class DefaultListableBeanFactoryTests { public void testExpressionInStringArray() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); BeanExpressionResolver beanExpressionResolver = mock(BeanExpressionResolver.class); - when(beanExpressionResolver.evaluate(eq("#{foo}"), ArgumentMatchers.any(BeanExpressionContext.class))) - .thenReturn("classpath:/org/springframework/beans/factory/xml/util.properties"); + given(beanExpressionResolver.evaluate(eq("#{foo}"), any(BeanExpressionContext.class))) + .willReturn("classpath:/org/springframework/beans/factory/xml/util.properties"); bf.setBeanExpressionResolver(beanExpressionResolver); RootBeanDefinition rbd = new RootBeanDefinition(PropertiesFactoryBean.class); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java index d86418b441..ce46f7c9d0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java @@ -33,8 +33,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for {@link ParameterResolutionDelegate}. @@ -128,7 +128,7 @@ public class ParameterResolutionTests { AutowireCapableBeanFactory beanFactory = mock(AutowireCapableBeanFactory.class); // Configure the mocked BeanFactory to return the DependencyDescriptor for convenience and // to avoid using an ArgumentCaptor. - when(beanFactory.resolveDependency(any(), isNull())).thenAnswer(invocation -> invocation.getArgument(0)); + given(beanFactory.resolveDependency(any(), isNull())).willAnswer(invocation -> invocation.getArgument(0)); Parameter[] parameters = constructor.getParameters(); for (int parameterIndex = 0; parameterIndex < parameters.length; parameterIndex++) { diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationListenerMethodAdapterTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationListenerMethodAdapterTests.java index 0f6cd37723..9714e2c5b6 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationListenerMethodAdapterTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationListenerMethodAdapterTests.java @@ -36,12 +36,12 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; /** * @author Stephane Nicoll @@ -312,7 +312,7 @@ public class ApplicationListenerMethodAdapterTests extends AbstractApplicationEv public void beanInstanceRetrievedAtEveryInvocation() { Method method = ReflectionUtils.findMethod( SampleEvents.class, "handleGenericString", GenericTestEvent.class); - when(this.context.getBean("testBean")).thenReturn(this.sampleEvents); + given(this.context.getBean("testBean")).willReturn(this.sampleEvents); ApplicationListenerMethodAdapter listener = new ApplicationListenerMethodAdapter( "testBean", GenericTestEvent.class, method); listener.init(this.context, new EventExpressionEvaluator()); diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java index 0af0c00d6a..f600fe3075 100644 --- a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java @@ -53,9 +53,9 @@ import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.doAnswer; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willAnswer; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * @author Arjen Poutsma @@ -94,14 +94,14 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase { @Test public void readByteChannelError() throws Exception { ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())) - .thenAnswer(invocation -> { + given(channel.read(any())) + .willAnswer(invocation -> { ByteBuffer buffer = invocation.getArgument(0); buffer.put("foo".getBytes(StandardCharsets.UTF_8)); buffer.flip(); return 3; }) - .thenThrow(new IOException()); + .willThrow(new IOException()); Flux result = DataBufferUtils.readByteChannel(() -> channel, this.bufferFactory, 3); @@ -151,7 +151,7 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase { @Test public void readAsynchronousFileChannelError() throws Exception { AsynchronousFileChannel channel = mock(AsynchronousFileChannel.class); - doAnswer(invocation -> { + willAnswer(invocation -> { ByteBuffer byteBuffer = invocation.getArgument(0); byteBuffer.put("foo".getBytes(StandardCharsets.UTF_8)); byteBuffer.flip(); @@ -161,13 +161,13 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase { CompletionHandler completionHandler = invocation.getArgument(3); completionHandler.completed(3, dataBuffer); return null; - }).doAnswer(invocation -> { + }).willAnswer(invocation -> { DataBuffer dataBuffer = invocation.getArgument(2); CompletionHandler completionHandler = invocation.getArgument(3); completionHandler.failed(new IOException(), dataBuffer); return null; }) - .when(channel).read(any(), anyLong(), any(), any()); + .given(channel).read(any(), anyLong(), any(), any()); Flux result = DataBufferUtils.readAsynchronousFileChannel(() -> channel, this.bufferFactory, 3); @@ -318,14 +318,14 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase { Flux flux = Flux.just(foo, bar); WritableByteChannel channel = mock(WritableByteChannel.class); - when(channel.write(any())) - .thenAnswer(invocation -> { + given(channel.write(any())) + .willAnswer(invocation -> { ByteBuffer buffer = invocation.getArgument(0); int written = buffer.remaining(); buffer.position(buffer.limit()); return written; }) - .thenThrow(new IOException()); + .willThrow(new IOException()); Flux writeResult = DataBufferUtils.write(flux, channel); StepVerifier.create(writeResult) @@ -420,7 +420,7 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase { Flux flux = Flux.just(foo, bar); AsynchronousFileChannel channel = mock(AsynchronousFileChannel.class); - doAnswer(invocation -> { + willAnswer(invocation -> { ByteBuffer buffer = invocation.getArgument(0); long pos = invocation.getArgument(1); CompletionHandler completionHandler = invocation.getArgument(3); @@ -433,15 +433,14 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase { return null; }) - .doAnswer(invocation -> { - ByteBuffer buffer = invocation.getArgument(0); - CompletionHandler completionHandler = - invocation.getArgument(3); - completionHandler.failed(new IOException(), buffer); - return null; - }) - .when(channel).write(isA(ByteBuffer.class), anyLong(), isA(ByteBuffer.class), - isA(CompletionHandler.class)); + .willAnswer(invocation -> { + ByteBuffer buffer = invocation.getArgument(0); + CompletionHandler completionHandler = + invocation.getArgument(3); + completionHandler.failed(new IOException(), buffer); + return null; + }) + .given(channel).write(isA(ByteBuffer.class), anyLong(), isA(ByteBuffer.class), isA(CompletionHandler.class)); Flux writeResult = DataBufferUtils.write(flux, channel); StepVerifier.create(writeResult) @@ -684,11 +683,11 @@ public class DataBufferUtilsTests extends AbstractDataBufferAllocatingTestCase { @Test public void SPR16070() throws Exception { ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())) - .thenAnswer(putByte('a')) - .thenAnswer(putByte('b')) - .thenAnswer(putByte('c')) - .thenReturn(-1); + given(channel.read(any())) + .willAnswer(putByte('a')) + .willAnswer(putByte('b')) + .willAnswer(putByte('c')) + .willReturn(-1); Flux read = DataBufferUtils.readByteChannel(() -> channel, this.bufferFactory, 1); diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java index 117c10acae..3f42cf0637 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java @@ -55,7 +55,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; /** * @author Stephane Nicoll @@ -149,7 +148,7 @@ public class MessagingMessageListenerAdapterTests { @Test public void headerConversionLazilyInvoked() throws JMSException { javax.jms.Message jmsMessage = mock(javax.jms.Message.class); - when(jmsMessage.getPropertyNames()).thenThrow(new IllegalArgumentException("Header failure")); + given(jmsMessage.getPropertyNames()).willThrow(new IllegalArgumentException("Header failure")); MessagingMessageListenerAdapter listener = getSimpleInstance("simple", Message.class); Message message = listener.toMessagingMessage(jmsMessage); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java index a19e9b3695..52ccdf1da2 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java @@ -47,7 +47,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doAnswer; +import static org.mockito.BDDMockito.willAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -80,10 +80,10 @@ public class GenericMessagingTemplateTests { public void sendWithTimeout() { SubscribableChannel channel = mock(SubscribableChannel.class); final AtomicReference> sent = new AtomicReference<>(); - doAnswer(invocation -> { + willAnswer(invocation -> { sent.set(invocation.getArgument(0)); return true; - }).when(channel).send(any(Message.class), eq(30_000L)); + }).given(channel).send(any(Message.class), eq(30_000L)); Message message = MessageBuilder.withPayload("request") .setHeader(GenericMessagingTemplate.DEFAULT_SEND_TIMEOUT_HEADER, 30_000L) .setHeader(GenericMessagingTemplate.DEFAULT_RECEIVE_TIMEOUT_HEADER, 1L) @@ -99,10 +99,10 @@ public class GenericMessagingTemplateTests { public void sendWithTimeoutMutable() { SubscribableChannel channel = mock(SubscribableChannel.class); final AtomicReference> sent = new AtomicReference<>(); - doAnswer(invocation -> { + willAnswer(invocation -> { sent.set(invocation.getArgument(0)); return true; - }).when(channel).send(any(Message.class), eq(30_000L)); + }).given(channel).send(any(Message.class), eq(30_000L)); MessageHeaderAccessor accessor = new MessageHeaderAccessor(); accessor.setLeaveMutable(true); Message message = new GenericMessage<>("request", accessor.getMessageHeaders()); @@ -140,10 +140,10 @@ public class GenericMessagingTemplateTests { SubscribableChannel channel = mock(SubscribableChannel.class); MessageHandler handler = createLateReplier(latch, failure); - doAnswer(invocation -> { + willAnswer(invocation -> { this.executor.execute(() -> handler.handleMessage(invocation.getArgument(0))); return true; - }).when(channel).send(any(Message.class), anyLong()); + }).given(channel).send(any(Message.class), anyLong()); assertNull(this.template.convertSendAndReceive(channel, "request", String.class)); assertTrue(latch.await(10_000, TimeUnit.MILLISECONDS)); @@ -166,10 +166,10 @@ public class GenericMessagingTemplateTests { SubscribableChannel channel = mock(SubscribableChannel.class); MessageHandler handler = createLateReplier(latch, failure); - doAnswer(invocation -> { + willAnswer(invocation -> { this.executor.execute(() -> handler.handleMessage(invocation.getArgument(0))); return true; - }).when(channel).send(any(Message.class), anyLong()); + }).given(channel).send(any(Message.class), anyLong()); Message message = MessageBuilder.withPayload("request") .setHeader(GenericMessagingTemplate.DEFAULT_SEND_TIMEOUT_HEADER, 30_000L) @@ -198,10 +198,10 @@ public class GenericMessagingTemplateTests { SubscribableChannel channel = mock(SubscribableChannel.class); MessageHandler handler = createLateReplier(latch, failure); - doAnswer(invocation -> { + willAnswer(invocation -> { this.executor.execute(() -> handler.handleMessage(invocation.getArgument(0))); return true; - }).when(channel).send(any(Message.class), anyLong()); + }).given(channel).send(any(Message.class), anyLong()); Message message = MessageBuilder.withPayload("request") .setHeader("sto", 30_000L) diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java index 532c4da65e..89dc482b24 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java @@ -36,8 +36,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for {@link MessageMethodArgumentResolver}. @@ -96,7 +96,7 @@ public class MessageMethodArgumentResolverTests { Message message = MessageBuilder.withPayload("test").build(); MethodParameter parameter = new MethodParameter(this.method, 1); - when(this.converter.fromMessage(message, Integer.class)).thenReturn(4); + given(this.converter.fromMessage(message, Integer.class)).willReturn(4); @SuppressWarnings("unchecked") Message actual = (Message) this.resolver.resolveArgument(parameter, message); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java index 6a3acb2800..062aaf20bf 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java @@ -30,10 +30,10 @@ import reactor.core.publisher.Mono; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; /** * Unit tests for {@link DefaultRSocketRequesterBuilder}. @@ -48,7 +48,7 @@ public class DefaultRSocketRequesterBuilderTests { @Before public void setup() { this.transport = mock(ClientTransport.class); - when(this.transport.connect(anyInt())).thenReturn(Mono.just(new MockConnection())); + given(this.transport.connect(anyInt())).willReturn(Mono.just(new MockConnection())); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java index f8dea9918b..c930f608e3 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java @@ -46,13 +46,13 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; /** * Unit tests for {@link SimpleBrokerMessageHandler}. @@ -186,7 +186,7 @@ public class SimpleBrokerMessageHandlerTests { @Test public void startAndStopWithHeartbeatValue() { ScheduledFuture future = mock(ScheduledFuture.class); - when(this.taskScheduler.scheduleWithFixedDelay(any(Runnable.class), eq(15000L))).thenReturn(future); + given(this.taskScheduler.scheduleWithFixedDelay(any(Runnable.class), eq(15000L))).willReturn(future); this.messageHandler.setTaskScheduler(this.taskScheduler); this.messageHandler.setHeartbeatValue(new long[] {15000, 16000}); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java index ae0a674631..6f4978e782 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java @@ -56,11 +56,11 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.notNull; import static org.mockito.ArgumentMatchers.same; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; /** * Unit tests for {@link DefaultStompSession}. @@ -94,7 +94,7 @@ public class DefaultStompSessionTests { SettableListenableFuture future = new SettableListenableFuture<>(); future.set(null); - when(this.connection.send(this.messageCaptor.capture())).thenReturn(future); + given(this.connection.send(this.messageCaptor.capture())).willReturn(future); } @@ -236,7 +236,7 @@ public class DefaultStompSessionTests { String payload = "Oops"; StompHeaders stompHeaders = StompHeaders.readOnlyStompHeaders(accessor.getNativeHeaders()); - when(this.sessionHandler.getPayloadType(stompHeaders)).thenReturn(String.class); + given(this.sessionHandler.getPayloadType(stompHeaders)).willReturn(String.class); this.session.handleMessage(MessageBuilder.createMessage( payload.getBytes(StandardCharsets.UTF_8), accessor.getMessageHeaders())); @@ -267,7 +267,7 @@ public class DefaultStompSessionTests { byte[] payload = "{'foo':'bar'}".getBytes(StandardCharsets.UTF_8); StompHeaders stompHeaders = StompHeaders.readOnlyStompHeaders(accessor.getNativeHeaders()); - when(this.sessionHandler.getPayloadType(stompHeaders)).thenReturn(Map.class); + given(this.sessionHandler.getPayloadType(stompHeaders)).willReturn(Map.class); this.session.handleMessage(MessageBuilder.createMessage(payload, accessor.getMessageHeaders())); @@ -294,7 +294,7 @@ public class DefaultStompSessionTests { String payload = "sample payload"; StompHeaders stompHeaders = StompHeaders.readOnlyStompHeaders(accessor.getNativeHeaders()); - when(frameHandler.getPayloadType(stompHeaders)).thenReturn(String.class); + given(frameHandler.getPayloadType(stompHeaders)).willReturn(String.class); this.session.handleMessage(MessageBuilder.createMessage(payload.getBytes(StandardCharsets.UTF_8), accessor.getMessageHeaders())); @@ -322,7 +322,7 @@ public class DefaultStompSessionTests { byte[] payload = "{'foo':'bar'}".getBytes(StandardCharsets.UTF_8); StompHeaders stompHeaders = StompHeaders.readOnlyStompHeaders(accessor.getNativeHeaders()); - when(frameHandler.getPayloadType(stompHeaders)).thenReturn(Map.class); + given(frameHandler.getPayloadType(stompHeaders)).willReturn(Map.class); this.session.handleMessage(MessageBuilder.createMessage(payload, accessor.getMessageHeaders())); @@ -419,7 +419,7 @@ public class DefaultStompSessionTests { SettableListenableFuture future = new SettableListenableFuture<>(); future.setException(exception); - when(this.connection.send(any())).thenReturn(future); + given(this.connection.send(any())).willReturn(future); assertThatExceptionOfType(MessageDeliveryException.class).isThrownBy(() -> this.session.send("/topic/foo", "sample payload".getBytes(StandardCharsets.UTF_8))) .withCause(exception); @@ -609,7 +609,7 @@ public class DefaultStompSessionTests { AtomicReference notReceived = new AtomicReference<>(); ScheduledFuture future = mock(ScheduledFuture.class); - when(taskScheduler.schedule(any(Runnable.class), any(Date.class))).thenReturn(future); + given(taskScheduler.schedule(any(Runnable.class), any(Date.class))).willReturn(future); StompHeaders headers = new StompHeaders(); headers.setDestination("/topic/foo"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java index 2f5b1aa4b7..29e39dc3a7 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java @@ -30,8 +30,8 @@ import org.springframework.util.StringUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for @@ -52,7 +52,7 @@ public class DefaultUserDestinationResolverTests { simpUser.addSessions(new TestSimpSession("123")); this.registry = mock(SimpUserRegistry.class); - when(this.registry.getUser("joe")).thenReturn(simpUser); + given(this.registry.getUser("joe")).willReturn(simpUser); this.resolver = new DefaultUserDestinationResolver(this.registry); } @@ -91,7 +91,7 @@ public class DefaultUserDestinationResolverTests { TestSimpUser simpUser = new TestSimpUser("joe"); simpUser.addSessions(new TestSimpSession("123"), new TestSimpSession("456")); - when(this.registry.getUser("joe")).thenReturn(simpUser); + given(this.registry.getUser("joe")).willReturn(simpUser); TestPrincipal user = new TestPrincipal("joe"); Message message = createMessage(SimpMessageType.SUBSCRIBE, user, "456", "/user/queue/foo"); @@ -157,7 +157,7 @@ public class DefaultUserDestinationResolverTests { TestSimpUser otherSimpUser = new TestSimpUser("anna"); otherSimpUser.addSessions(new TestSimpSession("456")); - when(this.registry.getUser("anna")).thenReturn(otherSimpUser); + given(this.registry.getUser("anna")).willReturn(otherSimpUser); TestPrincipal user = new TestPrincipal("joe"); TestPrincipal otherUser = new TestPrincipal("anna"); @@ -179,7 +179,7 @@ public class DefaultUserDestinationResolverTests { TestSimpUser simpUser = new TestSimpUser(userName); simpUser.addSessions(new TestSimpSession("openid123")); - when(this.registry.getUser(userName)).thenReturn(simpUser); + given(this.registry.getUser(userName)).willReturn(simpUser); String destination = "/user/" + StringUtils.replace(userName, "/", "%2F") + "/queue/foo"; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java index 870e9c3059..91007ee551 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java @@ -36,8 +36,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for {@link MultiServerUserRegistry}. @@ -65,9 +65,9 @@ public class MultiServerUserRegistryTests { public void getUserFromLocalRegistry() throws Exception { SimpUser user = Mockito.mock(SimpUser.class); Set users = Collections.singleton(user); - when(this.localRegistry.getUsers()).thenReturn(users); - when(this.localRegistry.getUserCount()).thenReturn(1); - when(this.localRegistry.getUser("joe")).thenReturn(user); + given(this.localRegistry.getUsers()).willReturn(users); + given(this.localRegistry.getUserCount()).willReturn(1); + given(this.localRegistry.getUser("joe")).willReturn(user); assertEquals(1, this.registry.getUserCount()); assertSame(user, this.registry.getUser("joe")); @@ -81,7 +81,7 @@ public class MultiServerUserRegistryTests { testSession.addSubscriptions(new TestSimpSubscription("remote-sub", "/remote-dest")); testUser.addSessions(testSession); SimpUserRegistry testRegistry = mock(SimpUserRegistry.class); - when(testRegistry.getUsers()).thenReturn(Collections.singleton(testUser)); + given(testRegistry.getUsers()).willReturn(Collections.singleton(testUser)); Object registryDto = new MultiServerUserRegistry(testRegistry).getLocalRegistryDto(); Message message = this.converter.toMessage(registryDto, null); @@ -120,7 +120,7 @@ public class MultiServerUserRegistryTests { user2.addSessions(session2); user3.addSessions(session3); SimpUserRegistry userRegistry = mock(SimpUserRegistry.class); - when(userRegistry.getUsers()).thenReturn(new HashSet<>(Arrays.asList(user1, user2, user3))); + given(userRegistry.getUsers()).willReturn(new HashSet<>(Arrays.asList(user1, user2, user3))); Object registryDto = new MultiServerUserRegistry(userRegistry).getLocalRegistryDto(); Message message = this.converter.toMessage(registryDto, null); @@ -143,14 +143,14 @@ public class MultiServerUserRegistryTests { TestSimpUser localUser = new TestSimpUser("joe"); TestSimpSession localSession = new TestSimpSession("sess123"); localUser.addSessions(localSession); - when(this.localRegistry.getUser("joe")).thenReturn(localUser); + given(this.localRegistry.getUser("joe")).willReturn(localUser); // Prepare broadcast message from remote server TestSimpUser remoteUser = new TestSimpUser("joe"); TestSimpSession remoteSession = new TestSimpSession("sess456"); remoteUser.addSessions(remoteSession); SimpUserRegistry remoteRegistry = mock(SimpUserRegistry.class); - when(remoteRegistry.getUsers()).thenReturn(Collections.singleton(remoteUser)); + given(remoteRegistry.getUsers()).willReturn(Collections.singleton(remoteUser)); Object remoteRegistryDto = new MultiServerUserRegistry(remoteRegistry).getLocalRegistryDto(); Message message = this.converter.toMessage(remoteRegistryDto, null); @@ -179,7 +179,7 @@ public class MultiServerUserRegistryTests { TestSimpUser testUser = new TestSimpUser("joe"); testUser.addSessions(new TestSimpSession("remote-sub")); SimpUserRegistry testRegistry = mock(SimpUserRegistry.class); - when(testRegistry.getUsers()).thenReturn(Collections.singleton(testUser)); + given(testRegistry.getUsers()).willReturn(Collections.singleton(testUser)); Object registryDto = new MultiServerUserRegistry(testRegistry).getLocalRegistryDto(); Message message = this.converter.toMessage(registryDto, null); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java index 9a1049a305..4ee1b470e5 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java @@ -39,7 +39,6 @@ import static org.junit.Assert.assertNotNull; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.ORIGINAL_DESTINATION; /** @@ -94,7 +93,7 @@ public class UserDestinationMessageHandlerTests { public void handleMessage() { TestSimpUser simpUser = new TestSimpUser("joe"); simpUser.addSessions(new TestSimpSession("123")); - when(this.registry.getUser("joe")).thenReturn(simpUser); + given(this.registry.getUser("joe")).willReturn(simpUser); given(this.brokerChannel.send(Mockito.any(Message.class))).willReturn(true); this.handler.handleMessage(createWith(SimpMessageType.MESSAGE, "joe", "123", "/user/joe/queue/foo")); @@ -130,7 +129,7 @@ public class UserDestinationMessageHandlerTests { public void handleMessageFromBrokerWithActiveSession() { TestSimpUser simpUser = new TestSimpUser("joe"); simpUser.addSessions(new TestSimpSession("123")); - when(this.registry.getUser("joe")).thenReturn(simpUser); + given(this.registry.getUser("joe")).willReturn(simpUser); this.handler.setBroadcastDestination("/topic/unresolved"); given(this.brokerChannel.send(Mockito.any(Message.class))).willReturn(true); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserRegistryMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserRegistryMessageHandlerTests.java index 7f091fa456..9559e91247 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserRegistryMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserRegistryMessageHandlerTests.java @@ -42,10 +42,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; /** * User tests for {@link UserRegistryMessageHandler}. @@ -73,7 +73,7 @@ public class UserRegistryMessageHandlerTests { MockitoAnnotations.initMocks(this); - when(this.brokerChannel.send(any())).thenReturn(true); + given(this.brokerChannel.send(any())).willReturn(true); this.converter = new MappingJackson2MessageConverter(); SimpMessagingTemplate brokerTemplate = new SimpMessagingTemplate(this.brokerChannel); @@ -97,7 +97,7 @@ public class UserRegistryMessageHandlerTests { public void brokerUnavailableEvent() throws Exception { ScheduledFuture future = Mockito.mock(ScheduledFuture.class); - when(this.taskScheduler.scheduleWithFixedDelay(any(Runnable.class), any(Long.class))).thenReturn(future); + given(this.taskScheduler.scheduleWithFixedDelay(any(Runnable.class), any(Long.class))).willReturn(future); BrokerAvailabilityEvent event = new BrokerAvailabilityEvent(true, this); this.handler.onApplicationEvent(event); @@ -118,7 +118,7 @@ public class UserRegistryMessageHandlerTests { simpUser1.addSessions(new TestSimpSession("456")); HashSet simpUsers = new HashSet<>(Arrays.asList(simpUser1, simpUser2)); - when(this.localRegistry.getUsers()).thenReturn(simpUsers); + given(this.localRegistry.getUsers()).willReturn(simpUsers); getUserRegistryTask().run(); @@ -148,8 +148,8 @@ public class UserRegistryMessageHandlerTests { HashSet simpUsers = new HashSet<>(Arrays.asList(simpUser1, simpUser2)); SimpUserRegistry remoteUserRegistry = mock(SimpUserRegistry.class); - when(remoteUserRegistry.getUserCount()).thenReturn(2); - when(remoteUserRegistry.getUsers()).thenReturn(simpUsers); + given(remoteUserRegistry.getUserCount()).willReturn(2); + given(remoteUserRegistry.getUsers()).willReturn(simpUsers); MultiServerUserRegistry remoteRegistry = new MultiServerUserRegistry(remoteUserRegistry); Message message = this.converter.toMessage(remoteRegistry.getLocalRegistryDto(), null); @@ -166,8 +166,8 @@ public class UserRegistryMessageHandlerTests { TestSimpUser simpUser = new TestSimpUser("joe"); simpUser.addSessions(new TestSimpSession("123")); - when(this.localRegistry.getUserCount()).thenReturn(1); - when(this.localRegistry.getUsers()).thenReturn(Collections.singleton(simpUser)); + given(this.localRegistry.getUserCount()).willReturn(1); + given(this.localRegistry.getUsers()).willReturn(Collections.singleton(simpUser)); assertEquals(1, this.multiServerRegistry.getUserCount()); diff --git a/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerTests.java b/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerTests.java index 50185b6473..02839a81e3 100644 --- a/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerTests.java @@ -37,11 +37,11 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doCallRealMethod; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willCallRealMethod; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; /** * Unit tests for {@link EventPublishingTestExecutionListener}. @@ -71,10 +71,10 @@ public class EventPublishingTestExecutionListenerTests { @Before public void configureMock() { // Force Mockito to invoke the interface default method - doCallRealMethod().when(testContext).publishEvent(any()); - when(testContext.getApplicationContext()).thenReturn(applicationContext); + willCallRealMethod().given(testContext).publishEvent(any()); + given(testContext.getApplicationContext()).willReturn(applicationContext); // Only allow events to be published for test methods named "publish*". - when(testContext.hasApplicationContext()).thenReturn(testName.getMethodName().startsWith("publish")); + given(testContext.hasApplicationContext()).willReturn(testName.getMethodName().startsWith("publish")); } @Test diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTests.java index 1565067546..b932d1d946 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTests.java @@ -41,8 +41,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Tests for {@link DisabledIfCondition} that verify actual condition evaluation @@ -124,12 +124,12 @@ class DisabledIfConditionTests { Class testClass = SpringTestCase.class; Method method = ReflectionUtils.findMethod(getClass(), methodName); Store store = mock(Store.class); - when(store.getOrComputeIfAbsent(any(), any(), any())).thenReturn(new TestContextManager(testClass)); + given(store.getOrComputeIfAbsent(any(), any(), any())).willReturn(new TestContextManager(testClass)); ExtensionContext extensionContext = mock(ExtensionContext.class); - when(extensionContext.getTestClass()).thenReturn(Optional.of(testClass)); - when(extensionContext.getElement()).thenReturn(Optional.of(method)); - when(extensionContext.getStore(any())).thenReturn(store); + given(extensionContext.getTestClass()).willReturn(Optional.of(testClass)); + given(extensionContext.getElement()).willReturn(Optional.of(method)); + given(extensionContext.getStore(any())).willReturn(store); return extensionContext; } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java index 43a6ecdfe3..59f037e199 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java @@ -25,8 +25,8 @@ import org.mockito.stubbing.Answer; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.BDDMockito.willThrow; import static org.mockito.Mockito.mock; /** @@ -55,7 +55,7 @@ public class SpringFailOnTimeoutTests { @Test public void userExceptionPropagates() throws Throwable { - doThrow(new Boom()).when(statement).evaluate(); + willThrow(new Boom()).given(statement).evaluate(); assertThatExceptionOfType(Boom.class).isThrownBy(() -> new SpringFailOnTimeout(statement, 1).evaluate()); @@ -63,10 +63,10 @@ public class SpringFailOnTimeoutTests { @Test public void timeoutExceptionThrownIfNoUserException() throws Throwable { - doAnswer((Answer) invocation -> { + willAnswer((Answer) invocation -> { TimeUnit.MILLISECONDS.sleep(50); return null; - }).when(statement).evaluate(); + }).given(statement).evaluate(); assertThatExceptionOfType(TimeoutException.class).isThrownBy(() -> new SpringFailOnTimeout(statement, 1).evaluate()); @@ -74,7 +74,7 @@ public class SpringFailOnTimeoutTests { @Test public void noExceptionThrownIfNoUserExceptionAndTimeoutDoesNotOccur() throws Throwable { - doAnswer((Answer) invocation -> null).when(statement).evaluate(); + willAnswer((Answer) invocation -> null).given(statement).evaluate(); new SpringFailOnTimeout(statement, 100).evaluate(); } diff --git a/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java index 39a4e2b657..3737ed5000 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java @@ -37,8 +37,8 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.springframework.test.context.support.TestPropertySourceUtils.addInlinedPropertiesToEnvironment; import static org.springframework.test.context.support.TestPropertySourceUtils.addPropertiesFilesToEnvironment; import static org.springframework.test.context.support.TestPropertySourceUtils.buildMergedTestPropertySources; @@ -165,7 +165,7 @@ public class TestPropertySourceUtilsTests { String pair = "key = value"; ByteArrayResource resource = new ByteArrayResource(pair.getBytes(), "from inlined property: " + pair); ResourceLoader resourceLoader = mock(ResourceLoader.class); - when(resourceLoader.getResource(anyString())).thenReturn(resource); + given(resourceLoader.getResource(anyString())).willReturn(resource); addPropertiesFilesToEnvironment(environment, resourceLoader, FOO_LOCATIONS); assertEquals(1, propertySources.size()); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java index 724d3af6a7..de0d563861 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java @@ -44,9 +44,9 @@ import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.core.IsNot.not; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; /** * Unit and integration tests for {@link DelegatingWebConnection}. @@ -92,7 +92,7 @@ public class DelegatingWebConnectionTests { @Test public void getResponseDefault() throws Exception { - when(defaultConnection.getResponse(request)).thenReturn(expectedResponse); + given(defaultConnection.getResponse(request)).willReturn(expectedResponse); WebResponse response = webConnection.getResponse(request); assertThat(response, sameInstance(expectedResponse)); @@ -104,8 +104,8 @@ public class DelegatingWebConnectionTests { @Test public void getResponseAllMatches() throws Exception { - when(matcher1.matches(request)).thenReturn(true); - when(connection1.getResponse(request)).thenReturn(expectedResponse); + given(matcher1.matches(request)).willReturn(true); + given(connection1.getResponse(request)).willReturn(expectedResponse); WebResponse response = webConnection.getResponse(request); assertThat(response, sameInstance(expectedResponse)); @@ -116,8 +116,8 @@ public class DelegatingWebConnectionTests { @Test public void getResponseSecondMatches() throws Exception { - when(matcher2.matches(request)).thenReturn(true); - when(connection2.getResponse(request)).thenReturn(expectedResponse); + given(matcher2.matches(request)).willReturn(true); + given(connection2.getResponse(request)).willReturn(expectedResponse); WebResponse response = webConnection.getResponse(request); assertThat(response, sameInstance(expectedResponse)); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java index 389ae05eaf..a988beb734 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java @@ -44,8 +44,8 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Integration tests for {@link MockMvcWebConnectionBuilderSupport}. @@ -70,7 +70,7 @@ public class MockMvcConnectionBuilderSupportTests { @Before public void setup() { - when(this.client.getWebConnection()).thenReturn(mock(WebConnection.class)); + given(this.client.getWebConnection()).willReturn(mock(WebConnection.class)); this.builder = new MockMvcWebConnectionBuilderSupport(this.wac) {}; } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java index 28a90eba4f..1f84ded56b 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java @@ -33,7 +33,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; +import static org.mockito.BDDMockito.given; /** * Unit tests for {@link WebConnectionHtmlUnitDriver}. @@ -52,7 +52,7 @@ public class WebConnectionHtmlUnitDriverTests { @Before public void setup() throws Exception { - when(this.connection.getResponse(any(WebRequest.class))).thenThrow(new IOException("")); + given(this.connection.getResponse(any(WebRequest.class))).willThrow(new IOException("")); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java index f0c32bc23a..d4f509f5cf 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java @@ -34,11 +34,11 @@ import org.springframework.transaction.reactive.TransactionContext; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; import static org.junit.Assert.assertEquals; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; /** * Abstract support class to test {@link TransactionAspectSupport} with reactive methods. @@ -96,8 +96,8 @@ public abstract class AbstractReactiveTransactionAspectTests { ReactiveTransaction status = mock(ReactiveTransaction.class); ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); // expect a transaction - when(rtm.getReactiveTransaction(txatt)).thenReturn(Mono.just(status)); - when(rtm.commit(status)).thenReturn(Mono.empty()); + given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status)); + given(rtm.commit(status)).willReturn(Mono.empty()); DefaultTestBean tb = new DefaultTestBean(); TestBean itb = (TestBean) advised(tb, rtm, tas); @@ -124,8 +124,8 @@ public abstract class AbstractReactiveTransactionAspectTests { ReactiveTransaction status = mock(ReactiveTransaction.class); ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); // expect a transaction - when(rtm.getReactiveTransaction(txatt)).thenReturn(Mono.just(status)); - when(rtm.commit(status)).thenReturn(Mono.empty()); + given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status)); + given(rtm.commit(status)).willReturn(Mono.empty()); DefaultTestBean tb = new DefaultTestBean(); TestBean itb = (TestBean) advised(tb, rtm, new TransactionAttributeSource[] {tas1, tas2}); @@ -154,8 +154,8 @@ public abstract class AbstractReactiveTransactionAspectTests { ReactiveTransaction status = mock(ReactiveTransaction.class); ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); // expect a transaction - when(rtm.getReactiveTransaction(txatt)).thenReturn(Mono.just(status)); - when(rtm.commit(status)).thenReturn(Mono.empty()); + given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status)); + given(rtm.commit(status)).willReturn(Mono.empty()); DefaultTestBean tb = new DefaultTestBean(); TestBean itb = (TestBean) advised(tb, rtm, tas); @@ -234,20 +234,20 @@ public abstract class AbstractReactiveTransactionAspectTests { ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); // Gets additional call(s) from TransactionControl - when(rtm.getReactiveTransaction(txatt)).thenReturn(Mono.just(status)); + given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status)); TransactionSystemException tex = new TransactionSystemException("system exception"); if (rollbackException) { if (shouldRollback) { - when(rtm.rollback(status)).thenReturn(Mono.error(tex)); + given(rtm.rollback(status)).willReturn(Mono.error(tex)); } else { - when(rtm.commit(status)).thenReturn(Mono.error(tex)); + given(rtm.commit(status)).willReturn(Mono.error(tex)); } } else { - when(rtm.commit(status)).thenReturn(Mono.empty()); - when(rtm.rollback(status)).thenReturn(Mono.empty()); + given(rtm.commit(status)).willReturn(Mono.empty()); + given(rtm.rollback(status)).willReturn(Mono.empty()); } DefaultTestBean tb = new DefaultTestBean(); @@ -289,7 +289,7 @@ public abstract class AbstractReactiveTransactionAspectTests { ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); // Expect a transaction CannotCreateTransactionException ex = new CannotCreateTransactionException("foobar", null); - when(rtm.getReactiveTransaction(txatt)).thenThrow(ex); + given(rtm.getReactiveTransaction(txatt)).willThrow(ex); DefaultTestBean tb = new DefaultTestBean() { @Override @@ -324,10 +324,10 @@ public abstract class AbstractReactiveTransactionAspectTests { ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); ReactiveTransaction status = mock(ReactiveTransaction.class); - when(rtm.getReactiveTransaction(txatt)).thenReturn(Mono.just(status)); + given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status)); UnexpectedRollbackException ex = new UnexpectedRollbackException("foobar", null); - when(rtm.commit(status)).thenReturn(Mono.error(ex)); - when(rtm.rollback(status)).thenReturn(Mono.empty()); + given(rtm.commit(status)).willReturn(Mono.error(ex)); + given(rtm.rollback(status)).willReturn(Mono.empty()); DefaultTestBean tb = new DefaultTestBean(); TestBean itb = (TestBean) advised(tb, rtm, tas); diff --git a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java index 580aca4d6a..d6e7297898 100644 --- a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java @@ -34,8 +34,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; /** @@ -83,7 +83,7 @@ public class HttpComponentsClientHttpRequestFactoryTests extends AbstractHttpReq CloseableHttpClient client = mock(CloseableHttpClient.class, withSettings().extraInterfaces(Configurable.class)); Configurable configurable = (Configurable) client; - when(configurable.getConfig()).thenReturn(defaultConfig); + given(configurable.getConfig()).willReturn(defaultConfig); HttpComponentsClientHttpRequestFactory hrf = new HttpComponentsClientHttpRequestFactory(client); assertSame("Default client configuration is expected", defaultConfig, retrieveRequestConfig(hrf)); @@ -103,7 +103,7 @@ public class HttpComponentsClientHttpRequestFactoryTests extends AbstractHttpReq CloseableHttpClient client = mock(CloseableHttpClient.class, withSettings().extraInterfaces(Configurable.class)); Configurable configurable = (Configurable) client; - when(configurable.getConfig()).thenReturn(defaultConfig); + given(configurable.getConfig()).willReturn(defaultConfig); HttpComponentsClientHttpRequestFactory hrf = new HttpComponentsClientHttpRequestFactory(client); hrf.setConnectTimeout(5000); @@ -121,7 +121,7 @@ public class HttpComponentsClientHttpRequestFactoryTests extends AbstractHttpReq final CloseableHttpClient client = mock(CloseableHttpClient.class, withSettings().extraInterfaces(Configurable.class)); Configurable configurable = (Configurable) client; - when(configurable.getConfig()).thenReturn(defaultConfig); + given(configurable.getConfig()).willReturn(defaultConfig); HttpComponentsClientHttpRequestFactory hrf = new HttpComponentsClientHttpRequestFactory() { @Override @@ -139,7 +139,7 @@ public class HttpComponentsClientHttpRequestFactoryTests extends AbstractHttpReq // Update the Http client so that it returns an updated config RequestConfig updatedDefaultConfig = RequestConfig.custom() .setConnectTimeout(1234).build(); - when(configurable.getConfig()).thenReturn(updatedDefaultConfig); + given(configurable.getConfig()).willReturn(updatedDefaultConfig); hrf.setReadTimeout(7000); RequestConfig requestConfig2 = retrieveRequestConfig(hrf); assertEquals(1234, requestConfig2.getConnectTimeout()); diff --git a/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java b/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java index fffacc2f65..6f31f3a00f 100644 --- a/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.doNothing; +import static org.mockito.BDDMockito.willDoNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -100,7 +100,7 @@ public class SimpleClientHttpResponseTests { public void shouldNotDrainWhenErrorStreamClosed() throws Exception { InputStream is = mock(InputStream.class); given(this.connection.getErrorStream()).willReturn(is); - doNothing().when(is).close(); + willDoNothing().given(is).close(); given(is.read(any())).willThrow(new NullPointerException("from HttpURLConnection#ErrorStream")); InputStream responseStream = this.response.getBody(); diff --git a/spring-web/src/test/java/org/springframework/http/codec/EncoderHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/EncoderHttpMessageWriterTests.java index 6153b32a11..47609ab591 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/EncoderHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/EncoderHttpMessageWriterTests.java @@ -45,7 +45,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; +import static org.mockito.BDDMockito.given; import static org.springframework.core.ResolvableType.forClass; import static org.springframework.http.MediaType.TEXT_HTML; import static org.springframework.http.MediaType.TEXT_PLAIN; @@ -88,7 +88,7 @@ public class EncoderHttpMessageWriterTests { @Test public void canWrite() { HttpMessageWriter writer = getWriter(MimeTypeUtils.TEXT_HTML); - when(this.encoder.canEncode(forClass(String.class), TEXT_HTML)).thenReturn(true); + given(this.encoder.canEncode(forClass(String.class), TEXT_HTML)).willReturn(true); assertTrue(writer.canWrite(forClass(String.class), TEXT_HTML)); assertFalse(writer.canWrite(forClass(String.class), TEXT_XML)); @@ -184,8 +184,8 @@ public class EncoderHttpMessageWriterTests { private HttpMessageWriter getWriter(Flux encodedStream, MimeType... mimeTypes) { List typeList = Arrays.asList(mimeTypes); - when(this.encoder.getEncodableMimeTypes()).thenReturn(typeList); - when(this.encoder.encode(any(), any(), any(), this.mediaTypeCaptor.capture(), any())).thenReturn(encodedStream); + given(this.encoder.getEncodableMimeTypes()).willReturn(typeList); + given(this.encoder.encode(any(), any(), any(), this.mediaTypeCaptor.capture(), any())).willReturn(encodedStream); return new EncoderHttpMessageWriter<>(this.encoder); } diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java index 152f164917..fbdb95ea07 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java @@ -48,8 +48,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * @author Sebastien Deleuze @@ -97,7 +97,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTestCas this.bufferFactory.wrap("Cc".getBytes(StandardCharsets.UTF_8)) ); Part mockPart = mock(Part.class); - when(mockPart.content()).thenReturn(bufferPublisher); + given(mockPart.content()).willReturn(bufferPublisher); MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder(); bodyBuilder.part("name 1", "value 1"); diff --git a/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java b/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java index 9aef4ff013..beaf78e945 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java @@ -56,8 +56,8 @@ import org.springframework.util.MimeTypeUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for {@link BaseDefaultCodecs}. @@ -110,14 +110,14 @@ public class CodecConfigurerTests { Decoder customDecoder1 = mock(Decoder.class); Decoder customDecoder2 = mock(Decoder.class); - when(customDecoder1.canDecode(ResolvableType.forClass(Object.class), null)).thenReturn(false); - when(customDecoder2.canDecode(ResolvableType.forClass(Object.class), null)).thenReturn(true); + given(customDecoder1.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(false); + given(customDecoder2.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(true); HttpMessageReader customReader1 = mock(HttpMessageReader.class); HttpMessageReader customReader2 = mock(HttpMessageReader.class); - when(customReader1.canRead(ResolvableType.forClass(Object.class), null)).thenReturn(false); - when(customReader2.canRead(ResolvableType.forClass(Object.class), null)).thenReturn(true); + given(customReader1.canRead(ResolvableType.forClass(Object.class), null)).willReturn(false); + given(customReader2.canRead(ResolvableType.forClass(Object.class), null)).willReturn(true); this.configurer.customCodecs().decoder(customDecoder1); this.configurer.customCodecs().decoder(customDecoder2); @@ -150,14 +150,14 @@ public class CodecConfigurerTests { Encoder customEncoder1 = mock(Encoder.class); Encoder customEncoder2 = mock(Encoder.class); - when(customEncoder1.canEncode(ResolvableType.forClass(Object.class), null)).thenReturn(false); - when(customEncoder2.canEncode(ResolvableType.forClass(Object.class), null)).thenReturn(true); + given(customEncoder1.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(false); + given(customEncoder2.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(true); HttpMessageWriter customWriter1 = mock(HttpMessageWriter.class); HttpMessageWriter customWriter2 = mock(HttpMessageWriter.class); - when(customWriter1.canWrite(ResolvableType.forClass(Object.class), null)).thenReturn(false); - when(customWriter2.canWrite(ResolvableType.forClass(Object.class), null)).thenReturn(true); + given(customWriter1.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(false); + given(customWriter2.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(true); this.configurer.customCodecs().encoder(customEncoder1); this.configurer.customCodecs().encoder(customEncoder2); @@ -189,14 +189,14 @@ public class CodecConfigurerTests { Decoder customDecoder1 = mock(Decoder.class); Decoder customDecoder2 = mock(Decoder.class); - when(customDecoder1.canDecode(ResolvableType.forClass(Object.class), null)).thenReturn(false); - when(customDecoder2.canDecode(ResolvableType.forClass(Object.class), null)).thenReturn(true); + given(customDecoder1.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(false); + given(customDecoder2.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(true); HttpMessageReader customReader1 = mock(HttpMessageReader.class); HttpMessageReader customReader2 = mock(HttpMessageReader.class); - when(customReader1.canRead(ResolvableType.forClass(Object.class), null)).thenReturn(false); - when(customReader2.canRead(ResolvableType.forClass(Object.class), null)).thenReturn(true); + given(customReader1.canRead(ResolvableType.forClass(Object.class), null)).willReturn(false); + given(customReader2.canRead(ResolvableType.forClass(Object.class), null)).willReturn(true); this.configurer.customCodecs().decoder(customDecoder1); this.configurer.customCodecs().decoder(customDecoder2); @@ -220,14 +220,14 @@ public class CodecConfigurerTests { Encoder customEncoder1 = mock(Encoder.class); Encoder customEncoder2 = mock(Encoder.class); - when(customEncoder1.canEncode(ResolvableType.forClass(Object.class), null)).thenReturn(false); - when(customEncoder2.canEncode(ResolvableType.forClass(Object.class), null)).thenReturn(true); + given(customEncoder1.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(false); + given(customEncoder2.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(true); HttpMessageWriter customWriter1 = mock(HttpMessageWriter.class); HttpMessageWriter customWriter2 = mock(HttpMessageWriter.class); - when(customWriter1.canWrite(ResolvableType.forClass(Object.class), null)).thenReturn(false); - when(customWriter2.canWrite(ResolvableType.forClass(Object.class), null)).thenReturn(true); + given(customWriter1.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(false); + given(customWriter2.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(true); this.configurer.customCodecs().encoder(customEncoder1); this.configurer.customCodecs().encoder(customEncoder2); diff --git a/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java index 28f2e8fc18..a3c17afff6 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.doThrow; +import static org.mockito.BDDMockito.willThrow; import static org.mockito.Mockito.mock; /** @@ -141,7 +141,7 @@ public class ResourceHttpMessageConverterTests { InputStream inputStream = mock(InputStream.class); given(resource.getInputStream()).willReturn(inputStream); given(inputStream.read(any())).willReturn(-1); - doThrow(new NullPointerException()).when(inputStream).close(); + willThrow(new NullPointerException()).given(inputStream).close(); converter.write(resource, MediaType.APPLICATION_OCTET_STREAM, outputMessage); assertEquals(0, outputMessage.getHeaders().getContentLength()); diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java index 63187611ed..c8013d1453 100644 --- a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java +++ b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java @@ -30,8 +30,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; /** @@ -75,7 +75,7 @@ public class HttpComponentsHttpInvokerRequestExecutorTests { CloseableHttpClient client = mock(CloseableHttpClient.class, withSettings().extraInterfaces(Configurable.class)); Configurable configurable = (Configurable) client; - when(configurable.getConfig()).thenReturn(defaultConfig); + given(configurable.getConfig()).willReturn(defaultConfig); HttpComponentsHttpInvokerRequestExecutor executor = new HttpComponentsHttpInvokerRequestExecutor(client); @@ -98,7 +98,7 @@ public class HttpComponentsHttpInvokerRequestExecutorTests { CloseableHttpClient client = mock(CloseableHttpClient.class, withSettings().extraInterfaces(Configurable.class)); Configurable configurable = (Configurable) client; - when(configurable.getConfig()).thenReturn(defaultConfig); + given(configurable.getConfig()).willReturn(defaultConfig); HttpComponentsHttpInvokerRequestExecutor executor = new HttpComponentsHttpInvokerRequestExecutor(client); @@ -119,7 +119,7 @@ public class HttpComponentsHttpInvokerRequestExecutorTests { final CloseableHttpClient client = mock(CloseableHttpClient.class, withSettings().extraInterfaces(Configurable.class)); Configurable configurable = (Configurable) client; - when(configurable.getConfig()).thenReturn(defaultConfig); + given(configurable.getConfig()).willReturn(defaultConfig); HttpComponentsHttpInvokerRequestExecutor executor = new HttpComponentsHttpInvokerRequestExecutor() { @@ -139,7 +139,7 @@ public class HttpComponentsHttpInvokerRequestExecutorTests { // Update the Http client so that it returns an updated config RequestConfig updatedDefaultConfig = RequestConfig.custom() .setConnectTimeout(1234).build(); - when(configurable.getConfig()).thenReturn(updatedDefaultConfig); + given(configurable.getConfig()).willReturn(updatedDefaultConfig); executor.setReadTimeout(7000); HttpPost httpPost2 = executor.createHttpPost(config); RequestConfig requestConfig2 = httpPost2.getConfig(); @@ -165,7 +165,7 @@ public class HttpComponentsHttpInvokerRequestExecutorTests { private HttpInvokerClientConfiguration mockHttpInvokerClientConfiguration(String serviceUrl) { HttpInvokerClientConfiguration config = mock(HttpInvokerClientConfiguration.class); - when(config.getServiceUrl()).thenReturn(serviceUrl); + given(config.getServiceUrl()).willReturn(serviceUrl); return config; } diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java index 6321311465..e45dbab0ef 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java @@ -36,7 +36,6 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; import static org.springframework.web.context.request.async.CallableProcessingInterceptor.RESULT_NONE; /** @@ -163,7 +162,7 @@ public class WebAsyncManagerTimeoutTests { Future future = mock(Future.class); AsyncTaskExecutor executor = mock(AsyncTaskExecutor.class); - when(executor.submit(any(Runnable.class))).thenReturn(future); + given(executor.submit(any(Runnable.class))).willReturn(future); this.asyncManager.setTaskExecutor(executor); this.asyncManager.startCallableProcessing(callable); diff --git a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java index a857774354..e65b3ad97a 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java @@ -23,10 +23,10 @@ import org.springframework.core.MethodParameter; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; /** * Test fixture with {@link HandlerMethodReturnValueHandlerComposite}. @@ -53,7 +53,7 @@ public class HandlerMethodReturnValueHandlerCompositeTests { this.stringType = new MethodParameter(getClass().getDeclaredMethod("handleString"), -1); this.integerHandler = mock(HandlerMethodReturnValueHandler.class); - when(this.integerHandler.supportsReturnType(this.integerType)).thenReturn(true); + given(this.integerHandler.supportsReturnType(this.integerType)).willReturn(true); this.handlers = new HandlerMethodReturnValueHandlerComposite(); this.handlers.addHandler(this.integerHandler); @@ -76,7 +76,7 @@ public class HandlerMethodReturnValueHandlerCompositeTests { @Test public void handleReturnValueWithMultipleHandlers() throws Exception { HandlerMethodReturnValueHandler anotherIntegerHandler = mock(HandlerMethodReturnValueHandler.class); - when(anotherIntegerHandler.supportsReturnType(this.integerType)).thenReturn(true); + given(anotherIntegerHandler.supportsReturnType(this.integerType)).willReturn(true); this.handlers.handleReturnValue(55, this.integerType, this.mavContainer, null); @@ -91,12 +91,12 @@ public class HandlerMethodReturnValueHandlerCompositeTests { MethodParameter promiseType = new MethodParameter(getClass().getDeclaredMethod("handlePromise"), -1); HandlerMethodReturnValueHandler responseBodyHandler = mock(HandlerMethodReturnValueHandler.class); - when(responseBodyHandler.supportsReturnType(promiseType)).thenReturn(true); + given(responseBodyHandler.supportsReturnType(promiseType)).willReturn(true); this.handlers.addHandler(responseBodyHandler); AsyncHandlerMethodReturnValueHandler promiseHandler = mock(AsyncHandlerMethodReturnValueHandler.class); - when(promiseHandler.supportsReturnType(promiseType)).thenReturn(true); - when(promiseHandler.isAsyncReturnValue(promise, promiseType)).thenReturn(true); + given(promiseHandler.supportsReturnType(promiseType)).willReturn(true); + given(promiseHandler.isAsyncReturnValue(promise, promiseType)).willReturn(true); this.handlers.addHandler(promiseHandler); this.handlers.handleReturnValue(promise, promiseType, this.mavContainer, null); diff --git a/spring-web/src/test/java/org/springframework/web/server/session/DefaultWebSessionManagerTests.java b/spring-web/src/test/java/org/springframework/web/server/session/DefaultWebSessionManagerTests.java index 469f9810f0..823d23fb62 100644 --- a/spring-web/src/test/java/org/springframework/web/server/session/DefaultWebSessionManagerTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/session/DefaultWebSessionManagerTests.java @@ -40,9 +40,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; /** * Unit tests for {@link DefaultWebSessionManager}. @@ -72,12 +72,12 @@ public class DefaultWebSessionManagerTests { @Before public void setUp() throws Exception { - when(this.createSession.save()).thenReturn(Mono.empty()); - when(this.createSession.getId()).thenReturn("create-session-id"); - when(this.updateSession.getId()).thenReturn("update-session-id"); + given(this.createSession.save()).willReturn(Mono.empty()); + given(this.createSession.getId()).willReturn("create-session-id"); + given(this.updateSession.getId()).willReturn("update-session-id"); - when(this.sessionStore.createWebSession()).thenReturn(Mono.just(this.createSession)); - when(this.sessionStore.retrieveSession(this.updateSession.getId())).thenReturn(Mono.just(this.updateSession)); + given(this.sessionStore.createWebSession()).willReturn(Mono.just(this.createSession)); + given(this.sessionStore.retrieveSession(this.updateSession.getId())).willReturn(Mono.just(this.updateSession)); this.sessionManager = new DefaultWebSessionManager(); this.sessionManager.setSessionIdResolver(this.sessionIdResolver); @@ -92,7 +92,7 @@ public class DefaultWebSessionManagerTests { @Test public void getSessionSaveWhenCreatedAndNotStartedThenNotSaved() { - when(this.sessionIdResolver.resolveSessionIds(this.exchange)).thenReturn(Collections.emptyList()); + given(this.sessionIdResolver.resolveSessionIds(this.exchange)).willReturn(Collections.emptyList()); WebSession session = this.sessionManager.getSession(this.exchange).block(); this.exchange.getResponse().setComplete().block(); @@ -106,12 +106,12 @@ public class DefaultWebSessionManagerTests { @Test public void getSessionSaveWhenCreatedAndStartedThenSavesAndSetsId() { - when(this.sessionIdResolver.resolveSessionIds(this.exchange)).thenReturn(Collections.emptyList()); + given(this.sessionIdResolver.resolveSessionIds(this.exchange)).willReturn(Collections.emptyList()); WebSession session = this.sessionManager.getSession(this.exchange).block(); assertSame(this.createSession, session); String sessionId = this.createSession.getId(); - when(this.createSession.isStarted()).thenReturn(true); + given(this.createSession.isStarted()).willReturn(true); this.exchange.getResponse().setComplete().block(); verify(this.sessionStore).createWebSession(); @@ -123,7 +123,7 @@ public class DefaultWebSessionManagerTests { public void existingSession() { String sessionId = this.updateSession.getId(); - when(this.sessionIdResolver.resolveSessionIds(this.exchange)).thenReturn(Collections.singletonList(sessionId)); + given(this.sessionIdResolver.resolveSessionIds(this.exchange)).willReturn(Collections.singletonList(sessionId)); WebSession actual = this.sessionManager.getSession(this.exchange).block(); assertNotNull(actual); @@ -134,9 +134,9 @@ public class DefaultWebSessionManagerTests { public void multipleSessionIds() { List ids = Arrays.asList("not-this", "not-that", this.updateSession.getId()); - when(this.sessionStore.retrieveSession("not-this")).thenReturn(Mono.empty()); - when(this.sessionStore.retrieveSession("not-that")).thenReturn(Mono.empty()); - when(this.sessionIdResolver.resolveSessionIds(this.exchange)).thenReturn(ids); + given(this.sessionStore.retrieveSession("not-this")).willReturn(Mono.empty()); + given(this.sessionStore.retrieveSession("not-that")).willReturn(Mono.empty()); + given(this.sessionIdResolver.resolveSessionIds(this.exchange)).willReturn(ids); WebSession actual = this.sessionManager.getSession(this.exchange).block(); assertNotNull(actual); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerTests.java index 3e3a60c946..c89c92dd82 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerTests.java @@ -35,8 +35,8 @@ import org.springframework.web.server.ServerWebExchange; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; /** @@ -53,10 +53,10 @@ public class DispatcherHandlerTests { public void handlerMappingOrder() { HandlerMapping hm1 = mock(HandlerMapping.class, withSettings().extraInterfaces(Ordered.class)); HandlerMapping hm2 = mock(HandlerMapping.class, withSettings().extraInterfaces(Ordered.class)); - when(((Ordered) hm1).getOrder()).thenReturn(1); - when(((Ordered) hm2).getOrder()).thenReturn(2); - when((hm1).getHandler(any())).thenReturn(Mono.just((Supplier) () -> "1")); - when((hm2).getHandler(any())).thenReturn(Mono.just((Supplier) () -> "2")); + given(((Ordered) hm1).getOrder()).willReturn(1); + given(((Ordered) hm2).getOrder()).willReturn(2); + given((hm1).getHandler(any())).willReturn(Mono.just((Supplier) () -> "1")); + given((hm2).getHandler(any())).willReturn(Mono.just((Supplier) () -> "2")); StaticApplicationContext context = new StaticApplicationContext(); context.registerBean("b2", HandlerMapping.class, () -> hm2); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java index c13dfae3d6..79c3884815 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java @@ -43,7 +43,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.doAnswer; +import static org.mockito.BDDMockito.willAnswer; import static org.mockito.Mockito.verify; /** @@ -115,11 +115,11 @@ public class DelegatingWebFluxConfigurationTests { @Test public void resourceHandlerMapping() throws Exception { delegatingConfig.setConfigurers(Collections.singletonList(webFluxConfigurer)); - doAnswer(invocation -> { + willAnswer(invocation -> { ResourceHandlerRegistry registry = invocation.getArgument(0); registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static"); return null; - }).when(webFluxConfigurer).addResourceHandlers(any(ResourceHandlerRegistry.class)); + }).given(webFluxConfigurer).addResourceHandlers(any(ResourceHandlerRegistry.class)); delegatingConfig.resourceHandlerMapping(delegatingConfig.resourceUrlProvider()); verify(webFluxConfigurer).addResourceHandlers(any(ResourceHandlerRegistry.class)); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java index e315a98107..0b5bea0318 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java @@ -39,8 +39,8 @@ import org.springframework.web.reactive.function.BodyInserter; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.springframework.http.HttpMethod.DELETE; import static org.springframework.http.HttpMethod.GET; import static org.springframework.http.HttpMethod.OPTIONS; @@ -131,7 +131,7 @@ public class DefaultClientRequestBuilderTests { messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes())); ExchangeStrategies strategies = mock(ExchangeStrategies.class); - when(strategies.messageWriters()).thenReturn(messageWriters); + given(strategies.messageWriters()).willReturn(messageWriters); MockClientHttpRequest request = new MockClientHttpRequest(GET, "/"); result.writeTo(request, strategies).block(); @@ -153,7 +153,7 @@ public class DefaultClientRequestBuilderTests { messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes())); ExchangeStrategies strategies = mock(ExchangeStrategies.class); - when(strategies.messageWriters()).thenReturn(messageWriters); + given(strategies.messageWriters()).willReturn(messageWriters); MockClientHttpRequest request = new MockClientHttpRequest(GET, "/"); result.writeTo(request, strategies).block(); @@ -176,7 +176,7 @@ public class DefaultClientRequestBuilderTests { messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes())); ExchangeStrategies strategies = mock(ExchangeStrategies.class); - when(strategies.messageWriters()).thenReturn(messageWriters); + given(strategies.messageWriters()).willReturn(messageWriters); MockClientHttpRequest request = new MockClientHttpRequest(GET, "/"); result.writeTo(request, strategies).block(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java index 0d06d7feaf..1e2703fc1a 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java @@ -49,8 +49,8 @@ import org.springframework.util.MultiValueMap; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.springframework.web.reactive.function.BodyExtractors.toMono; /** @@ -77,7 +77,7 @@ public class DefaultClientResponseTests { @Test public void statusCode() { HttpStatus status = HttpStatus.CONTINUE; - when(mockResponse.getStatusCode()).thenReturn(status); + given(mockResponse.getStatusCode()).willReturn(status); assertEquals(status, defaultClientResponse.statusCode()); } @@ -85,7 +85,7 @@ public class DefaultClientResponseTests { @Test public void rawStatusCode() { int status = 999; - when(mockResponse.getRawStatusCode()).thenReturn(status); + given(mockResponse.getRawStatusCode()).willReturn(status); assertEquals(status, defaultClientResponse.rawStatusCode()); } @@ -102,7 +102,7 @@ public class DefaultClientResponseTests { List range = Collections.singletonList(HttpRange.createByteRange(0, 42)); httpHeaders.setRange(range); - when(mockResponse.getHeaders()).thenReturn(httpHeaders); + given(mockResponse.getHeaders()).willReturn(httpHeaders); ClientResponse.Headers headers = defaultClientResponse.headers(); assertEquals(OptionalLong.of(contentLength), headers.contentLength()); @@ -116,7 +116,7 @@ public class DefaultClientResponseTests { MultiValueMap cookies = new LinkedMultiValueMap<>(); cookies.add("foo", cookie); - when(mockResponse.getCookies()).thenReturn(cookies); + given(mockResponse.getCookies()).willReturn(cookies); assertSame(cookies, defaultClientResponse.cookies()); } @@ -132,7 +132,7 @@ public class DefaultClientResponseTests { List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); Mono resultMono = defaultClientResponse.body(toMono(String.class)); assertEquals("foo", resultMono.block()); @@ -148,7 +148,7 @@ public class DefaultClientResponseTests { List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); Mono resultMono = defaultClientResponse.bodyToMono(String.class); assertEquals("foo", resultMono.block()); @@ -164,7 +164,7 @@ public class DefaultClientResponseTests { List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); Mono resultMono = defaultClientResponse.bodyToMono(new ParameterizedTypeReference() { @@ -182,7 +182,7 @@ public class DefaultClientResponseTests { List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); Flux resultFlux = defaultClientResponse.bodyToFlux(String.class); Mono> result = resultFlux.collectList(); @@ -199,7 +199,7 @@ public class DefaultClientResponseTests { List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); Flux resultFlux = defaultClientResponse.bodyToFlux(new ParameterizedTypeReference() { @@ -218,7 +218,7 @@ public class DefaultClientResponseTests { List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); ResponseEntity result = defaultClientResponse.toEntity(String.class).block(); assertEquals("foo", result.getBody()); @@ -236,14 +236,14 @@ public class DefaultClientResponseTests { HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.setContentType(MediaType.TEXT_PLAIN); - when(mockResponse.getHeaders()).thenReturn(httpHeaders); - when(mockResponse.getStatusCode()).thenThrow(new IllegalArgumentException("999")); - when(mockResponse.getRawStatusCode()).thenReturn(999); - when(mockResponse.getBody()).thenReturn(body); + given(mockResponse.getHeaders()).willReturn(httpHeaders); + given(mockResponse.getStatusCode()).willThrow(new IllegalArgumentException("999")); + given(mockResponse.getRawStatusCode()).willReturn(999); + given(mockResponse.getBody()).willReturn(body); List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); ResponseEntity result = defaultClientResponse.toEntity(String.class).block(); assertEquals("foo", result.getBody()); @@ -268,7 +268,7 @@ public class DefaultClientResponseTests { List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); ResponseEntity result = defaultClientResponse.toEntity( new ParameterizedTypeReference() { @@ -289,7 +289,7 @@ public class DefaultClientResponseTests { List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); ResponseEntity> result = defaultClientResponse.toEntityList(String.class).block(); assertEquals(Collections.singletonList("foo"), result.getBody()); @@ -307,14 +307,14 @@ public class DefaultClientResponseTests { HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.setContentType(MediaType.TEXT_PLAIN); - when(mockResponse.getHeaders()).thenReturn(httpHeaders); - when(mockResponse.getStatusCode()).thenThrow(new IllegalArgumentException("999")); - when(mockResponse.getRawStatusCode()).thenReturn(999); - when(mockResponse.getBody()).thenReturn(body); + given(mockResponse.getHeaders()).willReturn(httpHeaders); + given(mockResponse.getStatusCode()).willThrow(new IllegalArgumentException("999")); + given(mockResponse.getRawStatusCode()).willReturn(999); + given(mockResponse.getBody()).willReturn(body); List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); ResponseEntity> result = defaultClientResponse.toEntityList(String.class).block(); assertEquals(Collections.singletonList("foo"), result.getBody()); @@ -340,7 +340,7 @@ public class DefaultClientResponseTests { List> messageReaders = Collections .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - when(mockExchangeStrategies.messageReaders()).thenReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); ResponseEntity> result = defaultClientResponse.toEntityList( new ParameterizedTypeReference() { @@ -355,10 +355,10 @@ public class DefaultClientResponseTests { private void mockTextPlainResponse(Flux body) { HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.setContentType(MediaType.TEXT_PLAIN); - when(mockResponse.getHeaders()).thenReturn(httpHeaders); - when(mockResponse.getStatusCode()).thenReturn(HttpStatus.OK); - when(mockResponse.getRawStatusCode()).thenReturn(HttpStatus.OK.value()); - when(mockResponse.getBody()).thenReturn(body); + given(mockResponse.getHeaders()).willReturn(httpHeaders); + given(mockResponse.getStatusCode()).willReturn(HttpStatus.OK); + given(mockResponse.getRawStatusCode()).willReturn(HttpStatus.OK.value()); + given(mockResponse.getBody()).willReturn(body); } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java index eb7faa6f3f..ee61fdb78d 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java @@ -38,10 +38,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; /** * Unit tests for {@link DefaultWebClient}. @@ -64,7 +64,7 @@ public class DefaultWebClientTests { MockitoAnnotations.initMocks(this); this.exchangeFunction = mock(ExchangeFunction.class); ClientResponse mockResponse = mock(ClientResponse.class); - when(this.exchangeFunction.exchange(this.captor.capture())).thenReturn(Mono.just(mockResponse)); + given(this.exchangeFunction.exchange(this.captor.capture())).willReturn(Mono.just(mockResponse)); this.builder = WebClient.builder().baseUrl("/base").exchangeFunction(this.exchangeFunction); } @@ -283,7 +283,7 @@ public class DefaultWebClientTests { @Test public void switchToErrorOnEmptyClientResponseMono() { ExchangeFunction exchangeFunction = mock(ExchangeFunction.class); - when(exchangeFunction.exchange(any())).thenReturn(Mono.empty()); + given(exchangeFunction.exchange(any())).willReturn(Mono.empty()); WebClient.Builder builder = WebClient.builder().baseUrl("/base").exchangeFunction(exchangeFunction); StepVerifier.create(builder.build().get().uri("/path").exchange()) .expectErrorMessage("The underlying HTTP client completed without emitting a response.") diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java index 62b3919b25..ee2cd1e62c 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java @@ -36,8 +36,8 @@ import org.springframework.web.reactive.function.BodyExtractors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for {@link ExchangeFilterFunctions}. @@ -165,7 +165,7 @@ public class ExchangeFilterFunctionsTests { public void statusHandlerMatch() { ClientRequest request = ClientRequest.create(HttpMethod.GET, DEFAULT_URL).build(); ClientResponse response = mock(ClientResponse.class); - when(response.statusCode()).thenReturn(HttpStatus.NOT_FOUND); + given(response.statusCode()).willReturn(HttpStatus.NOT_FOUND); ExchangeFunction exchange = r -> Mono.just(response); @@ -183,7 +183,7 @@ public class ExchangeFilterFunctionsTests { public void statusHandlerNoMatch() { ClientRequest request = ClientRequest.create(HttpMethod.GET, DEFAULT_URL).build(); ClientResponse response = mock(ClientResponse.class); - when(response.statusCode()).thenReturn(HttpStatus.NOT_FOUND); + given(response.statusCode()).willReturn(HttpStatus.NOT_FOUND); Mono result = ExchangeFilterFunctions .statusError(HttpStatus::is5xxServerError, req -> new MyException()) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java index 577ed9891d..7196f48742 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java @@ -36,8 +36,8 @@ import org.springframework.web.reactive.function.client.ClientResponse; import static java.util.Collections.singletonList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * @author Arjen Poutsma @@ -62,7 +62,7 @@ public class ClientResponseWrapperTests { @Test public void statusCode() { HttpStatus status = HttpStatus.BAD_REQUEST; - when(mockResponse.statusCode()).thenReturn(status); + given(mockResponse.statusCode()).willReturn(status); assertSame(status, wrapper.statusCode()); } @@ -70,7 +70,7 @@ public class ClientResponseWrapperTests { @Test public void rawStatusCode() { int status = 999; - when(mockResponse.rawStatusCode()).thenReturn(status); + given(mockResponse.rawStatusCode()).willReturn(status); assertEquals(status, wrapper.rawStatusCode()); } @@ -78,7 +78,7 @@ public class ClientResponseWrapperTests { @Test public void headers() { ClientResponse.Headers headers = mock(ClientResponse.Headers.class); - when(mockResponse.headers()).thenReturn(headers); + given(mockResponse.headers()).willReturn(headers); assertSame(headers, wrapper.headers()); } @@ -87,7 +87,7 @@ public class ClientResponseWrapperTests { @SuppressWarnings("unchecked") public void cookies() { MultiValueMap cookies = mock(MultiValueMap.class); - when(mockResponse.cookies()).thenReturn(cookies); + given(mockResponse.cookies()).willReturn(cookies); assertSame(cookies, wrapper.cookies()); } @@ -96,7 +96,7 @@ public class ClientResponseWrapperTests { public void bodyExtractor() { Mono result = Mono.just("foo"); BodyExtractor, ReactiveHttpInputMessage> extractor = BodyExtractors.toMono(String.class); - when(mockResponse.body(extractor)).thenReturn(result); + given(mockResponse.body(extractor)).willReturn(result); assertSame(result, wrapper.body(extractor)); } @@ -104,7 +104,7 @@ public class ClientResponseWrapperTests { @Test public void bodyToMonoClass() { Mono result = Mono.just("foo"); - when(mockResponse.bodyToMono(String.class)).thenReturn(result); + given(mockResponse.bodyToMono(String.class)).willReturn(result); assertSame(result, wrapper.bodyToMono(String.class)); } @@ -113,7 +113,7 @@ public class ClientResponseWrapperTests { public void bodyToMonoParameterizedTypeReference() { Mono result = Mono.just("foo"); ParameterizedTypeReference reference = new ParameterizedTypeReference() {}; - when(mockResponse.bodyToMono(reference)).thenReturn(result); + given(mockResponse.bodyToMono(reference)).willReturn(result); assertSame(result, wrapper.bodyToMono(reference)); } @@ -121,7 +121,7 @@ public class ClientResponseWrapperTests { @Test public void bodyToFluxClass() { Flux result = Flux.just("foo"); - when(mockResponse.bodyToFlux(String.class)).thenReturn(result); + given(mockResponse.bodyToFlux(String.class)).willReturn(result); assertSame(result, wrapper.bodyToFlux(String.class)); } @@ -130,7 +130,7 @@ public class ClientResponseWrapperTests { public void bodyToFluxParameterizedTypeReference() { Flux result = Flux.just("foo"); ParameterizedTypeReference reference = new ParameterizedTypeReference() {}; - when(mockResponse.bodyToFlux(reference)).thenReturn(result); + given(mockResponse.bodyToFlux(reference)).willReturn(result); assertSame(result, wrapper.bodyToFlux(reference)); } @@ -138,7 +138,7 @@ public class ClientResponseWrapperTests { @Test public void toEntityClass() { Mono> result = Mono.just(new ResponseEntity<>("foo", HttpStatus.OK)); - when(mockResponse.toEntity(String.class)).thenReturn(result); + given(mockResponse.toEntity(String.class)).willReturn(result); assertSame(result, wrapper.toEntity(String.class)); } @@ -147,7 +147,7 @@ public class ClientResponseWrapperTests { public void toEntityParameterizedTypeReference() { Mono> result = Mono.just(new ResponseEntity<>("foo", HttpStatus.OK)); ParameterizedTypeReference reference = new ParameterizedTypeReference() {}; - when(mockResponse.toEntity(reference)).thenReturn(result); + given(mockResponse.toEntity(reference)).willReturn(result); assertSame(result, wrapper.toEntity(reference)); } @@ -155,7 +155,7 @@ public class ClientResponseWrapperTests { @Test public void toEntityListClass() { Mono>> result = Mono.just(new ResponseEntity<>(singletonList("foo"), HttpStatus.OK)); - when(mockResponse.toEntityList(String.class)).thenReturn(result); + given(mockResponse.toEntityList(String.class)).willReturn(result); assertSame(result, wrapper.toEntityList(String.class)); } @@ -164,7 +164,7 @@ public class ClientResponseWrapperTests { public void toEntityListParameterizedTypeReference() { Mono>> result = Mono.just(new ResponseEntity<>(singletonList("foo"), HttpStatus.OK)); ParameterizedTypeReference reference = new ParameterizedTypeReference() {}; - when(mockResponse.toEntityList(reference)).thenReturn(result); + given(mockResponse.toEntityList(reference)).willReturn(result); assertSame(result, wrapper.toEntityList(reference)); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseTests.java index 19819d0f12..b6e30dba19 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseTests.java @@ -47,8 +47,8 @@ import org.springframework.web.server.ServerWebExchange; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * @author Arjen Poutsma @@ -139,14 +139,14 @@ public class DefaultRenderingResponseTests { MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("http://localhost")); ViewResolver viewResolver = mock(ViewResolver.class); View view = mock(View.class); - when(viewResolver.resolveViewName("view", Locale.ENGLISH)).thenReturn(Mono.just(view)); - when(view.render(model, null, exchange)).thenReturn(Mono.empty()); + given(viewResolver.resolveViewName("view", Locale.ENGLISH)).willReturn(Mono.just(view)); + given(view.render(model, null, exchange)).willReturn(Mono.empty()); List viewResolvers = new ArrayList<>(); viewResolvers.add(viewResolver); HandlerStrategies mockConfig = mock(HandlerStrategies.class); - when(mockConfig.viewResolvers()).thenReturn(viewResolvers); + given(mockConfig.viewResolvers()).willReturn(viewResolvers); StepVerifier.create(result) .expectNextMatches(response -> "view".equals(response.name()) && @@ -162,13 +162,13 @@ public class DefaultRenderingResponseTests { MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("http://localhost")); TestView view = new TestView(); ViewResolver viewResolver = mock(ViewResolver.class); - when(viewResolver.resolveViewName(any(), any())).thenReturn(Mono.just(view)); + given(viewResolver.resolveViewName(any(), any())).willReturn(Mono.just(view)); List viewResolvers = new ArrayList<>(); viewResolvers.add(viewResolver); ServerResponse.Context context = mock(ServerResponse.Context.class); - when(context.viewResolvers()).thenReturn(viewResolvers); + given(context.viewResolvers()).willReturn(viewResolvers); StepVerifier.create(result.flatMap(response -> response.writeTo(exchange, context))) .verifyComplete(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTests.java index 9435eae0b8..25f31c17b3 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTests.java @@ -33,8 +33,8 @@ import org.springframework.http.MediaType; import org.springframework.web.reactive.function.server.support.ServerRequestWrapper; import static org.junit.Assert.assertSame; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * @author Arjen Poutsma @@ -56,7 +56,7 @@ public class HeadersWrapperTests { @Test public void accept() { List accept = Collections.singletonList(MediaType.APPLICATION_JSON); - when(mockHeaders.accept()).thenReturn(accept); + given(mockHeaders.accept()).willReturn(accept); assertSame(accept, wrapper.accept()); } @@ -64,7 +64,7 @@ public class HeadersWrapperTests { @Test public void acceptCharset() { List acceptCharset = Collections.singletonList(StandardCharsets.UTF_8); - when(mockHeaders.acceptCharset()).thenReturn(acceptCharset); + given(mockHeaders.acceptCharset()).willReturn(acceptCharset); assertSame(acceptCharset, wrapper.acceptCharset()); } @@ -72,7 +72,7 @@ public class HeadersWrapperTests { @Test public void contentLength() { OptionalLong contentLength = OptionalLong.of(42L); - when(mockHeaders.contentLength()).thenReturn(contentLength); + given(mockHeaders.contentLength()).willReturn(contentLength); assertSame(contentLength, wrapper.contentLength()); } @@ -80,7 +80,7 @@ public class HeadersWrapperTests { @Test public void contentType() { Optional contentType = Optional.of(MediaType.APPLICATION_JSON); - when(mockHeaders.contentType()).thenReturn(contentType); + given(mockHeaders.contentType()).willReturn(contentType); assertSame(contentType, wrapper.contentType()); } @@ -88,7 +88,7 @@ public class HeadersWrapperTests { @Test public void host() { InetSocketAddress host = InetSocketAddress.createUnresolved("example.com", 42); - when(mockHeaders.host()).thenReturn(host); + given(mockHeaders.host()).willReturn(host); assertSame(host, wrapper.host()); } @@ -96,7 +96,7 @@ public class HeadersWrapperTests { @Test public void range() { List range = Collections.singletonList(HttpRange.createByteRange(42)); - when(mockHeaders.range()).thenReturn(range); + given(mockHeaders.range()).willReturn(range); assertSame(range, wrapper.range()); } @@ -105,7 +105,7 @@ public class HeadersWrapperTests { public void header() { String name = "foo"; List value = Collections.singletonList("bar"); - when(mockHeaders.header(name)).thenReturn(value); + given(mockHeaders.header(name)).willReturn(value); assertSame(value, wrapper.header(name)); } @@ -113,7 +113,7 @@ public class HeadersWrapperTests { @Test public void asHttpHeaders() { HttpHeaders httpHeaders = new HttpHeaders(); - when(mockHeaders.asHttpHeaders()).thenReturn(httpHeaders); + given(mockHeaders.asHttpHeaders()).willReturn(httpHeaders); assertSame(httpHeaders, wrapper.asHttpHeaders()); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java index 9104200edd..8c952ca19a 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java @@ -39,8 +39,8 @@ import org.springframework.web.server.WebFilterChain; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * @author Arjen Poutsma @@ -55,7 +55,7 @@ public class RouterFunctionsTests { MockServerRequest request = MockServerRequest.builder().build(); RequestPredicate requestPredicate = mock(RequestPredicate.class); - when(requestPredicate.test(request)).thenReturn(true); + given(requestPredicate.test(request)).willReturn(true); RouterFunction result = RouterFunctions.route(requestPredicate, handlerFunction); @@ -75,7 +75,7 @@ public class RouterFunctionsTests { MockServerRequest request = MockServerRequest.builder().build(); RequestPredicate requestPredicate = mock(RequestPredicate.class); - when(requestPredicate.test(request)).thenReturn(false); + given(requestPredicate.test(request)).willReturn(false); RouterFunction result = RouterFunctions.route(requestPredicate, handlerFunction); assertNotNull(result); @@ -93,7 +93,7 @@ public class RouterFunctionsTests { MockServerRequest request = MockServerRequest.builder().build(); RequestPredicate requestPredicate = mock(RequestPredicate.class); - when(requestPredicate.nest(request)).thenReturn(Optional.of(request)); + given(requestPredicate.nest(request)).willReturn(Optional.of(request)); RouterFunction result = RouterFunctions.nest(requestPredicate, routerFunction); assertNotNull(result); @@ -112,7 +112,7 @@ public class RouterFunctionsTests { MockServerRequest request = MockServerRequest.builder().build(); RequestPredicate requestPredicate = mock(RequestPredicate.class); - when(requestPredicate.nest(request)).thenReturn(Optional.empty()); + given(requestPredicate.nest(request)).willReturn(Optional.empty()); RouterFunction result = RouterFunctions.nest(requestPredicate, routerFunction); assertNotNull(result); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java index a9082d8d2e..b9480a6931 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java @@ -37,8 +37,8 @@ import org.springframework.web.reactive.function.server.ServerRequest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * @author Arjen Poutsma @@ -58,7 +58,7 @@ public class ServerRequestWrapperTests { @Test public void method() { HttpMethod method = HttpMethod.POST; - when(mockRequest.method()).thenReturn(method); + given(mockRequest.method()).willReturn(method); assertSame(method, wrapper.method()); } @@ -66,7 +66,7 @@ public class ServerRequestWrapperTests { @Test public void uri() { URI uri = URI.create("https://example.com"); - when(mockRequest.uri()).thenReturn(uri); + given(mockRequest.uri()).willReturn(uri); assertSame(uri, wrapper.uri()); } @@ -74,7 +74,7 @@ public class ServerRequestWrapperTests { @Test public void path() { String path = "/foo/bar"; - when(mockRequest.path()).thenReturn(path); + given(mockRequest.path()).willReturn(path); assertSame(path, wrapper.path()); } @@ -82,7 +82,7 @@ public class ServerRequestWrapperTests { @Test public void headers() { ServerRequest.Headers headers = mock(ServerRequest.Headers.class); - when(mockRequest.headers()).thenReturn(headers); + given(mockRequest.headers()).willReturn(headers); assertSame(headers, wrapper.headers()); } @@ -91,7 +91,7 @@ public class ServerRequestWrapperTests { public void attribute() { String name = "foo"; String value = "bar"; - when(mockRequest.attribute(name)).thenReturn(Optional.of(value)); + given(mockRequest.attribute(name)).willReturn(Optional.of(value)); assertEquals(Optional.of(value), wrapper.attribute(name)); } @@ -100,7 +100,7 @@ public class ServerRequestWrapperTests { public void queryParam() { String name = "foo"; String value = "bar"; - when(mockRequest.queryParam(name)).thenReturn(Optional.of(value)); + given(mockRequest.queryParam(name)).willReturn(Optional.of(value)); assertEquals(Optional.of(value), wrapper.queryParam(name)); } @@ -109,7 +109,7 @@ public class ServerRequestWrapperTests { public void queryParams() { MultiValueMap value = new LinkedMultiValueMap<>(); value.add("foo", "bar"); - when(mockRequest.queryParams()).thenReturn(value); + given(mockRequest.queryParams()).willReturn(value); assertSame(value, wrapper.queryParams()); } @@ -118,7 +118,7 @@ public class ServerRequestWrapperTests { public void pathVariable() { String name = "foo"; String value = "bar"; - when(mockRequest.pathVariable(name)).thenReturn(value); + given(mockRequest.pathVariable(name)).willReturn(value); assertEquals(value, wrapper.pathVariable(name)); } @@ -126,7 +126,7 @@ public class ServerRequestWrapperTests { @Test public void pathVariables() { Map pathVariables = Collections.singletonMap("foo", "bar"); - when(mockRequest.pathVariables()).thenReturn(pathVariables); + given(mockRequest.pathVariables()).willReturn(pathVariables); assertSame(pathVariables, wrapper.pathVariables()); } @@ -135,7 +135,7 @@ public class ServerRequestWrapperTests { @SuppressWarnings("unchecked") public void cookies() { MultiValueMap cookies = mock(MultiValueMap.class); - when(mockRequest.cookies()).thenReturn(cookies); + given(mockRequest.cookies()).willReturn(cookies); assertSame(cookies, wrapper.cookies()); } @@ -144,7 +144,7 @@ public class ServerRequestWrapperTests { public void bodyExtractor() { Mono result = Mono.just("foo"); BodyExtractor, ReactiveHttpInputMessage> extractor = BodyExtractors.toMono(String.class); - when(mockRequest.body(extractor)).thenReturn(result); + given(mockRequest.body(extractor)).willReturn(result); assertSame(result, wrapper.body(extractor)); } @@ -152,7 +152,7 @@ public class ServerRequestWrapperTests { @Test public void bodyToMonoClass() { Mono result = Mono.just("foo"); - when(mockRequest.bodyToMono(String.class)).thenReturn(result); + given(mockRequest.bodyToMono(String.class)).willReturn(result); assertSame(result, wrapper.bodyToMono(String.class)); } @@ -161,7 +161,7 @@ public class ServerRequestWrapperTests { public void bodyToMonoParameterizedTypeReference() { Mono result = Mono.just("foo"); ParameterizedTypeReference reference = new ParameterizedTypeReference() {}; - when(mockRequest.bodyToMono(reference)).thenReturn(result); + given(mockRequest.bodyToMono(reference)).willReturn(result); assertSame(result, wrapper.bodyToMono(reference)); } @@ -169,7 +169,7 @@ public class ServerRequestWrapperTests { @Test public void bodyToFluxClass() { Flux result = Flux.just("foo"); - when(mockRequest.bodyToFlux(String.class)).thenReturn(result); + given(mockRequest.bodyToFlux(String.class)).willReturn(result); assertSame(result, wrapper.bodyToFlux(String.class)); } @@ -178,7 +178,7 @@ public class ServerRequestWrapperTests { public void bodyToFluxParameterizedTypeReference() { Flux result = Flux.just("foo"); ParameterizedTypeReference reference = new ParameterizedTypeReference() {}; - when(mockRequest.bodyToFlux(reference)).thenReturn(result); + given(mockRequest.bodyToFlux(reference)).willReturn(result); assertSame(result, wrapper.bodyToFlux(reference)); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java index 38f5899e42..5210f13099 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java @@ -64,8 +64,8 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for {@link ResourceWebHandler}. @@ -250,10 +250,10 @@ public class ResourceWebHandlerTests { // Use mock ResourceResolver: i.e. we're only testing upfront validations... Resource resource = mock(Resource.class); - when(resource.getFilename()).thenThrow(new AssertionError("Resource should not be resolved")); - when(resource.getInputStream()).thenThrow(new AssertionError("Resource should not be resolved")); + given(resource.getFilename()).willThrow(new AssertionError("Resource should not be resolved")); + given(resource.getInputStream()).willThrow(new AssertionError("Resource should not be resolved")); ResourceResolver resolver = mock(ResourceResolver.class); - when(resolver.resolveResource(any(), any(), any(), any())).thenReturn(Mono.just(resource)); + given(resolver.resolveResource(any(), any(), any(), any())).willReturn(Mono.just(resource)); ResourceWebHandler handler = new ResourceWebHandler(); handler.setLocations(Collections.singletonList(new ClassPathResource("test/", getClass()))); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java index 32e53686e7..1fb15f28fb 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java @@ -50,8 +50,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.springframework.mock.http.server.reactive.test.MockServerHttpRequest.get; /** @@ -253,8 +253,8 @@ public class InvocableHandlerMethodTests { private HandlerMethodArgumentResolver stubResolver(Mono stubValue) { HandlerMethodArgumentResolver resolver = mock(HandlerMethodArgumentResolver.class); - when(resolver.supportsParameter(any())).thenReturn(true); - when(resolver.resolveArgument(any(), any(), any())).thenReturn(stubValue); + given(resolver.supportsParameter(any())).willReturn(true); + given(resolver.resolveArgument(any(), any(), any())).willReturn(stubValue); return resolver; } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java index e40ae4f672..8c3d102705 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java @@ -46,8 +46,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for {@link SessionAttributeMethodArgumentResolver}. @@ -90,7 +90,7 @@ public class SessionAttributeMethodArgumentResolverTests { StepVerifier.create(mono).expectError(ServerWebInputException.class).verify(); Foo foo = new Foo(); - when(this.session.getAttribute("foo")).thenReturn(foo); + given(this.session.getAttribute("foo")).willReturn(foo); mono = this.resolver.resolveArgument(param, new BindingContext(), this.exchange); assertSame(foo, mono.block()); } @@ -99,7 +99,7 @@ public class SessionAttributeMethodArgumentResolverTests { public void resolveWithName() { MethodParameter param = initMethodParameter(1); Foo foo = new Foo(); - when(this.session.getAttribute("specialFoo")).thenReturn(foo); + given(this.session.getAttribute("specialFoo")).willReturn(foo); Mono mono = this.resolver.resolveArgument(param, new BindingContext(), this.exchange); assertSame(foo, mono.block()); } @@ -111,7 +111,7 @@ public class SessionAttributeMethodArgumentResolverTests { assertNull(mono.block()); Foo foo = new Foo(); - when(this.session.getAttribute("foo")).thenReturn(foo); + given(this.session.getAttribute("foo")).willReturn(foo); mono = this.resolver.resolveArgument(param, new BindingContext(), this.exchange); assertSame(foo, mono.block()); } @@ -131,7 +131,7 @@ public class SessionAttributeMethodArgumentResolverTests { BindingContext bindingContext = new BindingContext(initializer); Foo foo = new Foo(); - when(this.session.getAttribute("foo")).thenReturn(foo); + given(this.session.getAttribute("foo")).willReturn(foo); actual = (Optional) this.resolver.resolveArgument(param, bindingContext, this.exchange).block(); assertNotNull(actual); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionsTests.java index 7905999c75..498a708d50 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionsTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionsTests.java @@ -27,8 +27,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * @author Arjen Poutsma @@ -43,7 +43,7 @@ public class RouterFunctionsTests { MockHttpServletRequest servletRequest = new MockHttpServletRequest(); ServerRequest request = new DefaultServerRequest(servletRequest, Collections.emptyList()); RequestPredicate requestPredicate = mock(RequestPredicate.class); - when(requestPredicate.test(request)).thenReturn(true); + given(requestPredicate.test(request)).willReturn(true); RouterFunction result = RouterFunctions.route(requestPredicate, handlerFunction); @@ -61,7 +61,7 @@ public class RouterFunctionsTests { MockHttpServletRequest servletRequest = new MockHttpServletRequest(); ServerRequest request = new DefaultServerRequest(servletRequest, Collections.emptyList()); RequestPredicate requestPredicate = mock(RequestPredicate.class); - when(requestPredicate.test(request)).thenReturn(false); + given(requestPredicate.test(request)).willReturn(false); RouterFunction result = RouterFunctions.route(requestPredicate, handlerFunction); assertNotNull(result); @@ -78,7 +78,7 @@ public class RouterFunctionsTests { MockHttpServletRequest servletRequest = new MockHttpServletRequest(); ServerRequest request = new DefaultServerRequest(servletRequest, Collections.emptyList()); RequestPredicate requestPredicate = mock(RequestPredicate.class); - when(requestPredicate.nest(request)).thenReturn(Optional.of(request)); + given(requestPredicate.nest(request)).willReturn(Optional.of(request)); RouterFunction result = RouterFunctions.nest(requestPredicate, routerFunction); assertNotNull(result); @@ -96,7 +96,7 @@ public class RouterFunctionsTests { MockHttpServletRequest servletRequest = new MockHttpServletRequest(); ServerRequest request = new DefaultServerRequest(servletRequest, Collections.emptyList()); RequestPredicate requestPredicate = mock(RequestPredicate.class); - when(requestPredicate.nest(request)).thenReturn(Optional.empty()); + given(requestPredicate.nest(request)).willReturn(Optional.empty()); RouterFunction result = RouterFunctions.nest(requestPredicate, routerFunction); assertNotNull(result); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterTests.java index 29728c9614..6b878aeac7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterTests.java @@ -29,7 +29,7 @@ import org.springframework.http.MediaType; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doThrow; +import static org.mockito.BDDMockito.willThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -150,7 +150,7 @@ public class ResponseBodyEmitterTests { verifyNoMoreInteractions(this.handler); IOException failure = new IOException(); - doThrow(failure).when(this.handler).send("foo", MediaType.TEXT_PLAIN); + willThrow(failure).given(this.handler).send("foo", MediaType.TEXT_PLAIN); try { this.emitter.send("foo", MediaType.TEXT_PLAIN); fail("Expected exception"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java index f631c2a4db..384494caa3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java @@ -48,8 +48,8 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for {@link ResourceHttpRequestHandler}. @@ -315,10 +315,10 @@ public class ResourceHttpRequestHandlerTests { // Use mock ResourceResolver: i.e. we're only testing upfront validations... Resource resource = mock(Resource.class); - when(resource.getFilename()).thenThrow(new AssertionError("Resource should not be resolved")); - when(resource.getInputStream()).thenThrow(new AssertionError("Resource should not be resolved")); + given(resource.getFilename()).willThrow(new AssertionError("Resource should not be resolved")); + given(resource.getInputStream()).willThrow(new AssertionError("Resource should not be resolved")); ResourceResolver resolver = mock(ResourceResolver.class); - when(resolver.resolveResource(any(), any(), any(), any())).thenReturn(resource); + given(resolver.resolveResource(any(), any(), any(), any())).willReturn(resource); ResourceHttpRequestHandler handler = new ResourceHttpRequestHandler(); handler.setLocations(Collections.singletonList(new ClassPathResource("test/", getClass()))); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java index 331ca677a1..639041a40a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java @@ -39,8 +39,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for {@link ResourceUrlProvider}. @@ -156,7 +156,7 @@ public class ResourceUrlProviderTests { public void getForLookupPathShouldNotFailIfPathContainsDoubleSlashes() { // given ResourceResolver mockResourceResolver = mock(ResourceResolver.class); - when(mockResourceResolver.resolveUrlPath(any(), any(), any())).thenReturn("some-path"); + given(mockResourceResolver.resolveUrlPath(any(), any(), any())).willReturn("some-path"); ResourceHttpRequestHandler handler = new ResourceHttpRequestHandler(); handler.getResourceResolvers().add(mockResourceResolver); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java index 5038ed063a..387de0d359 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java @@ -52,7 +52,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Unit tests for {@link ScriptTemplateView}. @@ -212,7 +211,7 @@ public class ScriptTemplateViewTests { MockHttpServletResponse response = new MockHttpServletResponse(); Map model = new HashMap<>(); InvocableScriptEngine engine = mock(InvocableScriptEngine.class); - when(engine.invokeFunction(any(), any(), any(), any())).thenReturn("foo"); + given(engine.invokeFunction(any(), any(), any(), any())).willReturn("foo"); this.view.setEngine(engine); this.view.setRenderFunction("render"); this.view.setApplicationContext(this.wac); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java index 1c46c374d6..446be628f4 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java @@ -67,13 +67,13 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; /** * Test fixture for {@link StompSubProtocolHandler} tests. @@ -99,7 +99,7 @@ public class StompSubProtocolHandlerTests { this.channel = Mockito.mock(MessageChannel.class); this.messageCaptor = ArgumentCaptor.forClass(Message.class); - when(this.channel.send(any())).thenReturn(true); + given(this.channel.send(any())).willReturn(true); this.session = new TestWebSocketSession(); this.session.setId("s1"); @@ -223,7 +223,7 @@ public class StompSubProtocolHandlerTests { public void handleMessageToClientWithHeartbeatSuppressingSockJsHeartbeat() throws IOException { SockJsSession sockJsSession = Mockito.mock(SockJsSession.class); - when(sockJsSession.getId()).thenReturn("s1"); + given(sockJsSession.getId()).willReturn("s1"); StompHeaderAccessor accessor = StompHeaderAccessor.create(StompCommand.CONNECTED); accessor.setHeartbeat(0, 10); Message message = MessageBuilder.createMessage(EMPTY_PAYLOAD, accessor.getMessageHeaders()); @@ -236,7 +236,7 @@ public class StompSubProtocolHandlerTests { verifyNoMoreInteractions(sockJsSession); sockJsSession = Mockito.mock(SockJsSession.class); - when(sockJsSession.getId()).thenReturn("s1"); + given(sockJsSession.getId()).willReturn("s1"); accessor = StompHeaderAccessor.create(StompCommand.CONNECTED); accessor.setHeartbeat(0, 0); message = MessageBuilder.createMessage(EMPTY_PAYLOAD, accessor.getMessageHeaders()); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientTests.java index eb159e9f8e..b76bc5dac3 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientTests.java @@ -54,11 +54,11 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.notNull; import static org.mockito.ArgumentMatchers.same; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; /** * Unit tests for {@link WebSocketStompClient}. @@ -95,8 +95,8 @@ public class WebSocketStompClientTests { this.webSocketHandlerCaptor = ArgumentCaptor.forClass(WebSocketHandler.class); this.handshakeFuture = new SettableListenableFuture<>(); - when(webSocketClient.doHandshake(this.webSocketHandlerCaptor.capture(), any(), any(URI.class))) - .thenReturn(this.handshakeFuture); + given(webSocketClient.doHandshake(this.webSocketHandlerCaptor.capture(), any(), any(URI.class))) + .willReturn(this.handshakeFuture); } @@ -303,7 +303,7 @@ public class WebSocketStompClientTests { TcpConnection tcpConnection = getTcpConnection(); ScheduledFuture future = mock(ScheduledFuture.class); - when(this.taskScheduler.scheduleWithFixedDelay(any(), eq(1L))).thenReturn(future); + given(this.taskScheduler.scheduleWithFixedDelay(any(), eq(1L))).willReturn(future); tcpConnection.onReadInactivity(mock(Runnable.class), 2L); tcpConnection.onWriteInactivity(mock(Runnable.class), 2L); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java index 199f382478..1699eafc81 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java @@ -43,7 +43,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; /** * Unit tests for {@link org.springframework.web.socket.sockjs.client.SockJsClient}. @@ -182,7 +181,7 @@ public class SockJsClientTests { private ArgumentCaptor setupInfoRequest(boolean webSocketEnabled) { ArgumentCaptor headersCaptor = ArgumentCaptor.forClass(HttpHeaders.class); - when(this.infoReceiver.executeInfoRequest(any(), headersCaptor.capture())).thenReturn( + given(this.infoReceiver.executeInfoRequest(any(), headersCaptor.capture())).willReturn( "{\"entropy\":123," + "\"origins\":[\"*:*\"]," + "\"cookie_needed\":true," + diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 45a1dea988..99bcb0f33c 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -159,6 +159,13 @@ value="Please use specialized AssertJ assertThat*Exception method." /> + + + + + + -- GitLab