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

Adopt to Mockito changes.

Browse Source 
Closes #2221
This commit is contained in:
Mark Paluch
2022-01-04 15:02:06 +01:00
parent ca7b004513
commit be1663c95e
6 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java
View File

@@ -147,7 +147,7 @@ class JedisClusterConnectionUnitTests {
verify(con2Mock, times(1)).clusterReplicate(CLUSTER_NODE_1.getId()); verify(con2Mock, times(1)).clusterReplicate(CLUSTER_NODE_1.getId());
verify(con1Mock, atMost(1)).clusterNodes(); verify(con1Mock, atMost(1)).clusterNodes();
verify(con1Mock, atMost(1)).close(); verify(con1Mock, atMost(1)).close();
verifyZeroInteractions(con1Mock); verifyNoMoreInteractions(con1Mock);
} }
@Test // DATAREDIS-315 @Test // DATAREDIS-315
@@ -232,7 +232,7 @@ class JedisClusterConnectionUnitTests {
int[] slots = new int[] { 9000, 10000 }; int[] slots = new int[] { 9000, 10000 };
connection.clusterDeleteSlots(CLUSTER_NODE_2, slots); connection.clusterDeleteSlots(CLUSTER_NODE_2, slots);
verify(con2Mock, times(1)).clusterDelSlots((int[]) anyVararg()); verify(con2Mock, times(1)).clusterDelSlots((int[]) any());
} }
@Test // DATAREDIS-315 @Test // DATAREDIS-315

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

@@ -163,7 +163,7 @@ class LettuceClusterConnectionUnitTests {
connection.clusterForget(CLUSTER_NODE_2); connection.clusterForget(CLUSTER_NODE_2);
verify(clusterConnection1Mock, times(1)).clusterForget(CLUSTER_NODE_2.getId()); verify(clusterConnection1Mock, times(1)).clusterForget(CLUSTER_NODE_2.getId());
verifyZeroInteractions(clusterConnection2Mock); verifyNoInteractions(clusterConnection2Mock);
verify(clusterConnection3Mock, times(1)).clusterForget(CLUSTER_NODE_2.getId()); verify(clusterConnection3Mock, times(1)).clusterForget(CLUSTER_NODE_2.getId());
} }
@@ -173,7 +173,7 @@ class LettuceClusterConnectionUnitTests {
connection.clusterReplicate(CLUSTER_NODE_1, CLUSTER_NODE_2); connection.clusterReplicate(CLUSTER_NODE_1, CLUSTER_NODE_2);
verify(clusterConnection2Mock, times(1)).clusterReplicate(CLUSTER_NODE_1.getId()); verify(clusterConnection2Mock, times(1)).clusterReplicate(CLUSTER_NODE_1.getId());
verifyZeroInteractions(clusterConnection1Mock); verifyNoInteractions(clusterConnection1Mock);
} }
@Test // DATAREDIS-315 @Test // DATAREDIS-315
@@ -334,7 +334,7 @@ class LettuceClusterConnectionUnitTests {
connection.time(CLUSTER_NODE_2); connection.time(CLUSTER_NODE_2);
verify(clusterConnection2Mock, times(1)).time(); verify(clusterConnection2Mock, times(1)).time();
verifyZeroInteractions(clusterConnection1Mock, clusterConnection3Mock); verifyNoInteractions(clusterConnection1Mock, clusterConnection3Mock);
} }
@Test // DATAREDIS-315 @Test // DATAREDIS-315
@@ -412,6 +412,6 @@ class LettuceClusterConnectionUnitTests {
verify(async).blpop(1, KEY_1_BYTES); verify(async).blpop(1, KEY_1_BYTES);
verify(connectionProviderMock).getConnection(StatefulConnection.class); verify(connectionProviderMock).getConnection(StatefulConnection.class);
verifyNoMoreInteractions(connectionProviderMock); verifyNoMoreInteractions(connectionProviderMock);
verifyZeroInteractions(sharedConnectionMock); verifyNoInteractions(sharedConnectionMock);
} }
} }

2
src/test/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProviderUnitTests.java
View File

@@ -57,7 +57,7 @@ class LettucePoolingConnectionProviderUnitTests {
provider.release(provider.getConnection(StatefulRedisConnection.class)); provider.release(provider.getConnection(StatefulRedisConnection.class));
verifyZeroInteractions(commandsMock); verifyNoInteractions(commandsMock);
} }
@Test // DATAREDIS-988 @Test // DATAREDIS-988

4
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisConnectionUnitTests.java
View File

@@ -72,7 +72,7 @@ class LettuceReactiveRedisConnectionUnitTests {
new LettuceReactiveRedisConnection(connectionProvider); new LettuceReactiveRedisConnection(connectionProvider);
verifyZeroInteractions(connectionProvider); verifyNoInteractions(connectionProvider);
} }
@Test // DATAREDIS-720, DATAREDIS-721 @Test // DATAREDIS-720, DATAREDIS-721
@@ -103,7 +103,7 @@ class LettuceReactiveRedisConnectionUnitTests {
connection.execute(cmd -> Mono.just("foo")).as(StepVerifier::create).expectNext("foo").verifyComplete(); connection.execute(cmd -> Mono.just("foo")).as(StepVerifier::create).expectNext("foo").verifyComplete();
verifyZeroInteractions(connectionProvider); verifyNoInteractions(connectionProvider);
} }
@Test // DATAREDIS-720, DATAREDIS-721 @Test // DATAREDIS-720, DATAREDIS-721

4
src/test/java/org/springframework/data/redis/core/ConnectionSplittingInterceptorUnitTests.java
View File

@@ -71,7 +71,7 @@ class ConnectionSplittingInterceptorUnitTests {
interceptor.intercept(boundConnectionMock, READONLY_METHOD, new Object[] { new byte[] {} }); interceptor.intercept(boundConnectionMock, READONLY_METHOD, new Object[] { new byte[] {} });
verify(connectionFactoryMock, times(1)).getConnection(); verify(connectionFactoryMock, times(1)).getConnection();
verifyZeroInteractions(boundConnectionMock); verifyNoInteractions(boundConnectionMock);
} }
@Test // DATAREDIS-73 @Test // DATAREDIS-73
@@ -79,7 +79,7 @@ class ConnectionSplittingInterceptorUnitTests {
interceptor.intercept(boundConnectionMock, WRITE_METHOD, new Object[] { new byte[] {}, 0L }); interceptor.intercept(boundConnectionMock, WRITE_METHOD, new Object[] { new byte[] {}, 0L });
verify(boundConnectionMock, times(1)).expire(any(byte[].class), anyLong()); verify(boundConnectionMock, times(1)).expire(any(byte[].class), anyLong());
verifyZeroInteractions(connectionFactoryMock); verifyNoInteractions(connectionFactoryMock);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

5
src/test/java/org/springframework/data/redis/test/util/MockitoUtils.java
View File

@@ -99,11 +99,6 @@ public class MockitoUtils {
return wanted; return wanted;
} }
@Override
public InvocationMatcher getWanted() {
return wanted;
}
} }
} }