Skip to content

Commit ac774cd

Browse files
jhoellerjhoeller
committed
Avoid deprecated Mockito methods
Issue: SPR-14880
1 parent 475b876 commit ac774cd

File tree

7 files changed

+44
-43
lines changed

7 files changed

+44
-43
lines changed

‎spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ public void importSelectors() {
7171
context.refresh();
7272
context.getBean(Config.class);
7373
InOrder ordered = inOrder(beanFactory);
74-
ordered.verify(beanFactory).registerBeanDefinition(eq("a"), (BeanDefinition) anyObject());
75-
ordered.verify(beanFactory).registerBeanDefinition(eq("b"), (BeanDefinition) anyObject());
76-
ordered.verify(beanFactory).registerBeanDefinition(eq("d"), (BeanDefinition) anyObject());
77-
ordered.verify(beanFactory).registerBeanDefinition(eq("c"), (BeanDefinition) anyObject());
74+
ordered.verify(beanFactory).registerBeanDefinition(eq("a"), any());
75+
ordered.verify(beanFactory).registerBeanDefinition(eq("b"), any());
76+
ordered.verify(beanFactory).registerBeanDefinition(eq("d"), any());
77+
ordered.verify(beanFactory).registerBeanDefinition(eq("c"), any());
7878
}
7979

8080
@Test

‎spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ public void resolveTypeWithCustomVariableResolver() throws Exception {
855855
VariableResolver variableResolver = mock(VariableResolver.class);
856856
given(variableResolver.getSource()).willReturn(this);
857857
ResolvableType longType = ResolvableType.forClass(Long.class);
858-
given(variableResolver.resolveVariable((TypeVariable<?>) anyObject())).willReturn(longType);
858+
given(variableResolver.resolveVariable(any())).willReturn(longType);
859859

860860
ResolvableType variable = ResolvableType.forType(
861861
Fields.class.getField("typeVariableType").getGenericType(), variableResolver);

‎spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -353,21 +353,21 @@ public void sendAndReceive() {
353353
Destination destination = new Destination() {};
354354
Message<String> request = createTextMessage();
355355
javax.jms.Message replyJmsMessage = createJmsTextMessage();
356-
given(jmsTemplate.sendAndReceive(eq(destination), anyObject())).willReturn(replyJmsMessage);
356+
given(jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
357357

358358
Message<?> actual = messagingTemplate.sendAndReceive(destination, request);
359-
verify(jmsTemplate, times(1)).sendAndReceive(eq(destination), anyObject());
359+
verify(jmsTemplate, times(1)).sendAndReceive(eq(destination), any());
360360
assertTextMessage(actual);
361361
}
362362

363363
@Test
364364
public void sendAndReceiveName() {
365365
Message<String> request = createTextMessage();
366366
javax.jms.Message replyJmsMessage = createJmsTextMessage();
367-
given(jmsTemplate.sendAndReceive(eq("myQueue"), anyObject())).willReturn(replyJmsMessage);
367+
given(jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
368368

369369
Message<?> actual = messagingTemplate.sendAndReceive("myQueue", request);
370-
verify(jmsTemplate, times(1)).sendAndReceive(eq("myQueue"), anyObject());
370+
verify(jmsTemplate, times(1)).sendAndReceive(eq("myQueue"), any());
371371
assertTextMessage(actual);
372372
}
373373

@@ -377,10 +377,10 @@ public void sendAndReceiveDefaultDestination() {
377377
messagingTemplate.setDefaultDestination(destination);
378378
Message<String> request = createTextMessage();
379379
javax.jms.Message replyJmsMessage = createJmsTextMessage();
380-
given(jmsTemplate.sendAndReceive(eq(destination), anyObject())).willReturn(replyJmsMessage);
380+
given(jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
381381

382382
Message<?> actual = messagingTemplate.sendAndReceive(request);
383-
verify(jmsTemplate, times(1)).sendAndReceive(eq(destination), anyObject());
383+
verify(jmsTemplate, times(1)).sendAndReceive(eq(destination), any());
384384
assertTextMessage(actual);
385385
}
386386

@@ -389,10 +389,10 @@ public void sendAndReceiveDefaultDestinationName() {
389389
messagingTemplate.setDefaultDestinationName("myQueue");
390390
Message<String> request = createTextMessage();
391391
javax.jms.Message replyJmsMessage = createJmsTextMessage();
392-
given(jmsTemplate.sendAndReceive(eq("myQueue"), anyObject())).willReturn(replyJmsMessage);
392+
given(jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
393393

394394
Message<?> actual = messagingTemplate.sendAndReceive(request);
395-
verify(jmsTemplate, times(1)).sendAndReceive(eq("myQueue"), anyObject());
395+
verify(jmsTemplate, times(1)).sendAndReceive(eq("myQueue"), any());
396396
assertTextMessage(actual);
397397
}
398398

@@ -408,20 +408,20 @@ public void sendAndReceiveNoDefaultSet() {
408408
public void convertSendAndReceivePayload() throws JMSException {
409409
Destination destination = new Destination() {};
410410
javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
411-
given(jmsTemplate.sendAndReceive(eq(destination), anyObject())).willReturn(replyJmsMessage);
411+
given(jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
412412

413413
String reply = messagingTemplate.convertSendAndReceive(destination, "my Payload", String.class);
414-
verify(jmsTemplate, times(1)).sendAndReceive(eq(destination), anyObject());
414+
verify(jmsTemplate, times(1)).sendAndReceive(eq(destination), any());
415415
assertEquals("My reply", reply);
416416
}
417417

418418
@Test
419419
public void convertSendAndReceivePayloadName() throws JMSException {
420420
javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
421-
given(jmsTemplate.sendAndReceive(eq("myQueue"), anyObject())).willReturn(replyJmsMessage);
421+
given(jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
422422

423423
String reply = messagingTemplate.convertSendAndReceive("myQueue", "my Payload", String.class);
424-
verify(jmsTemplate, times(1)).sendAndReceive(eq("myQueue"), anyObject());
424+
verify(jmsTemplate, times(1)).sendAndReceive(eq("myQueue"), any());
425425
assertEquals("My reply", reply);
426426
}
427427

@@ -430,21 +430,21 @@ public void convertSendAndReceiveDefaultDestination() throws JMSException {
430430
Destination destination = new Destination() {};
431431
messagingTemplate.setDefaultDestination(destination);
432432
javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
433-
given(jmsTemplate.sendAndReceive(eq(destination), anyObject())).willReturn(replyJmsMessage);
433+
given(jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
434434

435435
String reply = messagingTemplate.convertSendAndReceive("my Payload", String.class);
436-
verify(jmsTemplate, times(1)).sendAndReceive(eq(destination), anyObject());
436+
verify(jmsTemplate, times(1)).sendAndReceive(eq(destination), any());
437437
assertEquals("My reply", reply);
438438
}
439439

440440
@Test
441441
public void convertSendAndReceiveDefaultDestinationName() throws JMSException {
442442
messagingTemplate.setDefaultDestinationName("myQueue");
443443
javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
444-
given(jmsTemplate.sendAndReceive(eq("myQueue"), anyObject())).willReturn(replyJmsMessage);
444+
given(jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
445445

446446
String reply = messagingTemplate.convertSendAndReceive("my Payload", String.class);
447-
verify(jmsTemplate, times(1)).sendAndReceive(eq("myQueue"), anyObject());
447+
verify(jmsTemplate, times(1)).sendAndReceive(eq("myQueue"), any());
448448
assertEquals("My reply", reply);
449449
}
450450

@@ -459,7 +459,7 @@ public void convertMessageConversionExceptionOnSend() throws JMSException {
459459
Message<String> message = createTextMessage();
460460
MessageConverter messageConverter = mock(MessageConverter.class);
461461
willThrow(org.springframework.jms.support.converter.MessageConversionException.class)
462-
.given(messageConverter).toMessage(eq(message), anyObject());
462+
.given(messageConverter).toMessage(eq(message), any());
463463
messagingTemplate.setJmsMessageConverter(messageConverter);
464464
invokeMessageCreator("myQueue");
465465

@@ -491,7 +491,7 @@ public void convertMessageNotReadableException() throws JMSException {
491491
@Test
492492
public void convertDestinationResolutionExceptionOnSend() {
493493
Destination destination = new Destination() {};
494-
willThrow(DestinationResolutionException.class).given(jmsTemplate).send(eq(destination), anyObject());
494+
willThrow(DestinationResolutionException.class).given(jmsTemplate).send(eq(destination), any());
495495

496496
thrown.expect(org.springframework.messaging.core.DestinationResolutionException.class);
497497
messagingTemplate.send(destination, createTextMessage());
@@ -510,7 +510,7 @@ public void convertDestinationResolutionExceptionOnReceive() {
510510
public void convertMessageFormatException() throws JMSException {
511511
Message<String> message = createTextMessage();
512512
MessageConverter messageConverter = mock(MessageConverter.class);
513-
willThrow(MessageFormatException.class).given(messageConverter).toMessage(eq(message), anyObject());
513+
willThrow(MessageFormatException.class).given(messageConverter).toMessage(eq(message), any());
514514
messagingTemplate.setJmsMessageConverter(messageConverter);
515515
invokeMessageCreator("myQueue");
516516

@@ -522,7 +522,7 @@ public void convertMessageFormatException() throws JMSException {
522522
public void convertMessageNotWritableException() throws JMSException {
523523
Message<String> message = createTextMessage();
524524
MessageConverter messageConverter = mock(MessageConverter.class);
525-
willThrow(MessageNotWriteableException.class).given(messageConverter).toMessage(eq(message), anyObject());
525+
willThrow(MessageNotWriteableException.class).given(messageConverter).toMessage(eq(message), any());
526526
messagingTemplate.setJmsMessageConverter(messageConverter);
527527
invokeMessageCreator("myQueue");
528528

@@ -532,7 +532,7 @@ public void convertMessageNotWritableException() throws JMSException {
532532

533533
@Test
534534
public void convertInvalidDestinationExceptionOnSendAndReceiveWithName() {
535-
willThrow(InvalidDestinationException.class).given(jmsTemplate).sendAndReceive(eq("unknownQueue"), anyObject());
535+
willThrow(InvalidDestinationException.class).given(jmsTemplate).sendAndReceive(eq("unknownQueue"), any());
536536

537537
thrown.expect(org.springframework.messaging.core.DestinationResolutionException.class);
538538
messagingTemplate.sendAndReceive("unknownQueue", createTextMessage());
@@ -541,7 +541,7 @@ public void convertInvalidDestinationExceptionOnSendAndReceiveWithName() {
541541
@Test
542542
public void convertInvalidDestinationExceptionOnSendAndReceive() {
543543
Destination destination = new Destination() {};
544-
willThrow(InvalidDestinationException.class).given(jmsTemplate).sendAndReceive(eq(destination), anyObject());
544+
willThrow(InvalidDestinationException.class).given(jmsTemplate).sendAndReceive(eq(destination), any());
545545

546546
thrown.expect(org.springframework.messaging.core.DestinationResolutionException.class);
547547
messagingTemplate.sendAndReceive(destination, createTextMessage());
@@ -555,7 +555,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
555555
messageCreator.createMessage(null);
556556
return null;
557557
}
558-
}).given(jmsTemplate).send(eq("myQueue"), anyObject());
558+
}).given(jmsTemplate).send(eq("myQueue"), any());
559559
}
560560

561561

‎spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ public void receiptNotReceived() throws Exception {
572572
receiptable.addReceiptLostTask(() -> notReceived.set(true));
573573

574574
ArgumentCaptor<Runnable> taskCaptor = ArgumentCaptor.forClass(Runnable.class);
575-
verify(taskScheduler).schedule(taskCaptor.capture(), notNull(Date.class));
575+
verify(taskScheduler).schedule(taskCaptor.capture(), (Date) notNull());
576576
Runnable scheduledTask = taskCaptor.getValue();
577577
assertNotNull(scheduledTask);
578578

‎spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void setUp() {
5555

5656
@Test
5757
public void extensionRegistryInitialized() {
58-
verify(this.registryInitializer, times(1)).initializeExtensionRegistry(anyObject());
58+
verify(this.registryInitializer, times(1)).initializeExtensionRegistry(any());
5959
}
6060

6161
@Test

‎spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ public void resolveArgumentFromModel() throws Exception {
148148
public void resovleArgumentViaDefaultConstructor() throws Exception {
149149
WebDataBinder dataBinder = new WebRequestDataBinder(null);
150150
WebDataBinderFactory factory = mock(WebDataBinderFactory.class);
151-
given(factory.createBinder(anyObject(), notNull(), eq("attrName"))).willReturn(dataBinder);
151+
given(factory.createBinder(any(), notNull(), eq("attrName"))).willReturn(dataBinder);
152152

153153
this.processor.resolveArgument(this.paramNamedValidModelAttr, this.container, this.request, factory);
154-
verify(factory).createBinder(anyObject(), notNull(), eq("attrName"));
154+
verify(factory).createBinder(any(), notNull(), eq("attrName"));
155155
}
156156

157157
@Test

‎spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientTests.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,22 @@
5656
*/
5757
public class WebSocketStompClientTests {
5858

59-
private TestWebSocketStompClient stompClient;
60-
6159
@Mock
6260
private TaskScheduler taskScheduler;
6361

6462
@Mock
6563
private ConnectionHandlingStompSession stompSession;
6664

65+
@Mock
66+
private WebSocketSession webSocketSession;
67+
68+
69+
private TestWebSocketStompClient stompClient;
70+
6771
private ArgumentCaptor<WebSocketHandler> webSocketHandlerCaptor;
6872

6973
private SettableListenableFuture<WebSocketSession> handshakeFuture;
7074

71-
@Mock
72-
private WebSocketSession webSocketSession;
73-
7475

7576
@Before
7677
public void setUp() throws Exception {
@@ -102,7 +103,7 @@ public void webSocketHandshakeFailure() throws Exception {
102103
@SuppressWarnings("unchecked")
103104
public void webSocketConnectionEstablished() throws Exception {
104105
connect().afterConnectionEstablished(this.webSocketSession);
105-
verify(this.stompSession).afterConnected(isNotNull(TcpConnection.class));
106+
verify(this.stompSession).afterConnected(notNull());
106107
}
107108

108109
@Test
@@ -120,7 +121,7 @@ public void webSocketConnectionClosed() throws Exception {
120121
}
121122

122123
@Test
123-
@SuppressWarnings({ "unchecked", "rawtypes" })
124+
@SuppressWarnings({"unchecked", "rawtypes"})
124125
public void handleWebSocketMessage() throws Exception {
125126
String text = "SEND\na:alpha\n\nMessage payload\0";
126127
connect().handleMessage(this.webSocketSession, new TextMessage(text));
@@ -138,7 +139,7 @@ public void handleWebSocketMessage() throws Exception {
138139
}
139140

140141
@Test
141-
@SuppressWarnings({ "unchecked", "rawtypes" })
142+
@SuppressWarnings({"unchecked", "rawtypes"})
142143
public void handleWebSocketMessageSplitAcrossTwoMessage() throws Exception {
143144
WebSocketHandler webSocketHandler = connect();
144145

@@ -163,7 +164,7 @@ public void handleWebSocketMessageSplitAcrossTwoMessage() throws Exception {
163164
}
164165

165166
@Test
166-
@SuppressWarnings({ "unchecked", "rawtypes" })
167+
@SuppressWarnings({"unchecked", "rawtypes"})
167168
public void handleWebSocketMessageBinary() throws Exception {
168169
String text = "SEND\na:alpha\n\nMessage payload\0";
169170
connect().handleMessage(this.webSocketSession, new BinaryMessage(text.getBytes(StandardCharsets.UTF_8)));
@@ -246,7 +247,7 @@ public void heartbeatDefaultValueSetWithoutScheduler() throws Exception {
246247
fail("Expected IllegalStateException");
247248
}
248249
catch (IllegalStateException ex) {
249-
// Ignore
250+
// ignore
250251
}
251252
}
252253

@@ -287,7 +288,7 @@ public void writeInactivityBeforeDelayHasElapsed() throws Exception {
287288
}
288289

289290
@Test
290-
@SuppressWarnings({ "rawtypes", "unchecked" })
291+
@SuppressWarnings({"rawtypes", "unchecked"})
291292
public void cancelInactivityTasks() throws Exception {
292293
TcpConnection<byte[]> tcpConnection = getTcpConnection();
293294

0 commit comments

Comments
 (0)