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

DATAREDIS-661 - Polishing.

Browse Source 
Update JavaDoc and remove usage of MapUtils brought in via optional transitive dependency.

Original Pull Request: #255
This commit is contained in:
Christoph Strobl
2017-07-18 13:52:03 +02:00
parent 8f88b78eeb
commit 4fc58ad8cf
8 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTests.java
View File

@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
import org.apache.commons.collections.MapUtils;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.geo.Distance;
@@ -221,7 +220,10 @@ public class DefaultStringRedisConnectionPipelineTests extends DefaultStringRedi
@Test // DATAREDIS-661
public void testGetConfig() {
Properties results = MapUtils.toProperties(Collections.singletonMap("foo", "bar"));
Properties results = new Properties();
results.put("foo", "bar");
doReturn(Arrays.asList(new Object[] { results })).when(nativeConnection).closePipeline();
super.testGetConfig();
}

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

@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
import org.apache.commons.collections.MapUtils;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.geo.Distance;
@@ -223,9 +222,12 @@ public class DefaultStringRedisConnectionPipelineTxTests extends DefaultStringRe
super.testGetBit();
}
@Test
@Test // DATAREDIS-661
public void testGetConfig() {
Properties results = MapUtils.toProperties(Collections.singletonMap("foo", "bar"));
Properties results = new Properties();
results.put("foo", "bar");
doReturn(Arrays.asList(new Object[] { Arrays.asList(new Object[] { results }) })).when(nativeConnection)
.closePipeline();
super.testGetConfig();

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

@@ -18,10 +18,18 @@ package org.springframework.data.redis.connection;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.apache.commons.collections.MapUtils;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
@@ -297,7 +305,10 @@ public class DefaultStringRedisConnectionTests {
@Test // DATAREDIS-661
public void testGetConfig() {
Properties results = MapUtils.toProperties(Collections.singletonMap("foo", "bar"));
Properties results = new Properties();
results.put("foo", "bar");
doReturn(results).when(nativeConnection).getConfig("foo");
actual.add(connection.getConfig("foo"));
verifyResults(Arrays.asList(new Object[] { results }));

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

@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
import org.apache.commons.collections.MapUtils;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.geo.Distance;
@@ -204,9 +203,12 @@ public class DefaultStringRedisConnectionTxTests extends DefaultStringRedisConne
super.testGetBit();
}
@Test
@Test // DATAREDIS-661
public void testGetConfig() {
Properties results = MapUtils.toProperties(Collections.singletonMap("foo", "bar"));
Properties results = new Properties();
results.put("foo", "bar");
doReturn(Arrays.asList(new Object[] { results })).when(nativeConnection).exec();
super.testGetConfig();
}

6
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java
View File

@@ -1807,10 +1807,10 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests {
// @link https://github.com/spring-projects/spring-data-redis/pull/187
assertThat(result.size() % 3, is(0));
for (Object o : result.keySet()) {
for (Object key : result.keySet()) {
assertThat(o.toString(), startsWith(CLUSTER_HOST));
assertThat(result.getProperty(o.toString()), not(startsWith(CLUSTER_HOST)));
assertThat(key.toString(), startsWith(CLUSTER_HOST));
assertThat(result.getProperty(key.toString()), not(startsWith(CLUSTER_HOST)));
}
}

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

@@ -25,9 +25,9 @@ import static org.springframework.test.util.ReflectionTestUtils.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.collections.MapUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -71,8 +71,11 @@ public class RedisKeyValueAdapterUnitTests {
template.afterPropertiesSet();
when(jedisConnectionFactoryMock.getConnection()).thenReturn(redisConnectionMock);
when(redisConnectionMock.getConfig("notify-keyspace-events"))
.thenReturn(MapUtils.toProperties(Collections.singletonMap("notify-keyspace-events", "KEA")));
Properties keyspaceEventsConfig = new Properties();
keyspaceEventsConfig.put("notify-keyspace-events", "KEA");
when(redisConnectionMock.getConfig("notify-keyspace-events")).thenReturn(keyspaceEventsConfig);
context = new RedisMappingContext(new MappingConfiguration(new IndexConfiguration(), new KeyspaceConfiguration()));
context.afterPropertiesSet();
@@ -106,8 +109,7 @@ public class RedisKeyValueAdapterUnitTests {
adapter.put("1", rd, "persons");
verify(redisConnectionMock, times(1)).sRem(Mockito.any(byte[].class),
Mockito.any(byte[].class));
verify(redisConnectionMock, times(1)).sRem(Mockito.any(byte[].class), Mockito.any(byte[].class));
}
@Test // DATAREDIS-512