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

DATAREDIS-746 - Polishing.

Browse Source 
Move delegates to default methods.

Original Pull Request: #314
This commit is contained in:
Christoph Strobl
2018-03-05 09:55:24 +01:00
parent 56a01625d5
commit 468345115a
15 changed files with 56 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,16 @@ 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.junit.Before;
@@ -38,6 +47,7 @@ import org.springframework.data.redis.connection.RedisServerCommands.ShutdownOpt
import org.springframework.data.redis.connection.RedisStringCommands.BitOperation;
import org.springframework.data.redis.connection.RedisZSetCommands.Aggregate;
import org.springframework.data.redis.connection.RedisZSetCommands.Tuple;
import org.springframework.data.redis.connection.RedisZSetCommands.Weights;
import org.springframework.data.redis.connection.StringRedisConnection.StringTuple;
import org.springframework.data.redis.connection.convert.Converters;
import org.springframework.data.redis.serializer.StringRedisSerializer;
@@ -1286,14 +1296,14 @@ public class DefaultStringRedisConnectionTests {
@Test
public void testZInterStoreAggWeightsBytes() {
doReturn(5l).when(nativeConnection).zInterStore(fooBytes, Aggregate.MAX, new int[0], fooBytes);
doReturn(5l).when(nativeConnection).zInterStore(eq(fooBytes), eq(Aggregate.MAX), any(Weights.class), eq(fooBytes));
actual.add(connection.zInterStore(fooBytes, Aggregate.MAX, new int[0], fooBytes));
verifyResults(Arrays.asList(new Object[] { 5l }));
}
@Test
public void testZInterStoreAggWeights() {
doReturn(5l).when(nativeConnection).zInterStore(fooBytes, Aggregate.MAX, new int[0], fooBytes);
doReturn(5l).when(nativeConnection).zInterStore(eq(fooBytes), eq(Aggregate.MAX), any(Weights.class), eq(fooBytes));
actual.add(connection.zInterStore(foo, Aggregate.MAX, new int[0], foo));
verifyResults(Arrays.asList(new Object[] { 5l }));
}
@@ -1566,14 +1576,14 @@ public class DefaultStringRedisConnectionTests {
@Test
public void testZUnionStoreAggWeightsBytes() {
doReturn(5l).when(nativeConnection).zUnionStore(fooBytes, Aggregate.MAX, new int[0], fooBytes);
doReturn(5l).when(nativeConnection).zUnionStore(eq(fooBytes), eq(Aggregate.MAX), any(Weights.class), eq(fooBytes));
actual.add(connection.zUnionStore(fooBytes, Aggregate.MAX, new int[0], fooBytes));
verifyResults(Arrays.asList(new Object[] { 5l }));
}
@Test
public void testZUnionStoreAggWeights() {
doReturn(5l).when(nativeConnection).zUnionStore(fooBytes, Aggregate.MAX, new int[0], fooBytes);
doReturn(5l).when(nativeConnection).zUnionStore(eq(fooBytes), eq(Aggregate.MAX), any(Weights.class), eq(fooBytes));
actual.add(connection.zUnionStore(foo, Aggregate.MAX, new int[0], foo));
verifyResults(Arrays.asList(new Object[] { 5l }));
}
@@ -1785,8 +1795,7 @@ public class DefaultStringRedisConnectionTests {
@Test // DATAREDIS-438
public void testGeoAddWithGeoLocationBytes() {
doReturn(1l).when(nativeConnection).geoAdd(fooBytes,
new GeoLocation<>(barBytes, new Point(1.23232, 34.2342434)));
doReturn(1l).when(nativeConnection).geoAdd(fooBytes, new GeoLocation<>(barBytes, new Point(1.23232, 34.2342434)));
actual.add(connection.geoAdd(fooBytes, new GeoLocation<>(barBytes, new Point(1.23232, 34.2342434))));
verifyResults(Collections.singletonList(1L));

4
src/test/java/org/springframework/data/redis/connection/RedisConnectionUnitTests.java
View File

@@ -840,10 +840,6 @@ public class RedisConnectionUnitTests {
return delegate.zUnionStore(destKey, sets);
}
public Long zUnionStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) {
return delegate.zUnionStore(destKey, aggregate, weights, sets);
}
public Long zUnionStore(byte[] destKey, Aggregate aggregate, Weights weights, byte[]... sets) {
return delegate.zUnionStore(destKey, aggregate, weights, sets);
}

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

@@ -53,7 +53,7 @@ import org.springframework.test.annotation.IfProfileValue;
* @author Jennifer Hickey
* @author Christoph Strobl
* @author Mark Paluch
* @author wongoo
* @author Wongoo (望哥)
* @param <K> Key type
* @param <V> Value type
*/
@@ -379,7 +379,6 @@ public class DefaultZSetOperationsTests<K, V> {
zSetOps.add(key1, value2, 2.0);
zSetOps.add(key2, value2, 3.0);
zSetOps.unionAndStore(key1, Collections.singletonList(key2), key1, RedisZSetCommands.Aggregate.MIN);
assertThat(zSetOps.score(key1, value2), closeTo(2.0, 0.1));