Author: simonetripodi
Date: Sun Apr 24 20:09:07 2011
New Revision: 1096370
URL: http://svn.apache.org/viewvc?rev=1096370&view=rev
Log:
added generics to TestBase(Keyed)PoolableObject(Factory) classes
Modified:
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedObjectPool.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseObjectPool.java
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
Modified:
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedObjectPool.java?rev=1096370&r1=1096369&r2=1096370&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedObjectPool.java
Sun Apr 24 20:09:07 2011
@@ -27,13 +27,14 @@ import org.apache.commons.pool2.KeyedPoo
* @version $Revision$ $Date$
*/
public class TestBaseKeyedObjectPool extends TestKeyedObjectPool {
- private KeyedObjectPool _pool = null;
+ private KeyedObjectPool<Object,Object> _pool = null;
public TestBaseKeyedObjectPool(final String testName) {
super(testName);
}
- protected KeyedObjectPool makeEmptyPool(KeyedPoolableObjectFactory
factory) {
+ @Override
+ protected KeyedObjectPool<Object,Object>
makeEmptyPool(KeyedPoolableObjectFactory<Object,Object> factory) {
if (this.getClass() != TestBaseKeyedObjectPool.class) {
fail("Subclasses of TestBaseKeyedObjectPool must reimplement this
method.");
}
@@ -47,7 +48,7 @@ public class TestBaseKeyedObjectPool ext
* throw {@link IllegalArgumentException}
* if such a pool cannot be created.
*/
- protected KeyedObjectPool makeEmptyPool(int mincapacity) {
+ protected KeyedObjectPool<Object,Object> makeEmptyPool(int mincapacity) {
if (this.getClass() != TestBaseKeyedObjectPool.class) {
fail("Subclasses of TestBaseKeyedObjectPool must reimplement this
method.");
}
@@ -86,12 +87,15 @@ public class TestBaseKeyedObjectPool ext
if (!getClass().equals(TestBaseKeyedObjectPool.class)) {
return; // skip redundant tests
}
- KeyedObjectPool pool = new BaseKeyedObjectPool() {
+ KeyedObjectPool<Object,Object> pool = new
BaseKeyedObjectPool<Object,Object>() {
+ @Override
public Object borrowObject(Object key) {
return null;
}
+ @Override
public void returnObject(Object key, Object obj) {
}
+ @Override
public void invalidateObject(Object key, Object obj) {
}
};
Modified:
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java?rev=1096370&r1=1096369&r2=1096370&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java
(original)
+++
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java
Sun Apr 24 20:09:07 2011
@@ -31,7 +31,8 @@ public class TestBaseKeyedPoolableObject
}
public void testDefaultMethods() throws Exception {
- KeyedPoolableObjectFactory factory = new
BaseKeyedPoolableObjectFactory() {
+ KeyedPoolableObjectFactory<Object,Object> factory = new
BaseKeyedPoolableObjectFactory<Object,Object>() {
+ @Override
public Object makeObject(Object key) throws Exception {
return null;
}
Modified:
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseObjectPool.java?rev=1096370&r1=1096369&r2=1096370&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseObjectPool.java
Sun Apr 24 20:09:07 2011
@@ -27,20 +27,21 @@ import org.apache.commons.pool2.Poolable
* @version $Revision$ $Date$
*/
public class TestBaseObjectPool extends TestObjectPool {
- private ObjectPool _pool = null;
+ private ObjectPool<Object> _pool = null;
public TestBaseObjectPool(String testName) {
super(testName);
}
- protected ObjectPool makeEmptyPool(int mincapacity) {
+ protected ObjectPool<Object> makeEmptyPool(int mincapacity) {
if (this.getClass() != TestBaseObjectPool.class) {
fail("Subclasses of TestBaseObjectPool must reimplement this
method.");
}
throw new UnsupportedOperationException("BaseObjectPool isn't a
complete implementation.");
}
- protected ObjectPool makeEmptyPool(final PoolableObjectFactory factory) {
+ @Override
+ protected ObjectPool<Object> makeEmptyPool(final
PoolableObjectFactory<Object> factory) {
if (this.getClass() != TestBaseObjectPool.class) {
fail("Subclasses of TestBaseObjectPool must reimplement this
method.");
}
@@ -73,12 +74,15 @@ public class TestBaseObjectPool extends
if (!getClass().equals(TestBaseObjectPool.class)) {
return; // skip redundant tests
}
- ObjectPool pool = new BaseObjectPool() {
+ ObjectPool<Object> pool = new BaseObjectPool<Object>() {
+ @Override
public Object borrowObject() {
return null;
}
+ @Override
public void returnObject(Object obj) {
}
+ @Override
public void invalidateObject(Object obj) {
}
};
@@ -109,12 +113,15 @@ public class TestBaseObjectPool extends
}
public void testClose() throws Exception {
- ObjectPool pool = new BaseObjectPool() {
+ ObjectPool<Object> pool = new BaseObjectPool<Object>() {
+ @Override
public Object borrowObject() {
return null;
}
+ @Override
public void returnObject(Object obj) {
}
+ @Override
public void invalidateObject(Object obj) {
}
};
Modified:
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBasePoolableObjectFactory.java?rev=1096370&r1=1096369&r2=1096370&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
(original)
+++
commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
Sun Apr 24 20:09:07 2011
@@ -31,7 +31,8 @@ public class TestBasePoolableObjectFacto
}
public void testDefaultMethods() throws Exception {
- PoolableObjectFactory factory = new BasePoolableObjectFactory() {
+ PoolableObjectFactory<Object> factory = new
BasePoolableObjectFactory<Object>() {
+ @Override
public Object makeObject() throws Exception {
return null;
}
