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

Adopt to Mockito 5.1 changes.

Browse Source 
Closes #2504
This commit is contained in:
Mark Paluch
2023-02-14 10:35:23 +01:00
parent 8816176868
commit f17773dfe4
4 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java
View File

@@ -46,7 +46,6 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.data.redis.connection.ClusterCommandExecutor;
import org.springframework.data.redis.connection.ClusterNodeResourceProvider;
import org.springframework.data.redis.connection.ClusterTopologyProvider;
@@ -307,7 +306,7 @@ class LettuceClusterConnectionUnitTests {
int[] slots = new int[] { 9000, 10000 };
connection.clusterDeleteSlots(CLUSTER_NODE_2, slots);
verify(clusterConnection2Mock, times(1)).clusterDelSlots((int[]) any());
verify(clusterConnection2Mock, times(1)).clusterDelSlots(any(int[].class));
}
@Test // DATAREDIS-315

24
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSubscriptionUnitTests.java
View File

@@ -68,7 +68,7 @@ class LettuceReactiveSubscriptionUnitTests {
@Test // DATAREDIS-612
void shouldSubscribeChannels() {
when(pubSubMock.subscribe(any())).thenReturn(Mono.empty());
when(pubSubMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
Mono<Void> subscribe = subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar"));
@@ -83,7 +83,7 @@ class LettuceReactiveSubscriptionUnitTests {
@Test // DATAREDIS-612
void shouldSubscribeChannelsShouldFail() {
when(pubSubMock.subscribe(any())).thenReturn(Mono.error(new RedisConnectionException("Foo")));
when(pubSubMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.error(new RedisConnectionException("Foo")));
Mono<Void> subscribe = subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar"));
@@ -93,7 +93,7 @@ class LettuceReactiveSubscriptionUnitTests {
@Test // DATAREDIS-612
void shouldSubscribePatterns() {
when(pubSubMock.pSubscribe(any())).thenReturn(Mono.empty());
when(pubSubMock.pSubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
Mono<Void> subscribe = subscription.pSubscribe(getByteBuffer("foo"), getByteBuffer("bar"));
@@ -108,33 +108,33 @@ class LettuceReactiveSubscriptionUnitTests {
@Test // DATAREDIS-612
void shouldUnsubscribeChannels() {
when(pubSubMock.subscribe(any())).thenReturn(Mono.empty());
when(pubSubMock.unsubscribe(any())).thenReturn(Mono.empty());
when(pubSubMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
when(pubSubMock.unsubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
subscription.unsubscribe().as(StepVerifier::create).verifyComplete();
assertThat(subscription.getChannels()).isEmpty();
verify(pubSubMock).unsubscribe(any());
verify(pubSubMock).unsubscribe(any(ByteBuffer[].class));
}
@Test // DATAREDIS-612
void shouldUnsubscribePatterns() {
when(pubSubMock.pSubscribe(any())).thenReturn(Mono.empty());
when(pubSubMock.pUnsubscribe(any())).thenReturn(Mono.empty());
when(pubSubMock.pSubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
when(pubSubMock.pUnsubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
subscription.pSubscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
subscription.pUnsubscribe().as(StepVerifier::create).verifyComplete();
assertThat(subscription.getPatterns()).isEmpty();
verify(pubSubMock).pUnsubscribe(any());
verify(pubSubMock).pUnsubscribe(any(ByteBuffer[].class));
}
@Test // DATAREDIS-612
void shouldEmitChannelMessage() {
when(pubSubMock.subscribe(any())).thenReturn(Mono.empty());
when(pubSubMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
Sinks.Many<io.lettuce.core.pubsub.api.reactive.ChannelMessage<ByteBuffer, ByteBuffer>> sink = Sinks.many().unicast()
@@ -154,7 +154,7 @@ class LettuceReactiveSubscriptionUnitTests {
@Test // DATAREDIS-612
void shouldEmitPatternMessage() {
when(pubSubMock.pSubscribe(any())).thenReturn(Mono.empty());
when(pubSubMock.pSubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
subscription.pSubscribe(getByteBuffer("foo*"), getByteBuffer("bar*")).as(StepVerifier::create).verifyComplete();
Sinks.Many<io.lettuce.core.pubsub.api.reactive.PatternMessage<ByteBuffer, ByteBuffer>> sink = Sinks.many().unicast()
@@ -176,7 +176,7 @@ class LettuceReactiveSubscriptionUnitTests {
@Test // DATAREDIS-612
void shouldEmitError() {
when(pubSubMock.subscribe(any())).thenReturn(Mono.empty());
when(pubSubMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
Sinks.Many<io.lettuce.core.pubsub.api.reactive.ChannelMessage<ByteBuffer, ByteBuffer>> sink = Sinks.many().unicast()

6
src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java
View File

@@ -27,11 +27,9 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.data.redis.connection.RedisClusterCommands.AddSlots;
import org.springframework.data.redis.connection.RedisClusterConnection;
import org.springframework.data.redis.connection.RedisClusterNode;
@@ -142,7 +140,7 @@ class DefaultClusterOperationsUnitTests {
clusterOps.addSlots(NODE_1, 1, 2, 3);
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito.<int[]> any());
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), any(int[].class));
}
@Test // DATAREDIS-315
@@ -155,7 +153,7 @@ class DefaultClusterOperationsUnitTests {
clusterOps.addSlots(NODE_1, new SlotRange(1, 3));
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito.<int[]> any());
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), any(int[].class));
}
@Test // DATAREDIS-315

5
src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java
View File

@@ -31,7 +31,6 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.core.convert.converter.Converter;
import org.springframework.core.convert.support.GenericConversionService;
import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -127,10 +126,10 @@ class IndexWriterUnitTests {
writer.removeAllIndexes(KEYSPACE);
ArgumentCaptor<byte[]> captor = ArgumentCaptor.forClass(byte[].class);
ArgumentCaptor<byte[][]> captor = ArgumentCaptor.forClass(byte[][].class);
verify(connectionMock, times(1)).del(captor.capture());
assertThat(captor.getAllValues()).contains(indexKey1, indexKey2);
assertThat(captor.getAllValues()).contains(new byte[][] { indexKey1, indexKey2 });
}
@Test // DATAREDIS-425