From ca00877e64257261b1cb9425613906a178bf723d Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Thu, 14 Mar 2013 15:03:19 -0700 Subject: [PATCH] Use connection pools in all tests The test suite creates a lot of connections. Use connection pooling where possible to minimize risk of Socket BindExceptions. --- .../redis/connection/rjc/RjcConnectionIntegrationTests.java | 2 +- .../data/redis/listener/PubSubResubscribeTests.java | 2 +- .../data/redis/listener/PubSubTestParams.java | 4 ++-- .../data/redis/support/atomic/AtomicCountersParam.java | 2 +- .../redis/support/collections/CollectionTestParams.java | 6 +++--- .../data/redis/support/collections/RedisMapTests.java | 2 +- .../redis/support/collections/RedisPropertiesTests.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/java/org/springframework/data/redis/connection/rjc/RjcConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/rjc/RjcConnectionIntegrationTests.java index b41eb30b1..bc4efcdd0 100644 --- a/src/test/java/org/springframework/data/redis/connection/rjc/RjcConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/rjc/RjcConnectionIntegrationTests.java @@ -38,7 +38,7 @@ public class RjcConnectionIntegrationTests extends AbstractConnectionIntegration factory.setPort(SettingsUtils.getPort()); factory.setHostName(SettingsUtils.getHost()); - factory.setUsePool(false); + factory.setUsePool(true); factory.afterPropertiesSet(); } diff --git a/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java b/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java index 06418f65e..ddbd4ae25 100644 --- a/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java +++ b/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java @@ -70,7 +70,7 @@ public class PubSubResubscribeTests { @Before public void setUp() throws Exception { JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); - jedisConnFactory.setUsePool(false); + jedisConnFactory.setUsePool(true); jedisConnFactory.setPort(SettingsUtils.getPort()); jedisConnFactory.setHostName(SettingsUtils.getHost()); jedisConnFactory.setDatabase(2); diff --git a/src/test/java/org/springframework/data/redis/listener/PubSubTestParams.java b/src/test/java/org/springframework/data/redis/listener/PubSubTestParams.java index 8d087fe2c..3bd14289e 100644 --- a/src/test/java/org/springframework/data/redis/listener/PubSubTestParams.java +++ b/src/test/java/org/springframework/data/redis/listener/PubSubTestParams.java @@ -40,7 +40,7 @@ public class PubSubTestParams { ObjectFactory personFactory = new PersonObjectFactory(); JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); - jedisConnFactory.setUsePool(false); + jedisConnFactory.setUsePool(true); jedisConnFactory.setPort(SettingsUtils.getPort()); jedisConnFactory.setHostName(SettingsUtils.getHost()); jedisConnFactory.setDatabase(2); @@ -54,7 +54,7 @@ public class PubSubTestParams { // create RJC RjcConnectionFactory rjcConnFactory = new RjcConnectionFactory(); - rjcConnFactory.setUsePool(false); + rjcConnFactory.setUsePool(true); rjcConnFactory.setPort(SettingsUtils.getPort()); rjcConnFactory.setHostName(SettingsUtils.getHost()); rjcConnFactory.afterPropertiesSet(); diff --git a/src/test/java/org/springframework/data/redis/support/atomic/AtomicCountersParam.java b/src/test/java/org/springframework/data/redis/support/atomic/AtomicCountersParam.java index bed64c3f4..36a5aa677 100644 --- a/src/test/java/org/springframework/data/redis/support/atomic/AtomicCountersParam.java +++ b/src/test/java/org/springframework/data/redis/support/atomic/AtomicCountersParam.java @@ -31,7 +31,7 @@ public abstract class AtomicCountersParam { JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); jedisConnFactory.setPort(SettingsUtils.getPort()); jedisConnFactory.setHostName(SettingsUtils.getHost()); - jedisConnFactory.setUsePool(false); + jedisConnFactory.setUsePool(true); jedisConnFactory.afterPropertiesSet(); // jredis factory diff --git a/src/test/java/org/springframework/data/redis/support/collections/CollectionTestParams.java b/src/test/java/org/springframework/data/redis/support/collections/CollectionTestParams.java index 3b1001a7f..a1fd142e4 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/CollectionTestParams.java +++ b/src/test/java/org/springframework/data/redis/support/collections/CollectionTestParams.java @@ -52,7 +52,7 @@ public abstract class CollectionTestParams { ObjectFactory personFactory = new PersonObjectFactory(); JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); - jedisConnFactory.setUsePool(false); + jedisConnFactory.setUsePool(true); jedisConnFactory.setPort(SettingsUtils.getPort()); jedisConnFactory.setHostName(SettingsUtils.getHost()); @@ -82,7 +82,7 @@ public abstract class CollectionTestParams { // jredis JredisConnectionFactory jredisConnFactory = new JredisConnectionFactory(); - jredisConnFactory.setUsePool(false); + jredisConnFactory.setUsePool(true); jredisConnFactory.setPort(SettingsUtils.getPort()); jredisConnFactory.setHostName(SettingsUtils.getHost()); @@ -112,7 +112,7 @@ public abstract class CollectionTestParams { // rjc RjcConnectionFactory rjcConnFactory = new RjcConnectionFactory(); - rjcConnFactory.setUsePool(false); + rjcConnFactory.setUsePool(true); rjcConnFactory.setPort(SettingsUtils.getPort()); rjcConnFactory.setHostName(SettingsUtils.getHost()); rjcConnFactory.afterPropertiesSet(); diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisMapTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisMapTests.java index 0863daf56..225b1a497 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisMapTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisMapTests.java @@ -66,7 +66,7 @@ public class RedisMapTests extends AbstractRedisMapTests { ObjectFactory personFactory = new PersonObjectFactory(); JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); - jedisConnFactory.setUsePool(false); + jedisConnFactory.setUsePool(true); jedisConnFactory.setPort(SettingsUtils.getPort()); jedisConnFactory.setHostName(SettingsUtils.getHost()); jedisConnFactory.afterPropertiesSet(); diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java index b4be367f9..f6437cd7c 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java @@ -236,7 +236,7 @@ public class RedisPropertiesTests extends RedisMapTests { ObjectFactory stringFactory = new StringObjectFactory(); JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); - jedisConnFactory.setUsePool(false); + jedisConnFactory.setUsePool(true); jedisConnFactory.setPort(SettingsUtils.getPort()); jedisConnFactory.setHostName(SettingsUtils.getHost());