You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2013/11/03 18:15:12 UTC
svn commit: r1538403 - in
/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2:
TestBaseObjectPool.java impl/TestGenericObjectPool.java
impl/TestSoftReferenceObjectPool.java
Author: markt
Date: Sun Nov 3 17:15:12 2013
New Revision: 1538403
URL: http://svn.apache.org/r1538403
Log:
[POOL-238]
Partial fix.
These pools all use String so be specific.
Modified:
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java?rev=1538403&r1=1538402&r2=1538403&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java Sun Nov 3 17:15:12 2013
@@ -27,12 +27,12 @@ import org.junit.Test;
* @version $Revision$
*/
public class TestBaseObjectPool extends TestObjectPool {
- private ObjectPool<Object> _pool = null;
+ private ObjectPool<String> _pool = null;
/**
* @param mincapacity
*/
- protected ObjectPool<Object> makeEmptyPool(int mincapacity) {
+ protected ObjectPool<String> makeEmptyPool(int mincapacity) {
if (this.getClass() != TestBaseObjectPool.class) {
fail("Subclasses of TestBaseObjectPool must reimplement this method.");
}
@@ -131,7 +131,7 @@ public class TestBaseObjectPool extends
_pool.addObject();
assertEquals(1,_pool.getNumIdle());
assertEquals(0,_pool.getNumActive());
- Object obj = _pool.borrowObject();
+ String obj = _pool.borrowObject();
assertEquals(getNthObject(0),obj);
assertEquals(0,_pool.getNumIdle());
assertEquals(1,_pool.getNumActive());
@@ -152,11 +152,11 @@ public class TestBaseObjectPool extends
} catch(UnsupportedOperationException e) {
return; // skip this test if unsupported
}
- Object obj0 = _pool.borrowObject();
+ String obj0 = _pool.borrowObject();
assertEquals(getNthObject(0),obj0);
- Object obj1 = _pool.borrowObject();
+ String obj1 = _pool.borrowObject();
assertEquals(getNthObject(1),obj1);
- Object obj2 = _pool.borrowObject();
+ String obj2 = _pool.borrowObject();
assertEquals(getNthObject(2),obj2);
_pool.returnObject(obj2);
obj2 = _pool.borrowObject();
@@ -193,10 +193,10 @@ public class TestBaseObjectPool extends
}
assertEquals(0,_pool.getNumActive());
assertEquals(0,_pool.getNumIdle());
- Object obj0 = _pool.borrowObject();
+ String obj0 = _pool.borrowObject();
assertEquals(1,_pool.getNumActive());
assertEquals(0,_pool.getNumIdle());
- Object obj1 = _pool.borrowObject();
+ String obj1 = _pool.borrowObject();
assertEquals(2,_pool.getNumActive());
assertEquals(0,_pool.getNumIdle());
_pool.returnObject(obj1);
@@ -217,8 +217,8 @@ public class TestBaseObjectPool extends
}
assertEquals(0,_pool.getNumActive());
assertEquals(0,_pool.getNumIdle());
- Object obj0 = _pool.borrowObject();
- Object obj1 = _pool.borrowObject();
+ String obj0 = _pool.borrowObject();
+ String obj1 = _pool.borrowObject();
assertEquals(2,_pool.getNumActive());
assertEquals(0,_pool.getNumIdle());
_pool.returnObject(obj1);
@@ -242,8 +242,8 @@ public class TestBaseObjectPool extends
}
assertEquals(0,_pool.getNumActive());
assertEquals(0,_pool.getNumIdle());
- Object obj0 = _pool.borrowObject();
- Object obj1 = _pool.borrowObject();
+ String obj0 = _pool.borrowObject();
+ String obj1 = _pool.borrowObject();
assertEquals(2,_pool.getNumActive());
assertEquals(0,_pool.getNumIdle());
_pool.invalidateObject(obj0);
@@ -262,7 +262,7 @@ public class TestBaseObjectPool extends
} catch(UnsupportedOperationException e) {
return; // skip this test if unsupported
}
- Object obj = _pool.borrowObject();
+ String obj = _pool.borrowObject();
_pool.returnObject(obj);
_pool.close();
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java?rev=1538403&r1=1538402&r2=1538403&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java Sun Nov 3 17:15:12 2013
@@ -53,9 +53,9 @@ import org.junit.Test;
public class TestGenericObjectPool extends TestBaseObjectPool {
@Override
- protected ObjectPool<Object> makeEmptyPool(int mincap) {
- GenericObjectPool<Object> mtPool =
- new GenericObjectPool<Object>(new SimpleFactory());
+ protected ObjectPool<String> makeEmptyPool(int mincap) {
+ GenericObjectPool<String> mtPool =
+ new GenericObjectPool<String>(new SimpleFactory());
mtPool.setMaxTotal(mincap);
mtPool.setMaxIdle(mincap);
return mtPool;
@@ -75,7 +75,7 @@ public class TestGenericObjectPool exten
@Before
public void setUp() throws Exception {
factory = new SimpleFactory();
- pool = new GenericObjectPool<Object>(factory);
+ pool = new GenericObjectPool<String>(factory);
}
@After
@@ -194,7 +194,7 @@ public class TestGenericObjectPool exten
public void testWhenExhaustedFail() throws Exception {
pool.setMaxTotal(1);
pool.setBlockWhenExhausted(false);
- Object obj1 = pool.borrowObject();
+ String obj1 = pool.borrowObject();
assertNotNull(obj1);
try {
pool.borrowObject();
@@ -212,7 +212,7 @@ public class TestGenericObjectPool exten
pool.setMaxTotal(1);
pool.setBlockWhenExhausted(true);
pool.setMaxWaitMillis(10L);
- Object obj1 = pool.borrowObject();
+ String obj1 = pool.borrowObject();
assertNotNull(obj1);
try {
pool.borrowObject();
@@ -229,7 +229,7 @@ public class TestGenericObjectPool exten
pool.setMaxTotal(1);
pool.setBlockWhenExhausted(true);
pool.setMaxWaitMillis(-1);
- Object obj1 = pool.borrowObject();
+ String obj1 = pool.borrowObject();
// Make sure on object was obtained
assertNotNull(obj1);
@@ -252,7 +252,7 @@ public class TestGenericObjectPool exten
// Bug POOL-162 - check there is now an object in the pool
pool.setMaxWaitMillis(10L);
- Object obj2 = null;
+ String obj2 = null;
try {
obj2 = pool.borrowObject();
assertNotNull(obj2);
@@ -514,7 +514,7 @@ public class TestGenericObjectPool exten
@Test(timeout=60000)
public void testExceptionOnPassivateDuringReturn() throws Exception {
- Object obj = pool.borrowObject();
+ String obj = pool.borrowObject();
factory.setThrowExceptionOnPassivate(true);
pool.returnObject(obj);
assertEquals(0,pool.getNumIdle());
@@ -540,7 +540,7 @@ public class TestGenericObjectPool exten
public void testExceptionOnDestroyDuringReturn() throws Exception {
factory.setThrowExceptionOnDestroy(true);
pool.setTestOnReturn(true);
- Object obj1 = pool.borrowObject();
+ String obj1 = pool.borrowObject();
pool.borrowObject();
factory.setValid(false); // Make validation fail
pool.returnObject(obj1);
@@ -550,15 +550,15 @@ public class TestGenericObjectPool exten
@Test(timeout=60000)
public void testExceptionOnActivateDuringBorrow() throws Exception {
- Object obj1 = pool.borrowObject();
- Object obj2 = pool.borrowObject();
+ String obj1 = pool.borrowObject();
+ String obj2 = pool.borrowObject();
pool.returnObject(obj1);
pool.returnObject(obj2);
factory.setThrowExceptionOnActivate(true);
factory.setEvenValid(false);
// Activation will now throw every other time
// First attempt throws, but loop continues and second succeeds
- Object obj = pool.borrowObject();
+ String obj = pool.borrowObject();
assertEquals(1, pool.getNumActive());
assertEquals(0, pool.getNumIdle());
@@ -580,7 +580,7 @@ public class TestGenericObjectPool exten
public void testNegativeMaxTotal() throws Exception {
pool.setMaxTotal(-1);
pool.setBlockWhenExhausted(false);
- Object obj = pool.borrowObject();
+ String obj = pool.borrowObject();
assertEquals(getNthObject(0),obj);
pool.returnObject(obj);
}
@@ -589,7 +589,7 @@ public class TestGenericObjectPool exten
public void testMaxIdle() throws Exception {
pool.setMaxTotal(100);
pool.setMaxIdle(8);
- Object[] active = new Object[100];
+ String[] active = new String[100];
for(int i=0;i<100;i++) {
active[i] = pool.borrowObject();
}
@@ -606,7 +606,7 @@ public class TestGenericObjectPool exten
public void testMaxIdleZero() throws Exception {
pool.setMaxTotal(100);
pool.setMaxIdle(0);
- Object[] active = new Object[100];
+ String[] active = new String[100];
for(int i=0;i<100;i++) {
active[i] = pool.borrowObject();
}
@@ -640,8 +640,8 @@ public class TestGenericObjectPool exten
pool.setMaxTotal(2);
pool.setMaxWaitMillis(10);
pool.setBlockWhenExhausted(true);
- Object obj = pool.borrowObject();
- Object obj2 = pool.borrowObject();
+ String obj = pool.borrowObject();
+ String obj2 = pool.borrowObject();
try {
pool.borrowObject();
fail("Expecting NoSuchElementException");
@@ -699,7 +699,7 @@ public class TestGenericObjectPool exten
}
for (int i = 0; i < numIter; i++) {
- Object obj = null;
+ String obj = null;
try {
try {
Thread.sleep(delay);
@@ -835,7 +835,7 @@ public class TestGenericObjectPool exten
for(int j=0;j<2;j++) {
// populate the pool
{
- Object[] active = new Object[6];
+ String[] active = new String[6];
for(int i=0;i<6;i++) {
active[i] = pool.borrowObject();
}
@@ -870,7 +870,7 @@ public class TestGenericObjectPool exten
pool.setMinEvictableIdleTimeMillis(50L);
pool.setTimeBetweenEvictionRunsMillis(100L);
- Object[] active = new Object[6];
+ String[] active = new String[6];
for(int i=0;i<6;i++) {
active[i] = pool.borrowObject();
}
@@ -897,7 +897,7 @@ public class TestGenericObjectPool exten
pool.setTimeBetweenEvictionRunsMillis(500L);
pool.setTestWhileIdle(true);
- Object[] active = new Object[500];
+ String[] active = new String[500];
for(int i=0;i<500;i++) {
active[i] = pool.borrowObject();
}
@@ -964,7 +964,7 @@ public class TestGenericObjectPool exten
pool.setTestWhileIdle(true);
pool.setEvictionPolicyClassName(TestEvictionPolicy.class.getName());
- Object[] active = new Object[500];
+ String[] active = new String[500];
for(int i=0;i<500;i++) {
active[i] = pool.borrowObject();
}
@@ -1086,7 +1086,7 @@ public class TestGenericObjectPool exten
final int nObjects = 1000;
pool.setMaxTotal(nObjects);
pool.setMaxIdle(nObjects);
- final Object[] obj = new Object[nObjects];
+ final String[] obj = new String[nObjects];
for (int i = 0; i < nObjects; i++) {
obj[i] = pool.borrowObject();
}
@@ -1131,10 +1131,10 @@ public class TestGenericObjectPool exten
* Attempts to invalidate an object, swallowing IllegalStateException.
*/
static class InvalidateThread implements Runnable {
- private final Object obj;
- private final ObjectPool<Object> pool;
+ private final String obj;
+ private final ObjectPool<String> pool;
private boolean done = false;
- public InvalidateThread(ObjectPool<Object> pool, Object obj) {
+ public InvalidateThread(ObjectPool<String> pool, String obj) {
this.obj = obj;
this.pool = pool;
}
@@ -1168,7 +1168,7 @@ public class TestGenericObjectPool exten
try { Thread.sleep(150L); } catch(InterruptedException e) { }
assertTrue("Should be 5 idle, found " + pool.getNumIdle(),pool.getNumIdle() == 5);
- Object[] active = new Object[5];
+ String[] active = new String[5];
active[0] = pool.borrowObject();
try { Thread.sleep(150L); } catch(InterruptedException e) { }
@@ -1202,7 +1202,7 @@ public class TestGenericObjectPool exten
try { Thread.sleep(150L); } catch(InterruptedException e) { }
assertTrue("Should be 5 idle, found " + pool.getNumIdle(),pool.getNumIdle() == 5);
- Object[] active = new Object[10];
+ String[] active = new String[10];
try { Thread.sleep(150L); } catch(InterruptedException e) { }
assertTrue("Should be 5 idle, found " + pool.getNumIdle(),pool.getNumIdle() == 5);
@@ -1347,7 +1347,7 @@ public class TestGenericObjectPool exten
private class ConcurrentBorrowAndEvictThread extends Thread {
private boolean borrow;
- public Object obj;
+ public String obj;
public ConcurrentBorrowAndEvictThread(boolean borrow) {
this.borrow = borrow;
@@ -1369,7 +1369,7 @@ public class TestGenericObjectPool exten
private final java.util.Random _random = new java.util.Random();
// Thread config items
- private final ObjectPool<Object> _pool;
+ private final ObjectPool<String> _pool;
private final int _iter;
private final int _delay;
private final boolean _randomDelay;
@@ -1379,24 +1379,24 @@ public class TestGenericObjectPool exten
private volatile boolean _failed = false;
private volatile Throwable _error;
- public TestThread(ObjectPool<Object> pool) {
+ public TestThread(ObjectPool<String> pool) {
this(pool, 100, 50, true, null);
}
- public TestThread(ObjectPool<Object> pool, int iter) {
+ public TestThread(ObjectPool<String> pool, int iter) {
this(pool, iter, 50, true, null);
}
- public TestThread(ObjectPool<Object> pool, int iter, int delay) {
+ public TestThread(ObjectPool<String> pool, int iter, int delay) {
this(pool, iter, delay, true, null);
}
- public TestThread(ObjectPool<Object> pool, int iter, int delay,
+ public TestThread(ObjectPool<String> pool, int iter, int delay,
boolean randomDelay) {
this(pool, iter, delay, randomDelay, null);
}
- public TestThread(ObjectPool<Object> pool, int iter, int delay,
+ public TestThread(ObjectPool<String> pool, int iter, int delay,
boolean randomDelay, Object obj) {
_pool = pool;
_iter = iter;
@@ -1423,7 +1423,7 @@ public class TestGenericObjectPool exten
} catch(InterruptedException e) {
// ignored
}
- Object obj = null;
+ String obj = null;
try {
obj = _pool.borrowObject();
} catch(Exception e) {
@@ -1460,7 +1460,7 @@ public class TestGenericObjectPool exten
@Test(timeout=60000)
public void testFIFO() throws Exception {
- Object o = null;
+ String o = null;
pool.setLifo(false);
pool.addObject(); // "0"
pool.addObject(); // "1"
@@ -1477,7 +1477,7 @@ public class TestGenericObjectPool exten
@Test(timeout=60000)
public void testLIFO() throws Exception {
- Object o = null;
+ String o = null;
pool.setLifo(true);
pool.addObject(); // "0"
pool.addObject(); // "1"
@@ -1498,7 +1498,7 @@ public class TestGenericObjectPool exten
pool.addObject();
assertEquals("should be one idle", 1, pool.getNumIdle());
assertEquals("should be zero active", 0, pool.getNumActive());
- Object obj = pool.borrowObject();
+ String obj = pool.borrowObject();
assertEquals("should be zero idle", 0, pool.getNumIdle());
assertEquals("should be one active", 1, pool.getNumActive());
pool.returnObject(obj);
@@ -1506,7 +1506,7 @@ public class TestGenericObjectPool exten
assertEquals("should be zero active", 0, pool.getNumActive());
}
- protected GenericObjectPool<Object> pool = null;
+ protected GenericObjectPool<String> pool = null;
private SimpleFactory factory = null;
@@ -1528,7 +1528,7 @@ public class TestGenericObjectPool exten
assertEquals("timeBetweenEvictionRunsMillis",expected.getTimeBetweenEvictionRunsMillis(),actual.getTimeBetweenEvictionRunsMillis());
}
- public static class SimpleFactory implements PooledObjectFactory<Object> {
+ public static class SimpleFactory implements PooledObjectFactory<String> {
public SimpleFactory() {
this(true);
}
@@ -1565,7 +1565,7 @@ public class TestGenericObjectPool exten
this.validateLatency = validateLatency;
}
@Override
- public PooledObject<Object> makeObject() {
+ public PooledObject<String> makeObject() {
final long waitLatency;
synchronized(this) {
activeCount++;
@@ -1582,10 +1582,10 @@ public class TestGenericObjectPool exten
synchronized(this) {
counter = makeCounter++;
}
- return new DefaultPooledObject<Object>(String.valueOf(counter));
+ return new DefaultPooledObject<String>(String.valueOf(counter));
}
@Override
- public void destroyObject(PooledObject<Object> obj) throws Exception {
+ public void destroyObject(PooledObject<String> obj) throws Exception {
final long waitLatency;
final boolean hurl;
synchronized(this) {
@@ -1603,7 +1603,7 @@ public class TestGenericObjectPool exten
}
}
@Override
- public boolean validateObject(PooledObject<Object> obj) {
+ public boolean validateObject(PooledObject<String> obj) {
final boolean validate;
final boolean evenTest;
final boolean oddTest;
@@ -1627,7 +1627,7 @@ public class TestGenericObjectPool exten
}
}
@Override
- public void activateObject(PooledObject<Object> obj) throws Exception {
+ public void activateObject(PooledObject<String> obj) throws Exception {
final boolean hurl;
final boolean evenTest;
final boolean oddTest;
@@ -1645,7 +1645,7 @@ public class TestGenericObjectPool exten
}
}
@Override
- public void passivateObject(PooledObject<Object> obj) throws Exception {
+ public void passivateObject(PooledObject<String> obj) throws Exception {
final boolean hurl;
synchronized(this) {
hurl = exceptionOnPassivate;
@@ -1770,7 +1770,7 @@ public class TestGenericObjectPool exten
// First borrow object will need to create a new object which will fail
// validation.
- Object obj = null;
+ String obj = null;
Exception ex = null;
factory.setValid(false);
try {
@@ -1805,7 +1805,7 @@ public class TestGenericObjectPool exten
* the provided pool returns it after a wait
*/
static class WaitingTestThread extends Thread {
- private final GenericObjectPool<Object> _pool;
+ private final GenericObjectPool<String> _pool;
private final long _pause;
private Throwable _thrown;
@@ -1815,7 +1815,7 @@ public class TestGenericObjectPool exten
private long ended;
private String objectId;
- public WaitingTestThread(GenericObjectPool<Object> pool, long pause) {
+ public WaitingTestThread(GenericObjectPool<String> pool, long pause) {
_pool = pool;
_pause = pause;
_thrown = null;
@@ -1825,7 +1825,7 @@ public class TestGenericObjectPool exten
public void run() {
try {
preborrow = System.currentTimeMillis();
- Object obj = _pool.borrowObject();
+ String obj = _pool.borrowObject();
objectId=obj.toString();
postborrow = System.currentTimeMillis();
Thread.sleep(_pause);
@@ -1917,7 +1917,7 @@ public class TestGenericObjectPool exten
Thread.sleep(50); // wait for validation to succeed
// Slow down validation and borrow an instance
factory.setValidateLatency(400);
- Object instance = pool.borrowObject();
+ String instance = pool.borrowObject();
// Now make sure that we have not leaked an instance
assertEquals(factory.getMakeCounter(), pool.getNumIdle() + 1);
pool.returnObject(instance);
Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java?rev=1538403&r1=1538402&r2=1538403&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftReferenceObjectPool.java Sun Nov 3 17:15:12 2013
@@ -28,8 +28,8 @@ import org.apache.commons.pool2.TestBase
public class TestSoftReferenceObjectPool extends TestBaseObjectPool {
@Override
- protected ObjectPool<Object> makeEmptyPool(int cap) {
- return new SoftReferenceObjectPool<Object>(new SimpleFactory());
+ protected ObjectPool<String> makeEmptyPool(int cap) {
+ return new SoftReferenceObjectPool<String>(new SimpleFactory());
}
@Override
@@ -53,15 +53,15 @@ public class TestSoftReferenceObjectPool
}
- private static class SimpleFactory extends BasePooledObjectFactory<Object> {
+ private static class SimpleFactory extends BasePooledObjectFactory<String> {
int counter = 0;
@Override
- public Object create() {
+ public String create() {
return String.valueOf(counter++);
}
@Override
- public PooledObject<Object> wrap(Object value) {
- return new DefaultPooledObject<Object>(value);
+ public PooledObject<String> wrap(String value) {
+ return new DefaultPooledObject<String>(value);
}
}
}