Skip to content

Commit 88bd5e3

Browse files
DATAREDIS-595 - Adapt to API changes after Mockito 2.7 upgrade.
1 parent d772c9d commit 88bd5e3

31 files changed

+65
-87
lines changed

src/test/java/org/springframework/data/redis/cache/RedisCacheManagerUnitTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static org.hamcrest.core.IsNull.*;
2020
import static org.hamcrest.core.IsSame.*;
2121
import static org.junit.Assert.*;
22-
import static org.mockito.Matchers.*;
2322
import static org.mockito.Mockito.*;
2423

2524
import java.util.Arrays;
@@ -34,7 +33,7 @@
3433
import org.mockito.ArgumentCaptor;
3534
import org.mockito.Mock;
3635
import org.mockito.Mockito;
37-
import org.mockito.runners.MockitoJUnitRunner;
36+
import org.mockito.junit.MockitoJUnitRunner;
3837
import org.springframework.cache.Cache;
3938
import org.springframework.data.redis.connection.RedisConnection;
4039
import org.springframework.data.redis.connection.RedisConnectionFactory;

src/test/java/org/springframework/data/redis/cache/RedisCacheUnitTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.hamcrest.Matchers.nullValue;
2121
import static org.hamcrest.core.IsEqual.*;
2222
import static org.junit.Assert.*;
23-
import static org.mockito.Matchers.*;
2423
import static org.mockito.Mockito.*;
2524
import static org.springframework.util.ClassUtils.*;
2625

@@ -32,7 +31,7 @@
3231
import org.junit.rules.ExpectedException;
3332
import org.junit.runner.RunWith;
3433
import org.mockito.Mock;
35-
import org.mockito.runners.MockitoJUnitRunner;
34+
import org.mockito.junit.MockitoJUnitRunner;
3635
import org.springframework.cache.Cache;
3736
import org.springframework.cache.Cache.ValueRetrievalException;
3837
import org.springframework.cache.support.NullValue;
@@ -49,7 +48,7 @@
4948
* @author Mark Paluch
5049
*/
5150
@SuppressWarnings("rawtypes")
52-
@RunWith(MockitoJUnitRunner.class)
51+
@RunWith(MockitoJUnitRunner.Silent.class)
5352
public class RedisCacheUnitTests {
5453

5554
private static final String CACHE_NAME = "foo";
@@ -91,8 +90,8 @@ public void setUp() {
9190

9291
when(connectionFactoryMock.getConnection()).thenReturn(connectionMock);
9392

94-
when(keySerializerMock.serialize(any(byte[].class))).thenReturn(KEY_BYTES);
95-
when(valueSerializerMock.serialize(any(byte[].class))).thenReturn(VALUE_BYTES);
93+
when(keySerializerMock.serialize(any())).thenReturn(KEY_BYTES);
94+
when(valueSerializerMock.serialize(any())).thenReturn(VALUE_BYTES);
9695
when(valueSerializerMock.deserialize(eq(VALUE_BYTES))).thenReturn(VALUE);
9796
}
9897

src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithCommitUnitTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.data.redis.cache;
1717

18-
import static org.mockito.Matchers.*;
1918
import static org.mockito.Mockito.*;
2019

2120
import java.sql.Connection;

src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithRollbackUnitTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.data.redis.cache;
1717

18-
import static org.mockito.Matchers.*;
1918
import static org.mockito.Mockito.*;
2019

2120
import java.sql.Connection;

src/test/java/org/springframework/data/redis/connection/ClusterCommandExecutorUnitTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import static org.hamcrest.core.Is.*;
1919
import static org.hamcrest.core.IsCollectionContaining.*;
2020
import static org.junit.Assert.*;
21-
import static org.mockito.Matchers.*;
2221
import static org.mockito.Mockito.*;
2322
import static org.springframework.data.redis.test.util.MockitoUtils.*;
2423

@@ -33,7 +32,7 @@
3332
import org.junit.runner.RunWith;
3433
import org.mockito.ArgumentCaptor;
3534
import org.mockito.Mock;
36-
import org.mockito.runners.MockitoJUnitRunner;
35+
import org.mockito.junit.MockitoJUnitRunner;
3736
import org.springframework.core.convert.converter.Converter;
3837
import org.springframework.core.task.SyncTaskExecutor;
3938
import org.springframework.dao.DataAccessException;

src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.springframework.data.redis.connection;
1717

1818
import static org.junit.Assert.*;
19-
import static org.mockito.Matchers.*;
2019
import static org.mockito.Mockito.*;
2120

2221
import java.util.ArrayList;
@@ -1820,7 +1819,7 @@ public void testGeoAddCoordinateMapBytes() {
18201819
@Test // DATAREDIS-438
18211820
public void testGeoAddCoordinateMap() {
18221821

1823-
doReturn(1l).when(nativeConnection).geoAdd(any(byte[].class), anyMapOf(byte[].class, Point.class));
1822+
doReturn(1l).when(nativeConnection).geoAdd(any(byte[].class), anyMap());
18241823

18251824
actual.add(connection.geoAdd(foo, Collections.singletonMap(bar, new Point(1.23232, 34.2342434))));
18261825
verifyResults(Collections.singletonList(1L));
@@ -1839,7 +1838,7 @@ public void testGeoAddWithIterableOfGeoLocationBytes() {
18391838
@Test // DATAREDIS-438
18401839
public void testGeoAddWithIterableOfGeoLocation() {
18411840

1842-
doReturn(1l).when(nativeConnection).geoAdd(eq(fooBytes), anyMapOf(byte[].class, Point.class));
1841+
doReturn(1l).when(nativeConnection).geoAdd(eq(fooBytes), anyMap());
18431842

18441843
actual.add(connection.geoAdd(foo, Collections.singletonList(new GeoLocation<String>(bar, new Point(1, 2)))));
18451844
verifyResults(Collections.singletonList(1L));
@@ -1903,7 +1902,7 @@ public void testGeoPos() {
19031902
@Test // DATAREDIS-438
19041903
public void testGeoRadiusWithoutParamBytes() {
19051904

1906-
doReturn(geoResults).when(nativeConnection).geoRadius(eq(fooBytes), any(Circle.class));
1905+
doReturn(geoResults).when(nativeConnection).geoRadius(eq(fooBytes), any());
19071906

19081907
actual.add(connection.geoRadius(fooBytes, null));
19091908
verifyResults(Arrays.asList(geoResults));

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import static org.hamcrest.core.Is.*;
1919
import static org.junit.Assert.*;
20-
import static org.mockito.Matchers.*;
2120
import static org.mockito.Mockito.*;
2221
import static org.springframework.data.redis.connection.ClusterTestVariables.*;
2322
import static org.springframework.data.redis.test.util.MockitoUtils.*;
@@ -34,7 +33,7 @@
3433
import org.junit.rules.ExpectedException;
3534
import org.junit.runner.RunWith;
3635
import org.mockito.Mock;
37-
import org.mockito.runners.MockitoJUnitRunner;
36+
import org.mockito.junit.MockitoJUnitRunner;
3837
import org.springframework.data.redis.ClusterStateFailureException;
3938
import org.springframework.data.redis.connection.ClusterInfo;
4039
import org.springframework.data.redis.connection.RedisClusterCommands.AddSlots;
@@ -50,7 +49,7 @@
5049
* @author Christoph Strobl
5150
* @author Mark Paluch
5251
*/
53-
@RunWith(MockitoJUnitRunner.class)
52+
@RunWith(MockitoJUnitRunner.Silent.class)
5453
public class JedisClusterConnectionUnitTests {
5554

5655
private static final String CLUSTER_NODES_RESPONSE = "" //

src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryUnitTests.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
2323
import org.junit.Test;
24-
import org.mockito.Matchers;
2524
import org.springframework.data.redis.connection.RedisClusterConfiguration;
2625
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
2726
import org.springframework.test.util.ReflectionTestUtils;
@@ -48,7 +47,7 @@ public void shouldInitSentinelPoolWhenSentinelConfigPresent() {
4847
connectionFactory = initSpyedConnectionFactory(SINGLE_SENTINEL_CONFIG, new JedisPoolConfig());
4948
connectionFactory.afterPropertiesSet();
5049

51-
verify(connectionFactory, times(1)).createRedisSentinelPool(Matchers.eq(SINGLE_SENTINEL_CONFIG));
50+
verify(connectionFactory, times(1)).createRedisSentinelPool(eq(SINGLE_SENTINEL_CONFIG));
5251
verify(connectionFactory, never()).createRedisPool();
5352
}
5453

@@ -59,7 +58,7 @@ public void shouldInitJedisPoolWhenNoSentinelConfigPresent() {
5958
connectionFactory.afterPropertiesSet();
6059

6160
verify(connectionFactory, times(1)).createRedisPool();
62-
verify(connectionFactory, never()).createRedisSentinelPool(Matchers.any(RedisSentinelConfiguration.class));
61+
verify(connectionFactory, never()).createRedisSentinelPool(any(RedisSentinelConfiguration.class));
6362
}
6463

6564
@Test // DATAREDIS-315
@@ -68,8 +67,8 @@ public void shouldInitConnectionCorrectlyWhenClusterConfigPresent() {
6867
connectionFactory = initSpyedConnectionFactory(CLUSTER_CONFIG, new JedisPoolConfig());
6968
connectionFactory.afterPropertiesSet();
7069

71-
verify(connectionFactory, times(1)).createCluster(Matchers.eq(CLUSTER_CONFIG),
72-
Matchers.any(GenericObjectPoolConfig.class));
70+
verify(connectionFactory, times(1)).createCluster(eq(CLUSTER_CONFIG),
71+
any(GenericObjectPoolConfig.class));
7372
verify(connectionFactory, never()).createRedisPool();
7473
}
7574

@@ -90,7 +89,7 @@ private JedisConnectionFactory initSpyedConnectionFactory(RedisSentinelConfigura
9089

9190
// we have to use a spy here as jedis would start connecting to redis sentinels when the pool is created.
9291
JedisConnectionFactory factorySpy = spy(new JedisConnectionFactory(sentinelConfig, poolConfig));
93-
doReturn(null).when(factorySpy).createRedisSentinelPool(Matchers.any(RedisSentinelConfiguration.class));
92+
doReturn(null).when(factorySpy).createRedisSentinelPool(any(RedisSentinelConfiguration.class));
9493
doReturn(null).when(factorySpy).createRedisPool();
9594
return factorySpy;
9695
}
@@ -99,8 +98,8 @@ private JedisConnectionFactory initSpyedConnectionFactory(RedisClusterConfigurat
9998
JedisPoolConfig poolConfig) {
10099

101100
JedisConnectionFactory factorySpy = spy(new JedisConnectionFactory(clusterConfig));
102-
doReturn(null).when(factorySpy).createCluster(Matchers.any(RedisClusterConfiguration.class),
103-
Matchers.any(GenericObjectPoolConfig.class));
101+
doReturn(null).when(factorySpy).createCluster(any(RedisClusterConfiguration.class),
102+
any(GenericObjectPoolConfig.class));
104103
doReturn(null).when(factorySpy).createRedisPool();
105104
return factorySpy;
106105
}

src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import static org.hamcrest.core.IsEqual.*;
1919
import static org.junit.Assert.*;
20-
import static org.mockito.Matchers.*;
2120
import static org.mockito.Mockito.*;
2221

2322
import java.io.IOException;

src/test/java/org/springframework/data/redis/connection/jedis/JedisSentinelConnectionUnitTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
*/
1616
package org.springframework.data.redis.connection.jedis;
1717

18-
import static org.mockito.Matchers.*;
1918
import static org.mockito.Mockito.*;
2019

2120
import org.junit.Before;
2221
import org.junit.Test;
2322
import org.junit.runner.RunWith;
2423
import org.mockito.Mock;
25-
import org.mockito.runners.MockitoJUnitRunner;
24+
import org.mockito.junit.MockitoJUnitRunner;
2625
import org.springframework.data.redis.connection.RedisNode;
2726
import org.springframework.data.redis.connection.RedisNode.RedisNodeBuilder;
2827
import org.springframework.data.redis.connection.RedisServer;

0 commit comments

Comments
 (0)