Skip to content

Commit 73fdff5

Browse files
garyrussellartembilan
authored andcommitted
Consistent Use of BDDMockito
Mixture of plain and BDD Mockito, sometimes in the same class. Enforce with checkstyle.
1 parent c40b2b5 commit 73fdff5

22 files changed

+474
-477
lines changed

spring-rabbit-test/src/test/java/org/springframework/amqp/rabbit/test/RabbitListenerProxyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static org.mockito.ArgumentMatchers.anyString;
21-
import static org.mockito.Mockito.doAnswer;
21+
import static org.mockito.BDDMockito.willAnswer;
2222
import static org.mockito.Mockito.verify;
2323

2424
import org.junit.jupiter.api.Test;
@@ -67,7 +67,7 @@ public void testProxiedListenerSpy() throws Exception {
6767
assertThat(listener).isNotNull();
6868

6969
LatchCountDownAndCallRealMethodAnswer answer = this.harness.getLatchAnswerFor("foo", 1);
70-
doAnswer(answer).when(listener).foo(anyString());
70+
willAnswer(answer).given(listener).foo(anyString());
7171

7272
this.rabbitTemplate.convertAndSend(this.queue.getName(), "foo");
7373

spring-rabbit-test/src/test/java/org/springframework/amqp/rabbit/test/examples/ExampleRabbitListenerSpyAndCaptureTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static org.mockito.ArgumentMatchers.anyString;
21-
import static org.mockito.Mockito.doAnswer;
21+
import static org.mockito.BDDMockito.willAnswer;
2222
import static org.mockito.Mockito.verify;
2323

2424
import java.util.Collection;
@@ -89,7 +89,7 @@ public void testOneWay() throws Exception {
8989
assertThat(listener).isNotNull();
9090

9191
LatchCountDownAndCallRealMethodAnswer answer = this.harness.getLatchAnswerFor("bar", 3);
92-
doAnswer(answer).when(listener).foo(anyString(), anyString());
92+
willAnswer(answer).given(listener).foo(anyString(), anyString());
9393

9494
this.rabbitTemplate.convertAndSend(this.queue2.getName(), "bar");
9595
this.rabbitTemplate.convertAndSend(this.queue2.getName(), "baz");

spring-rabbit-test/src/test/java/org/springframework/amqp/rabbit/test/examples/ExampleRabbitListenerSpyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static org.mockito.ArgumentMatchers.anyString;
21-
import static org.mockito.Mockito.doAnswer;
21+
import static org.mockito.BDDMockito.willAnswer;
2222
import static org.mockito.Mockito.verify;
2323

2424
import org.junit.jupiter.api.Test;
@@ -83,7 +83,7 @@ public void testOneWay() throws Exception {
8383
assertThat(listener).isNotNull();
8484

8585
LatchCountDownAndCallRealMethodAnswer answer = this.harness.getLatchAnswerFor("bar", 2);
86-
doAnswer(answer).when(listener).foo(anyString(), anyString());
86+
willAnswer(answer).given(listener).foo(anyString(), anyString());
8787

8888
this.rabbitTemplate.convertAndSend(this.queue2.getName(), "bar");
8989
this.rabbitTemplate.convertAndSend(this.queue2.getName(), "baz");

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static org.assertj.core.api.Assertions.fail;
2121
import static org.awaitility.Awaitility.await;
22-
import static org.mockito.Mockito.doAnswer;
22+
import static org.mockito.BDDMockito.willAnswer;
2323
import static org.mockito.Mockito.mock;
2424

2525
import java.io.IOException;
@@ -1666,7 +1666,7 @@ public AtomicReference<Throwable> errorHandlerError() {
16661666
@Bean
16671667
public ErrorHandler errorHandler() {
16681668
ErrorHandler handler = Mockito.spy(new ConditionalRejectingErrorHandler());
1669-
doAnswer(invocation -> {
1669+
willAnswer(invocation -> {
16701670
try {
16711671
return invocation.callRealMethod();
16721672
}
@@ -1675,7 +1675,7 @@ public ErrorHandler errorHandler() {
16751675
errorHandlerLatch().countDown();
16761676
throw e;
16771677
}
1678-
}).when(handler).handleError(Mockito.any(Throwable.class));
1678+
}).given(handler).handleError(Mockito.any(Throwable.class));
16791679
return handler;
16801680
}
16811681

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactoryTests.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2019 the original author or authors.
2+
* Copyright 2010-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,15 +20,15 @@
2020
import static org.mockito.ArgumentMatchers.any;
2121
import static org.mockito.ArgumentMatchers.anyInt;
2222
import static org.mockito.ArgumentMatchers.anyString;
23+
import static org.mockito.BDDMockito.given;
24+
import static org.mockito.BDDMockito.willCallRealMethod;
25+
import static org.mockito.BDDMockito.willReturn;
2326
import static org.mockito.Mockito.atLeastOnce;
24-
import static org.mockito.Mockito.doCallRealMethod;
25-
import static org.mockito.Mockito.doReturn;
2627
import static org.mockito.Mockito.mock;
2728
import static org.mockito.Mockito.never;
2829
import static org.mockito.Mockito.spy;
2930
import static org.mockito.Mockito.times;
3031
import static org.mockito.Mockito.verify;
31-
import static org.mockito.Mockito.when;
3232

3333
import java.util.Collections;
3434
import java.util.concurrent.ExecutorService;
@@ -62,7 +62,7 @@ public void testWithListener() throws Exception {
6262
com.rabbitmq.client.ConnectionFactory mockConnectionFactory = mock(com.rabbitmq.client.ConnectionFactory.class);
6363
com.rabbitmq.client.Connection mockConnection = mock(com.rabbitmq.client.Connection.class);
6464

65-
when(mockConnectionFactory.newConnection(any(ExecutorService.class), anyString())).thenReturn(mockConnection);
65+
given(mockConnectionFactory.newConnection(any(ExecutorService.class), anyString())).willReturn(mockConnection);
6666

6767
final AtomicInteger called = new AtomicInteger(0);
6868
AbstractConnectionFactory connectionFactory = createConnectionFactory(mockConnectionFactory);
@@ -81,7 +81,7 @@ public void onClose(Connection connection) {
8181
}));
8282

8383
Log logger = spy(TestUtils.getPropertyValue(connectionFactory, "logger", Log.class));
84-
doReturn(true).when(logger).isInfoEnabled();
84+
willReturn(true).given(logger).isInfoEnabled();
8585
new DirectFieldAccessor(connectionFactory).setPropertyValue("logger", logger);
8686
Connection con = connectionFactory.createConnection();
8787
assertThat(called.get()).isEqualTo(1);
@@ -122,7 +122,7 @@ public void testWithListenerRegisteredAfterOpen() throws Exception {
122122
com.rabbitmq.client.ConnectionFactory mockConnectionFactory = mock(com.rabbitmq.client.ConnectionFactory.class);
123123
com.rabbitmq.client.Connection mockConnection = mock(com.rabbitmq.client.Connection.class);
124124

125-
when(mockConnectionFactory.newConnection(any(ExecutorService.class), anyString())).thenReturn(mockConnection);
125+
given(mockConnectionFactory.newConnection(any(ExecutorService.class), anyString())).willReturn(mockConnection);
126126

127127
final AtomicInteger called = new AtomicInteger(0);
128128
AbstractConnectionFactory connectionFactory = createConnectionFactory(mockConnectionFactory);
@@ -166,11 +166,11 @@ public void testCloseInvalidConnection() throws Exception {
166166
com.rabbitmq.client.Connection mockConnection1 = mock(com.rabbitmq.client.Connection.class);
167167
com.rabbitmq.client.Connection mockConnection2 = mock(com.rabbitmq.client.Connection.class);
168168

169-
when(mockConnectionFactory.newConnection(any(ExecutorService.class), anyString()))
170-
.thenReturn(mockConnection1, mockConnection2);
169+
given(mockConnectionFactory.newConnection(any(ExecutorService.class), anyString()))
170+
.willReturn(mockConnection1, mockConnection2);
171171
// simulate a dead connection
172-
when(mockConnection1.isOpen()).thenReturn(false);
173-
when(mockConnection2.createChannel()).thenReturn(mock(Channel.class));
172+
given(mockConnection1.isOpen()).willReturn(false);
173+
given(mockConnection2.createChannel()).willReturn(mock(Channel.class));
174174

175175
AbstractConnectionFactory connectionFactory = createConnectionFactory(mockConnectionFactory);
176176

@@ -199,9 +199,9 @@ public void testDestroyBeforeUsed() throws Exception {
199199
@Test
200200
public void testCreatesConnectionWithGivenFactory() {
201201
com.rabbitmq.client.ConnectionFactory mockConnectionFactory = mock(com.rabbitmq.client.ConnectionFactory.class);
202-
doCallRealMethod().when(mockConnectionFactory).params(any(ExecutorService.class));
203-
doCallRealMethod().when(mockConnectionFactory).setThreadFactory(any(ThreadFactory.class));
204-
doCallRealMethod().when(mockConnectionFactory).getThreadFactory();
202+
willCallRealMethod().given(mockConnectionFactory).params(any(ExecutorService.class));
203+
willCallRealMethod().given(mockConnectionFactory).setThreadFactory(any(ThreadFactory.class));
204+
willCallRealMethod().given(mockConnectionFactory).getThreadFactory();
205205

206206
AbstractConnectionFactory connectionFactory = createConnectionFactory(mockConnectionFactory);
207207
ThreadFactory connectionThreadFactory = new CustomizableThreadFactory("connection-thread-");

0 commit comments

Comments
 (0)