From a5e8636247ba32fbc2b0772f9410980e0188af42 Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Mon, 29 Jul 2013 21:50:36 -0700 Subject: [PATCH] Improve test speed and add failure diagnostics --- .../data/redis/core/DefaultListOperationsTests.java | 3 +++ .../data/redis/core/RedisTemplateTests.java | 7 +++---- .../support/collections/AbstractRedisListTests.java | 9 ++------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/springframework/data/redis/core/DefaultListOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultListOperationsTests.java index a2ac93bde..67141952b 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultListOperationsTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultListOperationsTests.java @@ -84,6 +84,9 @@ public class DefaultListOperationsTests { V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); + System.out.println("Value1" + v1); + System.out.println("Value2" + v2); + System.out.println("Value3" + v3); assertEquals(Long.valueOf(1),listOps.leftPush(key, v1)); assertEquals(Long.valueOf(2),listOps.leftPush(key, v2)); assertEquals(Long.valueOf(3), listOps.leftPush(key, v1, v3)); diff --git a/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java b/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java index 8bea1bca9..50cdd927d 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java @@ -452,17 +452,16 @@ public class RedisTemplateTests { @Test public void testExpireAt() { - assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6") && - RedisTestProfileValueSource.matches("runLongTests", "true")); + assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6")); final K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); redisTemplate.boundValueOps(key1).set(value1); - redisTemplate.expireAt(key1, new Date(System.currentTimeMillis() + 1000l)); + redisTemplate.expireAt(key1, new Date(System.currentTimeMillis() + 5l)); waitFor(new TestCondition() { public boolean passes() { return (!redisTemplate.hasKey(key1)); } - }, 1500l); + }, 5l); } @Test diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisListTests.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisListTests.java index b253ee5c9..a10c9b338 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisListTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisListTests.java @@ -231,13 +231,10 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT @Test public void testPollTimeout() throws InterruptedException { - // 1 ms timeout gets upgraded to 1 sec timeout at the moment - assumeTrue(RedisTestProfileValueSource.matches("runLongTests", "true") && - !ConnectionUtils.isJredis(template.getConnectionFactory())); + assumeTrue(!ConnectionUtils.isJredis(template.getConnectionFactory())); T t1 = getT(); list.add(t1); assertEquals(t1, list.poll(1, TimeUnit.MILLISECONDS)); - assertNull(list.poll(1, TimeUnit.MILLISECONDS)); } @Test @@ -466,9 +463,7 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT @Test public void testPollLastTimeout() throws InterruptedException { - // 1 ms timeout gets upgraded to 1 sec timeout at the moment - assumeTrue(RedisTestProfileValueSource.matches("runLongTests", "true") && - !ConnectionUtils.isJredis(template.getConnectionFactory())); + assumeTrue(!ConnectionUtils.isJredis(template.getConnectionFactory())); T t1 = getT(); T t2 = getT();