Skip to content

Commit 6dd71c4

Browse files
mp911demp911de
committed
Adopt to Mockito 5.1 changes.
Closes #2504
1 parent 6c0f3b7 commit 6dd71c4

File tree

5 files changed

+18
-21
lines changed

5 files changed

+18
-21
lines changed

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<jta>1.1</jta>
2424
<beanutils>1.9.4</beanutils>
2525
<xstream>1.4.19</xstream>
26+
<mockito>4.11.0</mockito>
2627
<pool>2.11.1</pool>
2728
<lettuce>6.1.10.RELEASE</lettuce>
2829
<jedis>3.8.0</jedis>

‎src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.mockito.junit.jupiter.MockitoExtension;
4747
import org.mockito.junit.jupiter.MockitoSettings;
4848
import org.mockito.quality.Strictness;
49-
5049
import org.springframework.data.redis.connection.ClusterCommandExecutor;
5150
import org.springframework.data.redis.connection.ClusterNodeResourceProvider;
5251
import org.springframework.data.redis.connection.ClusterTopologyProvider;
@@ -307,7 +306,7 @@ void clusterDeleteSlotsShouldBeExecutedCorrectly() {
307306
int[] slots = new int[] { 9000, 10000 };
308307
connection.clusterDeleteSlots(CLUSTER_NODE_2, slots);
309308

310-
verify(clusterConnection2Mock, times(1)).clusterDelSlots((int[]) any());
309+
verify(clusterConnection2Mock, times(1)).clusterDelSlots(any(int[].class));
311310
}
312311

313312
@Test // DATAREDIS-315

‎src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSubscriptionUnitTests.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void before() {
6767
@Test // DATAREDIS-612
6868
void shouldSubscribeChannels() {
6969

70-
when(commandsMock.subscribe(any())).thenReturn(Mono.empty());
70+
when(commandsMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
7171

7272
Mono<Void> subscribe = subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar"));
7373

@@ -82,7 +82,7 @@ void shouldSubscribeChannels() {
8282
@Test // DATAREDIS-612
8383
void shouldSubscribeChannelsShouldFail() {
8484

85-
when(commandsMock.subscribe(any())).thenReturn(Mono.error(new RedisConnectionException("Foo")));
85+
when(commandsMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.error(new RedisConnectionException("Foo")));
8686

8787
Mono<Void> subscribe = subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar"));
8888

@@ -92,7 +92,7 @@ void shouldSubscribeChannelsShouldFail() {
9292
@Test // DATAREDIS-612
9393
void shouldSubscribePatterns() {
9494

95-
when(commandsMock.psubscribe(any())).thenReturn(Mono.empty());
95+
when(commandsMock.psubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
9696

9797
Mono<Void> subscribe = subscription.pSubscribe(getByteBuffer("foo"), getByteBuffer("bar"));
9898

@@ -107,33 +107,33 @@ void shouldSubscribePatterns() {
107107
@Test // DATAREDIS-612
108108
void shouldUnsubscribeChannels() {
109109

110-
when(commandsMock.subscribe(any())).thenReturn(Mono.empty());
111-
when(commandsMock.unsubscribe(any())).thenReturn(Mono.empty());
110+
when(commandsMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
111+
when(commandsMock.unsubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
112112
subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
113113

114114
subscription.unsubscribe().as(StepVerifier::create).verifyComplete();
115115

116116
assertThat(subscription.getChannels()).isEmpty();
117-
verify(commandsMock).unsubscribe(any());
117+
verify(commandsMock).unsubscribe(any(ByteBuffer[].class));
118118
}
119119

120120
@Test // DATAREDIS-612
121121
void shouldUnsubscribePatterns() {
122122

123-
when(commandsMock.psubscribe(any())).thenReturn(Mono.empty());
124-
when(commandsMock.punsubscribe(any())).thenReturn(Mono.empty());
123+
when(commandsMock.psubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
124+
when(commandsMock.punsubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
125125
subscription.pSubscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
126126

127127
subscription.pUnsubscribe().as(StepVerifier::create).verifyComplete();
128128

129129
assertThat(subscription.getPatterns()).isEmpty();
130-
verify(commandsMock).punsubscribe(any());
130+
verify(commandsMock).punsubscribe(any(ByteBuffer[].class));
131131
}
132132

133133
@Test // DATAREDIS-612
134134
void shouldEmitChannelMessage() {
135135

136-
when(commandsMock.subscribe(any())).thenReturn(Mono.empty());
136+
when(commandsMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
137137
subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
138138

139139
DirectProcessor<io.lettuce.core.pubsub.api.reactive.ChannelMessage<ByteBuffer, ByteBuffer>> emitter = DirectProcessor
@@ -153,7 +153,7 @@ void shouldEmitChannelMessage() {
153153
@Test // DATAREDIS-612
154154
void shouldEmitPatternMessage() {
155155

156-
when(commandsMock.psubscribe(any())).thenReturn(Mono.empty());
156+
when(commandsMock.psubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
157157
subscription.pSubscribe(getByteBuffer("foo*"), getByteBuffer("bar*")).as(StepVerifier::create).verifyComplete();
158158

159159
DirectProcessor<io.lettuce.core.pubsub.api.reactive.PatternMessage<ByteBuffer, ByteBuffer>> emitter = DirectProcessor
@@ -175,7 +175,7 @@ void shouldEmitPatternMessage() {
175175
@Test // DATAREDIS-612
176176
void shouldEmitError() {
177177

178-
when(commandsMock.subscribe(any())).thenReturn(Mono.empty());
178+
when(commandsMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
179179
subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
180180

181181
DirectProcessor<io.lettuce.core.pubsub.api.reactive.ChannelMessage<ByteBuffer, ByteBuffer>> emitter = DirectProcessor

‎src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
import org.junit.jupiter.api.Test;
2828
import org.junit.jupiter.api.extension.ExtendWith;
2929
import org.mockito.Mock;
30-
import org.mockito.Mockito;
3130
import org.mockito.junit.jupiter.MockitoExtension;
3231
import org.mockito.junit.jupiter.MockitoSettings;
3332
import org.mockito.quality.Strictness;
34-
3533
import org.springframework.data.redis.connection.RedisClusterCommands.AddSlots;
3634
import org.springframework.data.redis.connection.RedisClusterConnection;
3735
import org.springframework.data.redis.connection.RedisClusterNode;
@@ -142,7 +140,7 @@ void addSlotsShouldDelegateToConnection() {
142140

143141
clusterOps.addSlots(NODE_1, 1, 2, 3);
144142

145-
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito.<int[]> any());
143+
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), any(int[].class));
146144
}
147145

148146
@Test // DATAREDIS-315
@@ -155,7 +153,7 @@ void addSlotsWithRangeShouldDelegateToConnection() {
155153

156154
clusterOps.addSlots(NODE_1, new SlotRange(1, 3));
157155

158-
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito.<int[]> any());
156+
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), any(int[].class));
159157
}
160158

161159
@Test // DATAREDIS-315

‎src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.mockito.junit.jupiter.MockitoExtension;
3232
import org.mockito.junit.jupiter.MockitoSettings;
3333
import org.mockito.quality.Strictness;
34-
3534
import org.springframework.core.convert.converter.Converter;
3635
import org.springframework.core.convert.support.GenericConversionService;
3736
import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -127,10 +126,10 @@ void removeAllIndexesShouldDeleteAllIndexKeys() {
127126

128127
writer.removeAllIndexes(KEYSPACE);
129128

130-
ArgumentCaptor<byte[]> captor = ArgumentCaptor.forClass(byte[].class);
129+
ArgumentCaptor<byte[][]> captor = ArgumentCaptor.forClass(byte[][].class);
131130

132131
verify(connectionMock, times(1)).del(captor.capture());
133-
assertThat(captor.getAllValues()).contains(indexKey1, indexKey2);
132+
assertThat(captor.getAllValues()).contains(new byte[][] { indexKey1, indexKey2 });
134133
}
135134

136135
@Test // DATAREDIS-425

0 commit comments

Comments
 (0)