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

DATAREDIS-358 - Precise version resolution within RedisTestProfileValueSource.

Browse Source 
We now resolve the precise redis version including patch level for the 2.8 line. This allows us to disable tests when building against older versions that might not have the complete featureset available.
This commit is contained in:
Christoph Strobl
2014-11-27 22:03:24 +01:00
parent 557683da51
commit cb070c1375
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ public class RedisTestProfileValueSource implements ProfileValueSource {
public String get(String key) {
if (REDIS_VERSION_KEY.equals(key)) {
if (redisVersion.compareTo(RedisVersionUtils.parseVersion(REDIS_28)) >= 0) {
return REDIS_28;
return redisVersion.toString();
}
if (redisVersion.compareTo(RedisVersionUtils.parseVersion(REDIS_26)) >= 0) {
return REDIS_26;

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

@@ -2071,6 +2071,7 @@ public abstract class AbstractConnectionIntegrationTests {
* @see DATAREDIS-308
*/
@Test
@IfProfileValue(name = "redisVersion", value = "2.8.9+")
public void pfAddShouldAddToNonExistingKeyCorrectly() {
if (!ConnectionUtils.isJedis(connectionFactory)) {
@@ -2087,6 +2088,7 @@ public abstract class AbstractConnectionIntegrationTests {
* @see DATAREDIS-308
*/
@Test
@IfProfileValue(name = "redisVersion", value = "2.8.9+")
public void pfAddShouldReturnZeroWhenValueAlreadyExists() {
if (!ConnectionUtils.isJedis(connectionFactory)) {
@@ -2107,6 +2109,7 @@ public abstract class AbstractConnectionIntegrationTests {
* @see DATAREDIS-308
*/
@Test
@IfProfileValue(name = "redisVersion", value = "2.8.9+")
public void pfCountShouldReturnCorrectly() {
if (!ConnectionUtils.isJedis(connectionFactory)) {
@@ -2125,6 +2128,7 @@ public abstract class AbstractConnectionIntegrationTests {
* @see DATAREDIS-308
*/
@Test
@IfProfileValue(name = "redisVersion", value = "2.8.9+")
public void pfCountWithMultipleKeysShouldReturnCorrectly() {
if (!ConnectionUtils.isJedis(connectionFactory)) {
@@ -2145,6 +2149,7 @@ public abstract class AbstractConnectionIntegrationTests {
* @see DATAREDIS-308
*/
@Test(expected = IllegalArgumentException.class)
@IfProfileValue(name = "redisVersion", value = "2.8.9+")
public void pfCountWithNullKeysShouldThrowIllegalArgumentException() {
if (!ConnectionUtils.isJedis(connectionFactory)) {

10
src/test/java/org/springframework/data/redis/core/DefaultHyperLogLogOperationsTests.java
View File

@@ -22,7 +22,7 @@ import java.util.Collection;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -36,6 +36,7 @@ import org.springframework.test.annotation.IfProfileValue;
* @author Christoph Strobl
*/
@RunWith(Parameterized.class)
@IfProfileValue(name = "redisVersion", value = "2.8.9+")
public class DefaultHyperLogLogOperationsTests<K, V> {
private RedisTemplate<K, V> redisTemplate;
@@ -46,7 +47,7 @@ public class DefaultHyperLogLogOperationsTests<K, V> {
private HyperLogLogOperations<K, V> hyperLogLogOps;
public @Rule MinimumRedisVersionRule versionRule = new MinimumRedisVersionRule();
public static @ClassRule MinimumRedisVersionRule versionRule = new MinimumRedisVersionRule();
public DefaultHyperLogLogOperationsTests(RedisTemplate<K, V> redisTemplate, ObjectFactory<K> keyFactory,
ObjectFactory<V> valueFactory) {
@@ -80,7 +81,6 @@ public class DefaultHyperLogLogOperationsTests<K, V> {
*/
@Test
@SuppressWarnings("unchecked")
@IfProfileValue(name = "redisVersion", value = "2.8+")
public void addShouldAddDistinctValuesCorrectly() {
K key = keyFactory.instance();
@@ -96,7 +96,6 @@ public class DefaultHyperLogLogOperationsTests<K, V> {
*/
@Test
@SuppressWarnings("unchecked")
@IfProfileValue(name = "redisVersion", value = "2.8+")
public void addShouldNotAddExistingValuesCorrectly() {
K key = keyFactory.instance();
@@ -113,7 +112,6 @@ public class DefaultHyperLogLogOperationsTests<K, V> {
*/
@Test
@SuppressWarnings("unchecked")
@IfProfileValue(name = "redisVersion", value = "2.8+")
public void sizeShouldCountValuesCorrectly() {
K key = keyFactory.instance();
@@ -130,7 +128,6 @@ public class DefaultHyperLogLogOperationsTests<K, V> {
*/
@Test
@SuppressWarnings("unchecked")
@IfProfileValue(name = "redisVersion", value = "2.8+")
public void sizeShouldCountValuesOfMultipleKeysCorrectly() {
K key = keyFactory.instance();
@@ -152,7 +149,6 @@ public class DefaultHyperLogLogOperationsTests<K, V> {
*/
@Test
@SuppressWarnings("unchecked")
@IfProfileValue(name = "redisVersion", value = "2.8+")
public void unionShouldMergeValuesOfMultipleKeysCorrectly() throws InterruptedException {
K sourceKey_1 = keyFactory.instance();

6
src/test/java/org/springframework/data/redis/test/util/RelaxedJUnit4ClassRunner.java
View File

@@ -20,6 +20,8 @@ import java.lang.reflect.Method;
import org.junit.Ignore;
import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.InitializationError;
import org.springframework.data.redis.Version;
import org.springframework.data.redis.VersionParser;
import org.springframework.test.annotation.IfProfileValue;
import org.springframework.test.annotation.ProfileValueSource;
import org.springframework.test.annotation.ProfileValueUtils;
@@ -64,8 +66,8 @@ public class RelaxedJUnit4ClassRunner extends SpringJUnit4ClassRunner {
if (value.endsWith("+")) {
String expected = value.replace("+", "");
if (expected.compareTo(environmentValue) <= 0) {
Version expected = VersionParser.parseVersion(value.replace("+", ""));
if (expected.compareTo(VersionParser.parseVersion(environmentValue)) <= 0) {
return true;
}