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

Fix Mockito deprecations

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

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

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

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

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

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

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