DATAREDIS-595 - Adapt to API changes after Mockito 2.7 upgrade.

Author: christophstrobl

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

@@ -19,7 +19,6 @@
 import static org.hamcrest.core.IsNull.*;
 import static org.hamcrest.core.IsSame.*;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Arrays;
@@ -34,7 +33,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.cache.Cache;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;

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

@@ -20,7 +20,6 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.IsEqual.*;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.util.ClassUtils.*;
 
@@ -32,7 +31,7 @@
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.cache.Cache;
 import org.springframework.cache.Cache.ValueRetrievalException;
 import org.springframework.cache.support.NullValue;
@@ -49,7 +48,7 @@
  * @author Mark Paluch
  */
 @SuppressWarnings("rawtypes")
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class RedisCacheUnitTests {
 
 	private static final String CACHE_NAME = "foo";
@@ -91,8 +90,8 @@ public void setUp() {
 
 		when(connectionFactoryMock.getConnection()).thenReturn(connectionMock);
 
-		when(keySerializerMock.serialize(any(byte[].class))).thenReturn(KEY_BYTES);
-		when(valueSerializerMock.serialize(any(byte[].class))).thenReturn(VALUE_BYTES);
+		when(keySerializerMock.serialize(any())).thenReturn(KEY_BYTES);
+		when(valueSerializerMock.serialize(any())).thenReturn(VALUE_BYTES);
 		when(valueSerializerMock.deserialize(eq(VALUE_BYTES))).thenReturn(VALUE);
 	}
 

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.redis.cache;
 
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.sql.Connection;

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.redis.cache;
 
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.sql.Connection;

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

@@ -18,7 +18,6 @@
 import static org.hamcrest.core.Is.*;
 import static org.hamcrest.core.IsCollectionContaining.*;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.data.redis.test.util.MockitoUtils.*;
 
@@ -33,7 +32,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.dao.DataAccessException;

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

@@ -16,7 +16,6 @@
 package org.springframework.data.redis.connection;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
@@ -1820,7 +1819,7 @@ public void testGeoAddCoordinateMapBytes() {
 	@Test // DATAREDIS-438
 	public void testGeoAddCoordinateMap() {
 
-		doReturn(1l).when(nativeConnection).geoAdd(any(byte[].class), anyMapOf(byte[].class, Point.class));
+		doReturn(1l).when(nativeConnection).geoAdd(any(byte[].class), anyMap());
 
 		actual.add(connection.geoAdd(foo, Collections.singletonMap(bar, new Point(1.23232, 34.2342434))));
 		verifyResults(Collections.singletonList(1L));
@@ -1839,7 +1838,7 @@ public void testGeoAddWithIterableOfGeoLocationBytes() {
 	@Test // DATAREDIS-438
 	public void testGeoAddWithIterableOfGeoLocation() {
 
-		doReturn(1l).when(nativeConnection).geoAdd(eq(fooBytes), anyMapOf(byte[].class, Point.class));
+		doReturn(1l).when(nativeConnection).geoAdd(eq(fooBytes), anyMap());
 
 		actual.add(connection.geoAdd(foo, Collections.singletonList(new GeoLocation<String>(bar, new Point(1, 2)))));
 		verifyResults(Collections.singletonList(1L));
@@ -1903,7 +1902,7 @@ public void testGeoPos() {
 	@Test // DATAREDIS-438
 	public void testGeoRadiusWithoutParamBytes() {
 
-		doReturn(geoResults).when(nativeConnection).geoRadius(eq(fooBytes), any(Circle.class));
+		doReturn(geoResults).when(nativeConnection).geoRadius(eq(fooBytes), any());
 
 		actual.add(connection.geoRadius(fooBytes, null));
 		verifyResults(Arrays.asList(geoResults));

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

@@ -17,7 +17,6 @@
 
 import static org.hamcrest.core.Is.*;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.data.redis.connection.ClusterTestVariables.*;
 import static org.springframework.data.redis.test.util.MockitoUtils.*;
@@ -34,7 +33,7 @@
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.redis.ClusterStateFailureException;
 import org.springframework.data.redis.connection.ClusterInfo;
 import org.springframework.data.redis.connection.RedisClusterCommands.AddSlots;
@@ -50,7 +49,7 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class JedisClusterConnectionUnitTests {
 
 	private static final String CLUSTER_NODES_RESPONSE = "" //

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

@@ -21,7 +21,6 @@
 
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.junit.Test;
-import org.mockito.Matchers;
 import org.springframework.data.redis.connection.RedisClusterConfiguration;
 import org.springframework.data.redis.connection.RedisSentinelConfiguration;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -48,7 +47,7 @@ public void shouldInitSentinelPoolWhenSentinelConfigPresent() {
 		connectionFactory = initSpyedConnectionFactory(SINGLE_SENTINEL_CONFIG, new JedisPoolConfig());
 		connectionFactory.afterPropertiesSet();
 
-		verify(connectionFactory, times(1)).createRedisSentinelPool(Matchers.eq(SINGLE_SENTINEL_CONFIG));
+		verify(connectionFactory, times(1)).createRedisSentinelPool(eq(SINGLE_SENTINEL_CONFIG));
 		verify(connectionFactory, never()).createRedisPool();
 	}
 
@@ -59,7 +58,7 @@ public void shouldInitJedisPoolWhenNoSentinelConfigPresent() {
 		connectionFactory.afterPropertiesSet();
 
 		verify(connectionFactory, times(1)).createRedisPool();
-		verify(connectionFactory, never()).createRedisSentinelPool(Matchers.any(RedisSentinelConfiguration.class));
+		verify(connectionFactory, never()).createRedisSentinelPool(any(RedisSentinelConfiguration.class));
 	}
 
 	@Test // DATAREDIS-315
@@ -68,8 +67,8 @@ public void shouldInitConnectionCorrectlyWhenClusterConfigPresent() {
 		connectionFactory = initSpyedConnectionFactory(CLUSTER_CONFIG, new JedisPoolConfig());
 		connectionFactory.afterPropertiesSet();
 
-		verify(connectionFactory, times(1)).createCluster(Matchers.eq(CLUSTER_CONFIG),
-				Matchers.any(GenericObjectPoolConfig.class));
+		verify(connectionFactory, times(1)).createCluster(eq(CLUSTER_CONFIG),
+				any(GenericObjectPoolConfig.class));
 		verify(connectionFactory, never()).createRedisPool();
 	}
 
@@ -90,7 +89,7 @@ private JedisConnectionFactory initSpyedConnectionFactory(RedisSentinelConfigura
 
 		// we have to use a spy here as jedis would start connecting to redis sentinels when the pool is created.
 		JedisConnectionFactory factorySpy = spy(new JedisConnectionFactory(sentinelConfig, poolConfig));
-		doReturn(null).when(factorySpy).createRedisSentinelPool(Matchers.any(RedisSentinelConfiguration.class));
+		doReturn(null).when(factorySpy).createRedisSentinelPool(any(RedisSentinelConfiguration.class));
 		doReturn(null).when(factorySpy).createRedisPool();
 		return factorySpy;
 	}
@@ -99,8 +98,8 @@ private JedisConnectionFactory initSpyedConnectionFactory(RedisClusterConfigurat
 			JedisPoolConfig poolConfig) {
 
 		JedisConnectionFactory factorySpy = spy(new JedisConnectionFactory(clusterConfig));
-		doReturn(null).when(factorySpy).createCluster(Matchers.any(RedisClusterConfiguration.class),
-				Matchers.any(GenericObjectPoolConfig.class));
+		doReturn(null).when(factorySpy).createCluster(any(RedisClusterConfiguration.class),
+				any(GenericObjectPoolConfig.class));
 		doReturn(null).when(factorySpy).createRedisPool();
 		return factorySpy;
 	}

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

@@ -17,7 +17,6 @@
 
 import static org.hamcrest.core.IsEqual.*;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;

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

@@ -15,14 +15,13 @@
  */
 package org.springframework.data.redis.connection.jedis;
 
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.redis.connection.RedisNode;
 import org.springframework.data.redis.connection.RedisNode.RedisNodeBuilder;
 import org.springframework.data.redis.connection.RedisServer;