From 88bd5e3c33c72da796404becbf32f11f5ab2e73b Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 24 Mar 2017 09:31:50 +0100 Subject: [PATCH] DATAREDIS-595 - Adapt to API changes after Mockito 2.7 upgrade. --- .../cache/RedisCacheManagerUnitTests.java | 3 +-- .../data/redis/cache/RedisCacheUnitTests.java | 9 ++++----- ...lRedisCacheManagerWithCommitUnitTests.java | 1 - ...edisCacheManagerWithRollbackUnitTests.java | 1 - .../ClusterCommandExecutorUnitTests.java | 3 +-- .../DefaultStringRedisConnectionTests.java | 7 +++---- .../JedisClusterConnectionUnitTests.java | 5 ++--- .../JedisConnectionFactoryUnitTests.java | 15 +++++++------- .../jedis/JedisConnectionUnitTestSuite.java | 1 - .../JedisSentinelConnectionUnitTests.java | 3 +-- .../LettuceClusterConnectionUnitTests.java | 7 +++---- .../LettuceConnectionUnitTestSuite.java | 2 -- .../LettuceSentinelConnectionUnitTests.java | 3 +-- .../lettuce/LettuceSubscriptionTests.java | 1 - ...nnectionSplittingInterceptorUnitTests.java | 5 ++--- .../DefaultClusterOperationsUnitTests.java | 9 ++++----- .../data/redis/core/IndexWriterUnitTests.java | 5 ++--- .../core/RedisKeyValueAdapterUnitTests.java | 20 +++++++++---------- .../redis/core/RedisTemplateUnitTests.java | 3 +-- .../CompositeIndexResolverUnitTests.java | 7 +++---- .../MappingRedisConverterUnitTests.java | 3 +-- .../convert/PathIndexResolverUnitTests.java | 5 ++--- .../BasicRedisPersistentEntityUnitTests.java | 3 +-- .../DefaultScriptExecutorUnitTests.java | 3 +-- ...eyExpirationEventMessageListenerTests.java | 2 +- ...pirationEventMessageListenerUnitTests.java | 2 +- .../RedisMessageListenerContainerTests.java | 1 - ...appingRedisEntityInformationUnitTests.java | 2 +- ...cJackson2JsonRedisSerializerUnitTests.java | 7 +++---- .../AbstractRedisCollectionUnitTests.java | 5 ++--- .../data/redis/test/util/MockitoUtils.java | 9 +++++++-- 31 files changed, 65 insertions(+), 87 deletions(-) diff --git a/src/test/java/org/springframework/data/redis/cache/RedisCacheManagerUnitTests.java b/src/test/java/org/springframework/data/redis/cache/RedisCacheManagerUnitTests.java index aadd2d0f7..34933436d 100644 --- a/src/test/java/org/springframework/data/redis/cache/RedisCacheManagerUnitTests.java +++ b/src/test/java/org/springframework/data/redis/cache/RedisCacheManagerUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/cache/RedisCacheUnitTests.java b/src/test/java/org/springframework/data/redis/cache/RedisCacheUnitTests.java index 836a639c6..7e296abaa 100644 --- a/src/test/java/org/springframework/data/redis/cache/RedisCacheUnitTests.java +++ b/src/test/java/org/springframework/data/redis/cache/RedisCacheUnitTests.java @@ -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); } diff --git a/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithCommitUnitTests.java b/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithCommitUnitTests.java index d44766ae4..f781a64ff 100644 --- a/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithCommitUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithRollbackUnitTests.java b/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithRollbackUnitTests.java index 754a744a4..2dd628e38 100644 --- a/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithRollbackUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/redis/connection/ClusterCommandExecutorUnitTests.java b/src/test/java/org/springframework/data/redis/connection/ClusterCommandExecutorUnitTests.java index f974f9854..2f590e02b 100644 --- a/src/test/java/org/springframework/data/redis/connection/ClusterCommandExecutorUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/ClusterCommandExecutorUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java index 6b4378f26..1313b5a21 100644 --- a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java +++ b/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 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(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)); diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java index 9a0e8f8bf..fdabb28a9 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java @@ -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 = "" // diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryUnitTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryUnitTests.java index 94cc20394..427bf64e7 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryUnitTests.java @@ -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; } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java index ad0c20d3c..5e050fbb6 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisSentinelConnectionUnitTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisSentinelConnectionUnitTests.java index e438459f9..d5d22ae78 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisSentinelConnectionUnitTests.java +++ b/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; diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java index 4fadb5d31..80b985657 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java @@ -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 diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionUnitTestSuite.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionUnitTestSuite.java index 4e1f3992a..4bfb47c1b 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionUnitTestSuite.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionUnitTestSuite.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelConnectionUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelConnectionUnitTests.java index e8f7f31e9..94d1f28a8 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelConnectionUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelConnectionUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSubscriptionTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSubscriptionTests.java index 043ce4f87..ea844670c 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSubscriptionTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSubscriptionTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/core/ConnectionSplittingInterceptorUnitTests.java b/src/test/java/org/springframework/data/redis/core/ConnectionSplittingInterceptorUnitTests.java index 089a2a454..12b221353 100644 --- a/src/test/java/org/springframework/data/redis/core/ConnectionSplittingInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/ConnectionSplittingInterceptorUnitTests.java @@ -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); } diff --git a/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java b/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java index a3f10cc68..a187e2a74 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java @@ -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. anyVararg()); + verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito. 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. anyVararg()); + verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito. any()); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-315 diff --git a/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java b/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java index 828bd3fb1..0b1bc8388 100644 --- a/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java @@ -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"); diff --git a/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java b/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java index 6d48310b6..b82fc475a 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java @@ -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(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(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 diff --git a/src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java b/src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java index ef5450a8e..77b16e5c4 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/core/convert/CompositeIndexResolverUnitTests.java b/src/test/java/org/springframework/data/redis/core/convert/CompositeIndexResolverUnitTests.java index 5fcbfa371..84fc5c5e4 100644 --- a/src/test/java/org/springframework/data/redis/core/convert/CompositeIndexResolverUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/convert/CompositeIndexResolverUnitTests.java @@ -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. singleton(new SimpleIndexedPropertyValue("spring", "data", "redis"))); - when(resolver2.resolveIndexesFor(any(TypeInformation.class), anyObject())).thenReturn( + when(resolver2.resolveIndexesFor(any(TypeInformation.class), any())).thenReturn( Collections. singleton(new SimpleIndexedPropertyValue("redis", "data", "spring"))); CompositeIndexResolver resolver = new CompositeIndexResolver(Arrays.asList(resolver1, resolver2)); diff --git a/src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java b/src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java index 6acca575b..edc558767 100644 --- a/src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/core/convert/PathIndexResolverUnitTests.java b/src/test/java/org/springframework/data/redis/core/convert/PathIndexResolverUnitTests.java index d9cfcfea8..e7cf95732 100644 --- a/src/test/java/org/springframework/data/redis/core/convert/PathIndexResolverUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/convert/PathIndexResolverUnitTests.java @@ -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(); diff --git a/src/test/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntityUnitTests.java b/src/test/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntityUnitTests.java index 638446819..117676477 100644 --- a/src/test/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntityUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntityUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/core/script/DefaultScriptExecutorUnitTests.java b/src/test/java/org/springframework/data/redis/core/script/DefaultScriptExecutorUnitTests.java index a98343bc2..bf2b233bc 100644 --- a/src/test/java/org/springframework/data/redis/core/script/DefaultScriptExecutorUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/script/DefaultScriptExecutorUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerTests.java b/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerTests.java index b54183915..c5e104f75 100644 --- a/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerTests.java +++ b/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerUnitTests.java b/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerUnitTests.java index d944f1a4c..3e69023d8 100644 --- a/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerUnitTests.java +++ b/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerTests.java b/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerTests.java index e077edd28..6ac6dc4c3 100644 --- a/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerTests.java +++ b/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/repository/core/MappingRedisEntityInformationUnitTests.java b/src/test/java/org/springframework/data/redis/repository/core/MappingRedisEntityInformationUnitTests.java index 22b28d126..e1f960e87 100644 --- a/src/test/java/org/springframework/data/redis/repository/core/MappingRedisEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/redis/repository/core/MappingRedisEntityInformationUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializerUnitTests.java b/src/test/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializerUnitTests.java index c4b39c274..8f48ebe93 100644 --- a/src/test/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializerUnitTests.java +++ b/src/test/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializerUnitTests.java @@ -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 }); diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionUnitTests.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionUnitTests.java index a0e9add03..9303620de 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionUnitTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionUnitTests.java @@ -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"); diff --git a/src/test/java/org/springframework/data/redis/test/util/MockitoUtils.java b/src/test/java/org/springframework/data/redis/test/util/MockitoUtils.java index a19b1be3b..0b598a638 100644 --- a/src/test/java/org/springframework/data/redis/test/util/MockitoUtils.java +++ b/src/test/java/org/springframework/data/redis/test/util/MockitoUtils.java @@ -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 - . 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;