rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pool doesn't throw Exception anymore but JedisException

Browse Source
This commit is contained in:
Jonathan Leibiusky
2010-12-10 17:36:44 -03:00
parent dadaaecfdb
commit 6f92f5fc9c
3 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
View File

@@ -1,13 +1,12 @@
package redis.clients.jedis.tests;
import java.util.NoSuchElementException;
import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.commons.pool.impl.GenericObjectPool.Config;
import org.junit.Assert;
import org.junit.Test;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisException;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.tests.HostAndPortUtil.HostAndPort;
@@ -66,8 +65,8 @@ public class JedisPoolTest extends Assert {
pool.destroy();
}
@Test(expected = NoSuchElementException.class)
public void checkPoolOverflow() throws Exception {
@Test(expected = JedisException.class)
public void checkPoolOverflow() {
Config config = new Config();
config.maxActive = 1;
config.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_FAIL;

14
src/test/java/redis/clients/jedis/tests/ShardedJedisPoolTest.java
View File

@@ -4,7 +4,6 @@ import java.io.IOException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.commons.pool.impl.GenericObjectPool.Config;
@@ -13,6 +12,7 @@ import org.junit.Before;
import org.junit.Test;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisException;
import redis.clients.jedis.JedisShardInfo;
import redis.clients.jedis.ShardedJedis;
import redis.clients.jedis.ShardedJedisPool;
@@ -44,7 +44,7 @@ public class ShardedJedisPoolTest extends Assert {
}
@Test
public void checkConnections() throws Exception {
public void checkConnections() {
ShardedJedisPool pool = new ShardedJedisPool(new Config(), shards);
ShardedJedis jedis = pool.getResource();
jedis.set("foo", "bar");
@@ -54,7 +54,7 @@ public class ShardedJedisPoolTest extends Assert {
}
@Test
public void checkConnectionWithDefaultPort() throws Exception {
public void checkConnectionWithDefaultPort() {
ShardedJedisPool pool = new ShardedJedisPool(new Config(), shards);
ShardedJedis jedis = pool.getResource();
jedis.set("foo", "bar");
@@ -64,7 +64,7 @@ public class ShardedJedisPoolTest extends Assert {
}
@Test
public void checkJedisIsReusedWhenReturned() throws Exception {
public void checkJedisIsReusedWhenReturned() {
ShardedJedisPool pool = new ShardedJedisPool(new Config(), shards);
ShardedJedis jedis = pool.getResource();
jedis.set("foo", "0");
@@ -89,8 +89,8 @@ public class ShardedJedisPoolTest extends Assert {
pool.destroy();
}
@Test(expected = NoSuchElementException.class)
public void checkPoolOverflow() throws Exception {
@Test(expected = JedisException.class)
public void checkPoolOverflow() {
Config config = new Config();
config.maxActive = 1;
config.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_FAIL;
@@ -105,7 +105,7 @@ public class ShardedJedisPoolTest extends Assert {
}
@Test
public void shouldNotShareInstances() throws Exception {
public void shouldNotShareInstances() {
Config config = new Config();
config.maxActive = 2;
config.whenExhaustedAction = GenericObjectPool.WHEN_EXHAUSTED_FAIL;