From 9bad0adfa49d19e7362e99e88f3f30cf78b4c783 Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Tue, 16 Jul 2013 10:02:20 -0700 Subject: [PATCH] Test script load and flush in pipeline --- .../AbstractConnectionPipelineIntegrationTests.java | 8 ++++---- .../jredis/JRedisConnectionIntegrationTests.java | 2 +- .../LettuceConnectionPipelineIntegrationTests.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java index a4b8c3917..125e39313 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java @@ -994,9 +994,9 @@ abstract public class AbstractConnectionPipelineIntegrationTests extends @Test @IfProfileValue(name = "redisVersion", value = "2.6") public void testScriptLoadEvalSha() { - // close the pipeline to get the return value of script load - getResults(); - String sha1 = connection.scriptLoad("return KEYS[1]"); + connection.scriptLoad("return KEYS[1]"); + List results = convertResults(); + String sha1 = (String)results.get(0); initConnection(); actual.add(connection.evalSha(sha1, ReturnType.VALUE, 2, "key1", "key2")); verifyResults(Arrays.asList(new Object[] {"key1"}), actual); @@ -1058,8 +1058,8 @@ abstract public class AbstractConnectionPipelineIntegrationTests extends public void testScriptFlush() { getResults(); String sha1 = connection.scriptLoad("return KEYS[1]"); - connection.scriptFlush(); initConnection(); + connection.scriptFlush(); actual.add(connection.scriptExists(sha1)); verifyResults(Arrays.asList(new Object[] {Arrays.asList(new Object[] { 0l })}), actual); } diff --git a/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java index 489b6c50e..ff0a96247 100644 --- a/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jredis/JRedisConnectionIntegrationTests.java @@ -512,7 +512,7 @@ public class JRedisConnectionIntegrationTests extends AbstractConnectionIntegrat @Test(expected=UnsupportedOperationException.class) @IfProfileValue(name = "redisVersion", value = "2.6") public void testScriptFlush() { - super.testScriptFlush(); + connection.scriptFlush(); } @Test(expected=UnsupportedOperationException.class) diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java index 0e072f522..14881de9c 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java @@ -415,8 +415,8 @@ public class LettuceConnectionPipelineIntegrationTests extends public void testScriptFlush() { getResults(); String sha1 = connection.scriptLoad("return KEYS[1]"); - connection.scriptFlush(); initConnection(); + connection.scriptFlush(); actual.add(connection.scriptExists(sha1)); // Lettuce actually returns booleans, it's not an SDR conversion verifyResults(Arrays.asList(new Object[] {Arrays.asList(new Object[] { false })}), actual);