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

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

Browse Source
This commit is contained in:
Christoph Strobl
2017-03-24 09:31:50 +01:00
parent d772c9dac4
commit 88bd5e3c33
31 changed files with 65 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/org/springframework/data/redis/cache/RedisCacheManagerUnitTests.java vendored
View File

@@ -19,7 +19,6 @@ import static org.hamcrest.core.Is.*;
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.junit.runner.RunWith;
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;

9
src/test/java/org/springframework/data/redis/cache/RedisCacheUnitTests.java vendored
View File

@@ -20,7 +20,6 @@ import static org.hamcrest.Matchers.notNullValue;
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.Test;
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 @@ import org.springframework.data.redis.serializer.RedisSerializer;
* @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 class RedisCacheUnitTests {
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);
}

1
src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithCommitUnitTests.java vendored
View File

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

1
src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithRollbackUnitTests.java vendored
View File

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

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

@@ -18,7 +18,6 @@ package org.springframework.data.redis.connection;
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.Test;
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;

7
src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java
View File

@@ -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 class DefaultStringRedisConnectionTests {
@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 class DefaultStringRedisConnectionTests {
@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 class DefaultStringRedisConnectionTests {
@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));

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

@@ -17,7 +17,6 @@ package org.springframework.data.redis.connection.jedis;
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.Test;
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 @@ import redis.clients.jedis.exceptions.JedisConnectionException;
* @author Christoph Strobl
* @author Mark Paluch
*/
@RunWith(MockitoJUnitRunner.class)
@RunWith(MockitoJUnitRunner.Silent.class)
public class JedisClusterConnectionUnitTests {
private static final String CLUSTER_NODES_RESPONSE = "" //

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

@@ -21,7 +21,6 @@ import java.io.IOException;
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 class JedisConnectionFactoryUnitTests {
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 class JedisConnectionFactoryUnitTests {
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 class JedisConnectionFactoryUnitTests {
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 @@ public class JedisConnectionFactoryUnitTests {
// 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 @@ public class JedisConnectionFactoryUnitTests {
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;
}

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

@@ -17,7 +17,6 @@ package org.springframework.data.redis.connection.jedis;
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;

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

@@ -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;

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

@@ -19,7 +19,6 @@ import static org.hamcrest.core.AnyOf.*;
import static org.hamcrest.core.Is.*;
import static org.hamcrest.core.IsNull.*;
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.*;
@@ -33,7 +32,7 @@ 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.ClusterCommandExecutor;
import org.springframework.data.redis.connection.ClusterNodeResourceProvider;
import org.springframework.data.redis.connection.RedisClusterCommands.AddSlots;
@@ -50,7 +49,7 @@ import com.lambdaworks.redis.cluster.models.partitions.RedisClusterNode.NodeFlag
* @author Christoph Strobl
* @author Mark Paluch
*/
@RunWith(MockitoJUnitRunner.class)
@RunWith(MockitoJUnitRunner.Silent.class)
public class LettuceClusterConnectionUnitTests {
static final byte[] KEY_1_BYTES = KEY_1.getBytes();
@@ -295,7 +294,7 @@ public class LettuceClusterConnectionUnitTests {
int[] slots = new int[] { 9000, 10000 };
connection.clusterDeleteSlots(CLUSTER_NODE_2, slots);
verify(clusterConnection2Mock, times(1)).clusterDelSlots((int[]) anyVararg());
verify(clusterConnection2Mock, times(1)).clusterDelSlots((int[]) any());
}
@Test(expected = IllegalArgumentException.class) // DATAREDIS-315

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

@@ -15,8 +15,6 @@
*/
package org.springframework.data.redis.connection.lettuce;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
import java.lang.reflect.InvocationTargetException;

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

@@ -15,7 +15,6 @@
*/
package org.springframework.data.redis.connection.lettuce;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import java.util.Collections;
@@ -26,7 +25,7 @@ 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;

1
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSubscriptionTests.java
View File

@@ -16,7 +16,6 @@
package org.springframework.data.redis.connection.lettuce;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import java.util.Collection;

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

@@ -20,10 +20,9 @@ import java.lang.reflect.Method;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -73,7 +72,7 @@ public class ConnectionSplittingInterceptorUnitTests {
public void interceptorShouldUseBoundConnectionForWriteOperations() throws Throwable {
interceptor.intercept(boundConnectionMock, WRITE_METHOD, new Object[] { new byte[] {}, 0L }, null);
Mockito.verify(boundConnectionMock, Mockito.times(1)).expire(Matchers.any(byte[].class), Matchers.anyLong());
Mockito.verify(boundConnectionMock, Mockito.times(1)).expire(Mockito.any(byte[].class), Mockito.anyLong());
Mockito.verifyZeroInteractions(connectionFactoryMock);
}

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

@@ -19,7 +19,6 @@ import static org.hamcrest.core.Is.*;
import static org.hamcrest.core.IsCollectionContaining.*;
import static org.hamcrest.core.IsNull.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import java.util.Arrays;
@@ -32,7 +31,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.dao.DataAccessException;
import org.springframework.data.redis.connection.RedisClusterCommands.AddSlots;
import org.springframework.data.redis.connection.RedisClusterConnection;
@@ -46,7 +45,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
/**
* @author Christoph Strobl
*/
@RunWith(MockitoJUnitRunner.class)
@RunWith(MockitoJUnitRunner.Silent.class)
public class DefaultClusterOperationsUnitTests {
static final RedisClusterNode NODE_1 = RedisClusterNode.newRedisClusterNode().listeningAt("127.0.0.1", 6379)
@@ -140,7 +139,7 @@ public class DefaultClusterOperationsUnitTests {
clusterOps.addSlots(NODE_1, 1, 2, 3);
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito.<int[]> anyVararg());
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito.<int[]> any());
}
@Test(expected = IllegalArgumentException.class) // DATAREDIS-315
@@ -153,7 +152,7 @@ public class DefaultClusterOperationsUnitTests {
clusterOps.addSlots(NODE_1, new SlotRange(1, 3));
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito.<int[]> anyVararg());
verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito.<int[]> any());
}
@Test(expected = IllegalArgumentException.class) // DATAREDIS-315

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

@@ -17,7 +17,6 @@ package org.springframework.data.redis.core;
import static org.hamcrest.core.IsCollectionContaining.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import java.nio.charset.Charset;
@@ -30,7 +29,7 @@ import org.junit.Test;
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.convert.support.GenericConversionService;
import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -48,7 +47,7 @@ import org.springframework.util.ObjectUtils;
* @author Christoph Strobl
* @auhtor Rob Winch
*/
@RunWith(MockitoJUnitRunner.class)
@RunWith(MockitoJUnitRunner.Silent.class)
public class IndexWriterUnitTests {
private static final Charset CHARSET = Charset.forName("UTF-8");

20
src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.data.redis.core;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import static org.springframework.test.util.ReflectionTestUtils.*;
@@ -32,7 +31,8 @@ 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.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.annotation.Id;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
@@ -52,7 +52,7 @@ import org.springframework.data.redis.listener.KeyExpirationEventMessageListener
* @author Christoph Strobl
* @author Mark Paluch
*/
@RunWith(MockitoJUnitRunner.class)
@RunWith(MockitoJUnitRunner.Silent.class)
public class RedisKeyValueAdapterUnitTests {
RedisKeyValueAdapter adapter;
@@ -98,14 +98,14 @@ public class RedisKeyValueAdapterUnitTests {
RedisData rd = new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("_id", "1")));
rd.addIndexedData(new SimpleIndexedPropertyValue("persons", "firstname", "rand"));
when(redisConnectionMock.sMembers(org.mockito.Matchers.any(byte[].class)))
when(redisConnectionMock.sMembers(Mockito.any(byte[].class)))
.thenReturn(new LinkedHashSet<byte[]>(Arrays.asList("persons:firstname:rand".getBytes())));
when(redisConnectionMock.del((byte[][]) anyVararg())).thenReturn(1L);
when(redisConnectionMock.del((byte[][]) any())).thenReturn(1L);
adapter.put("1", rd, "persons");
verify(redisConnectionMock, times(1)).sRem(org.mockito.Matchers.any(byte[].class),
org.mockito.Matchers.any(byte[].class));
verify(redisConnectionMock, times(1)).sRem(Mockito.any(byte[].class),
Mockito.any(byte[].class));
}
@Test // DATAREDIS-512
@@ -114,13 +114,13 @@ public class RedisKeyValueAdapterUnitTests {
RedisData rd = new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("_id", "1")));
rd.addIndexedData(new SimpleIndexedPropertyValue("persons", "firstname", "rand"));
when(redisConnectionMock.sMembers(org.mockito.Matchers.any(byte[].class)))
when(redisConnectionMock.sMembers(Mockito.any(byte[].class)))
.thenReturn(new LinkedHashSet<byte[]>(Arrays.asList("persons:firstname:rand".getBytes())));
when(redisConnectionMock.del((byte[][]) anyVararg())).thenReturn(0L);
when(redisConnectionMock.del((byte[][]) any())).thenReturn(0L);
adapter.put("1", rd, "persons");
verify(redisConnectionMock, never()).sRem(org.mockito.Matchers.any(byte[].class), (byte[][]) anyVararg());
verify(redisConnectionMock, never()).sRem(Mockito.any(byte[].class), (byte[][]) any());
}
@Test // DATAREDIS-491

3
src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java
View File

@@ -19,7 +19,6 @@ import static org.hamcrest.core.Is.*;
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.io.Serializable;
@@ -28,7 +27,7 @@ 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.dao.DataAccessException;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;

7
src/test/java/org/springframework/data/redis/core/convert/CompositeIndexResolverUnitTests.java
View File

@@ -17,7 +17,6 @@ package org.springframework.data.redis.core.convert;
import static org.hamcrest.core.IsEqual.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import java.util.Arrays;
@@ -26,7 +25,7 @@ import java.util.Collections;
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.util.TypeInformation;
/**
@@ -52,9 +51,9 @@ public class CompositeIndexResolverUnitTests {
@Test // DATAREDIS-425
public void shouldCollectionIndexesFromResolvers() {
when(resolver1.resolveIndexesFor(any(TypeInformation.class), anyObject())).thenReturn(
when(resolver1.resolveIndexesFor(any(TypeInformation.class), any())).thenReturn(
Collections.<IndexedData> singleton(new SimpleIndexedPropertyValue("spring", "data", "redis")));
when(resolver2.resolveIndexesFor(any(TypeInformation.class), anyObject())).thenReturn(
when(resolver2.resolveIndexesFor(any(TypeInformation.class), any())).thenReturn(
Collections.<IndexedData> singleton(new SimpleIndexedPropertyValue("redis", "data", "spring")));
CompositeIndexResolver resolver = new CompositeIndexResolver(Arrays.asList(resolver1, resolver2));

3
src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java
View File

@@ -17,7 +17,6 @@ package org.springframework.data.redis.core.convert;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
import static org.springframework.data.redis.core.convert.ConversionTestEntities.*;
import static org.springframework.data.redis.test.util.IsBucketMatcher.*;
@@ -50,7 +49,7 @@ import org.junit.Test;
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.core.convert.converter.Converter;
import org.springframework.data.convert.ReadingConverter;
import org.springframework.data.convert.WritingConverter;

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

@@ -20,7 +20,6 @@ import static org.hamcrest.core.Is.*;
import static org.hamcrest.core.IsCollectionContaining.*;
import static org.hamcrest.core.IsNull.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import static org.springframework.data.redis.core.convert.ConversionTestEntities.*;
@@ -40,7 +39,7 @@ import org.junit.Test;
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.geo.Point;
import org.springframework.data.mapping.PersistentProperty;
import org.springframework.data.redis.core.convert.ConversionTestEntities.Address;
@@ -63,7 +62,7 @@ import org.springframework.data.util.ClassTypeInformation;
* @author Christoph Strobl
* @author Mark Paluch
*/
@RunWith(MockitoJUnitRunner.class)
@RunWith(MockitoJUnitRunner.Silent.class)
public class PathIndexResolverUnitTests {
public @Rule ExpectedException exception = ExpectedException.none();

3
src/test/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntityUnitTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.data.redis.core.mapping;
import static org.hamcrest.core.Is.*;
import static org.hamcrest.core.IsEqual.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import java.io.Serializable;
@@ -30,7 +29,7 @@ import org.junit.Test;
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.keyvalue.core.mapping.KeySpaceResolver;
import org.springframework.data.mapping.model.MappingException;
import org.springframework.data.redis.core.TimeToLiveAccessor;

3
src/test/java/org/springframework/data/redis/core/script/DefaultScriptExecutorUnitTests.java
View File

@@ -15,14 +15,13 @@
*/
package org.springframework.data.redis.core.script;
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.RedisSystemException;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;

2
src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerTests.java
View File

@@ -27,7 +27,7 @@ import org.junit.Test;
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.beans.factory.DisposableBean;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;

2
src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerUnitTests.java
View File

@@ -25,7 +25,7 @@ import org.junit.Test;
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.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.data.redis.connection.DefaultMessage;

1
src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.data.redis.listener;
import static org.hamcrest.core.Is.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import java.util.concurrent.Executor;

2
src/test/java/org/springframework/data/redis/repository/core/MappingRedisEntityInformationUnitTests.java
View File

@@ -22,7 +22,7 @@ import java.io.Serializable;
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.mapping.model.MappingException;
import org.springframework.data.redis.core.convert.ConversionTestEntities;
import org.springframework.data.redis.core.mapping.RedisPersistentEntity;

7
src/test/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializerUnitTests.java
View File

@@ -19,8 +19,6 @@ import static org.hamcrest.core.Is.*;
import static org.hamcrest.core.IsInstanceOf.*;
import static org.hamcrest.core.IsNull.*;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*;
import static org.springframework.test.util.ReflectionTestUtils.*;
import static org.springframework.util.ObjectUtils.*;
@@ -28,6 +26,7 @@ import static org.springframework.util.ObjectUtils.*;
import java.io.IOException;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.beans.BeanUtils;
import org.springframework.cache.support.NullValue;
@@ -108,7 +107,7 @@ public class GenericJackson2JsonRedisSerializerUnitTests {
public void serializeShouldThrowSerializationExceptionProcessingError() throws JsonProcessingException {
ObjectMapper objectMapperMock = mock(ObjectMapper.class);
when(objectMapperMock.writeValueAsBytes(anyObject())).thenThrow(new JsonGenerationException("nightwielder"));
when(objectMapperMock.writeValueAsBytes(any())).thenThrow(new JsonGenerationException("nightwielder"));
new GenericJackson2JsonRedisSerializer(objectMapperMock).serialize(SIMPLE_OBJECT);
}
@@ -117,7 +116,7 @@ public class GenericJackson2JsonRedisSerializerUnitTests {
public void deserializeShouldThrowSerializationExceptionProcessingError() throws IOException {
ObjectMapper objectMapperMock = mock(ObjectMapper.class);
when(objectMapperMock.readValue(any(byte[].class), any(Class.class)))
when(objectMapperMock.readValue(Mockito.any(byte[].class), Mockito.any(Class.class)))
.thenThrow(new JsonMappingException("conflux"));
new GenericJackson2JsonRedisSerializer(objectMapperMock).deserialize(new byte[] { 1 });

5
src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionUnitTests.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.data.redis.support.collections;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import java.util.ArrayList;
@@ -26,7 +25,7 @@ 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.DataType;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -104,7 +103,7 @@ public class AbstractRedisCollectionUnitTests {
@Test // DATAREDIS-188
public void testRenameCollectionShouldTriggerRedisOperation() {
when(redisTemplateSpy.hasKey(anyObject())).thenReturn(Boolean.TRUE);
when(redisTemplateSpy.hasKey(any())).thenReturn(Boolean.TRUE);
collection.add("spring-data-redis");
collection.rename("new-key");

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

@@ -21,10 +21,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.hamcrest.Matcher;
import org.mockito.internal.invocation.InvocationMatcher;
import org.mockito.internal.verification.api.VerificationData;
import org.mockito.invocation.Invocation;
import org.mockito.invocation.MatchableInvocation;
import org.mockito.verification.VerificationMode;
import org.springframework.util.StringUtils;
@@ -45,7 +45,7 @@ public class MockitoUtils {
public static void verifyInvocationsAcross(final String method, final VerificationMode mode, Object... mocks) {
mode.verify(new VerificationDataImpl(getInvocations(method, mocks), new InvocationMatcher(null, Collections
.<Matcher> singletonList(org.mockito.internal.matchers.Any.ANY)) {
.singletonList(org.mockito.internal.matchers.Any.ANY)) {
@Override
public boolean matches(Invocation actual) {
@@ -94,6 +94,11 @@ public class MockitoUtils {
return invocations;
}
@Override
public MatchableInvocation getTarget() {
return wanted;
}
@Override
public InvocationMatcher getWanted() {
return wanted;