rwaldhoff 2002/10/31 07:04:24
Modified: pool/src/test/org/apache/commons/pool/impl
TestGenericKeyedObjectPool.java
TestStackKeyedObjectPool.java
Added: pool/src/test/org/apache/commons/pool
TestKeyedObjectPool.java
Log:
refactor test classes a bit
Revision Changes Path
1.1
jakarta-commons/pool/src/test/org/apache/commons/pool/TestKeyedObjectPool.java
Index: TestKeyedObjectPool.java
===================================================================
/*
* $Id: TestKeyedObjectPool.java,v 1.1 2002/10/31 15:04:24 rwaldhoff Exp $
* $Revision: 1.1 $
* $Date: 2002/10/31 15:04:24 $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.commons.pool;
import junit.framework.*;
/**
* Abstract {@link TestCase} for {@link ObjectPool} implementations.
* @author Rodney Waldhoff
* @version $Revision: 1.1 $ $Date: 2002/10/31 15:04:24 $
*/
public abstract class TestKeyedObjectPool extends TestCase {
public TestKeyedObjectPool(String testName) {
super(testName);
}
/**
* Create an {@link KeyedObjectPool} instance
* that can contain at least <i>mincapacity</i>
* idle and active objects, or
* throw {@link IllegalArgumentException}
* if such a pool cannot be created.
*/
protected abstract KeyedObjectPool makeEmptyPool(int mincapacity);
/**
* Return what we expect to be the n<sup>th</sup>
* object (zero indexed) created by the pool
* for the given key.
*/
protected abstract Object getNthObject(Object key, int n);
protected abstract Object makeKey(int n);
public void setUp() throws Exception {
}
public void tearDown() throws Exception {
_pool = null;
}
public void testBorrow() throws Exception {
try {
_pool = makeEmptyPool(3);
} catch(IllegalArgumentException e) {
return; // skip this test if unsupported
}
Object keya = makeKey(0);
Object keyb = makeKey(1);
assertEquals("1",getNthObject(keya,0),_pool.borrowObject(keya));
assertEquals("2",getNthObject(keyb,0),_pool.borrowObject(keyb));
assertEquals("3",getNthObject(keyb,1),_pool.borrowObject(keyb));
assertEquals("4",getNthObject(keya,1),_pool.borrowObject(keya));
assertEquals("5",getNthObject(keyb,2),_pool.borrowObject(keyb));
assertEquals("6",getNthObject(keya,2),_pool.borrowObject(keya));
}
public void testBorrowReturn() throws Exception {
try {
_pool = makeEmptyPool(3);
} catch(IllegalArgumentException e) {
return; // skip this test if unsupported
}
Object keya = makeKey(0);
Object obj0 = _pool.borrowObject(keya);
assertEquals(getNthObject(keya,0),obj0);
Object obj1 = _pool.borrowObject(keya);
assertEquals(getNthObject(keya,1),obj1);
Object obj2 = _pool.borrowObject(keya);
assertEquals(getNthObject(keya,2),obj2);
_pool.returnObject(keya,obj2);
obj2 = _pool.borrowObject(keya);
assertEquals(getNthObject(keya,2),obj2);
_pool.returnObject(keya,obj1);
obj1 = _pool.borrowObject(keya);
assertEquals(getNthObject(keya,1),obj1);
_pool.returnObject(keya,obj0);
_pool.returnObject(keya,obj2);
obj2 = _pool.borrowObject(keya);
assertEquals(getNthObject(keya,2),obj2);
obj0 = _pool.borrowObject(keya);
assertEquals(getNthObject(keya,0),obj0);
}
public void testNumActiveNumIdle() throws Exception {
try {
_pool = makeEmptyPool(3);
} catch(IllegalArgumentException e) {
return; // skip this test if unsupported
}
Object keya = makeKey(0);
assertEquals(0,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
Object obj0 = _pool.borrowObject(keya);
assertEquals(1,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
Object obj1 = _pool.borrowObject(keya);
assertEquals(2,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
_pool.returnObject(keya,obj1);
assertEquals(1,_pool.getNumActive(keya));
assertEquals(1,_pool.getNumIdle(keya));
_pool.returnObject(keya,obj0);
assertEquals(0,_pool.getNumActive(keya));
assertEquals(2,_pool.getNumIdle(keya));
}
public void testNumActiveNumIdle2() throws Exception {
try {
_pool = makeEmptyPool(6);
} catch(IllegalArgumentException e) {
return; // skip this test if unsupported
}
Object keya = makeKey(0);
Object keyb = makeKey(1);
assertEquals(0,_pool.getNumActive());
assertEquals(0,_pool.getNumIdle());
assertEquals(0,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
assertEquals(0,_pool.getNumActive(keyb));
assertEquals(0,_pool.getNumIdle(keyb));
Object objA0 = _pool.borrowObject(keya);
Object objB0 = _pool.borrowObject(keyb);
assertEquals(2,_pool.getNumActive());
assertEquals(0,_pool.getNumIdle());
assertEquals(1,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
assertEquals(1,_pool.getNumActive(keyb));
assertEquals(0,_pool.getNumIdle(keyb));
Object objA1 = _pool.borrowObject(keya);
Object objB1 = _pool.borrowObject(keyb);
assertEquals(4,_pool.getNumActive());
assertEquals(0,_pool.getNumIdle());
assertEquals(2,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
assertEquals(2,_pool.getNumActive(keyb));
assertEquals(0,_pool.getNumIdle(keyb));
_pool.returnObject(keya,objA0);
_pool.returnObject(keyb,objB0);
assertEquals(2,_pool.getNumActive());
assertEquals(2,_pool.getNumIdle());
assertEquals(1,_pool.getNumActive(keya));
assertEquals(1,_pool.getNumIdle(keya));
assertEquals(1,_pool.getNumActive(keyb));
assertEquals(1,_pool.getNumIdle(keyb));
_pool.returnObject(keya,objA1);
_pool.returnObject(keyb,objB1);
assertEquals(0,_pool.getNumActive());
assertEquals(4,_pool.getNumIdle());
assertEquals(0,_pool.getNumActive(keya));
assertEquals(2,_pool.getNumIdle(keya));
assertEquals(0,_pool.getNumActive(keyb));
assertEquals(2,_pool.getNumIdle(keyb));
}
public void testClear() throws Exception {
try {
_pool = makeEmptyPool(3);
} catch(IllegalArgumentException e) {
return; // skip this test if unsupported
}
Object keya = makeKey(0);
assertEquals(0,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
Object obj0 = _pool.borrowObject(keya);
Object obj1 = _pool.borrowObject(keya);
assertEquals(2,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
_pool.returnObject(keya,obj1);
_pool.returnObject(keya,obj0);
assertEquals(0,_pool.getNumActive(keya));
assertEquals(2,_pool.getNumIdle(keya));
_pool.clear(keya);
assertEquals(0,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
Object obj2 = _pool.borrowObject(keya);
assertEquals(getNthObject(keya,2),obj2);
}
public void testInvalidateObject() throws Exception {
try {
_pool = makeEmptyPool(3);
} catch(IllegalArgumentException e) {
return; // skip this test if unsupported
}
Object keya = makeKey(0);
assertEquals(0,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
Object obj0 = _pool.borrowObject(keya);
Object obj1 = _pool.borrowObject(keya);
assertEquals(2,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
_pool.invalidateObject(keya,obj0);
assertEquals(1,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
_pool.invalidateObject(keya,obj1);
assertEquals(0,_pool.getNumActive(keya));
assertEquals(0,_pool.getNumIdle(keya));
}
private KeyedObjectPool _pool = null;
}
1.8 +50 -92
jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java
Index: TestGenericKeyedObjectPool.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestGenericKeyedObjectPool.java 30 Oct 2002 22:54:42 -0000 1.7
+++ TestGenericKeyedObjectPool.java 31 Oct 2002 15:04:24 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * $Header$
+ * $Id$
* $Revision$
* $Date$
*
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,14 +61,20 @@
package org.apache.commons.pool.impl;
-import junit.framework.*;
-import org.apache.commons.pool.*;
+import java.util.HashMap;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.commons.pool.KeyedObjectPool;
+import org.apache.commons.pool.KeyedPoolableObjectFactory;
+import org.apache.commons.pool.TestKeyedObjectPool;
/**
* @author Rodney Waldhoff
- * @version $Id$
+ * @version $Revision$ $Date$
*/
-public class TestGenericKeyedObjectPool extends TestCase {
+public class TestGenericKeyedObjectPool extends TestKeyedObjectPool {
public TestGenericKeyedObjectPool(String testName) {
super(testName);
}
@@ -77,14 +83,42 @@
return new TestSuite(TestGenericKeyedObjectPool.class);
}
- public static void main(String args[]) {
- String[] testCaseName = { TestGenericKeyedObjectPool.class.getName() };
- junit.textui.TestRunner.main(testCaseName);
+ protected KeyedObjectPool makeEmptyPool(int mincapacity) {
+ GenericKeyedObjectPool pool = new GenericKeyedObjectPool(
+ new KeyedPoolableObjectFactory() {
+ HashMap map = new HashMap();
+ public Object makeObject(Object key) {
+ int counter = 0;
+ Integer Counter = (Integer)(map.get(key));
+ if(null != Counter) {
+ counter = Counter.intValue();
+ }
+ map.put(key,new Integer(counter + 1));
+ return String.valueOf(key) + String.valueOf(counter);
+ }
+ public void destroyObject(Object key, Object obj) { }
+ public boolean validateObject(Object key, Object obj) { return
true; }
+ public void activateObject(Object key, Object obj) { }
+ public void passivateObject(Object key, Object obj) { }
+ }
+ );
+ pool.setMaxActive(mincapacity);
+ pool.setMaxIdle(mincapacity);
+ return pool;
+ }
+
+ protected Object getNthObject(Object key, int n) {
+ return String.valueOf(key) + String.valueOf(n);
+ }
+
+ protected Object makeKey(int n) {
+ return String.valueOf(n);
}
private GenericKeyedObjectPool pool = null;
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
pool = new GenericKeyedObjectPool(
new KeyedPoolableObjectFactory() {
int counter = 0;
@@ -96,6 +130,10 @@
}
);
}
+
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
public void testZeroMaxActive() throws Exception {
pool.setMaxActive(0);
@@ -113,53 +151,6 @@
pool.returnObject("",obj);
}
- public void testBorrow() throws Exception {
- Object obj0 = pool.borrowObject("");
- assertEquals("0",obj0);
- Object obj1 = pool.borrowObject("");
- assertEquals("1",obj1);
- Object obj2 = pool.borrowObject("");
- assertEquals("2",obj2);
- }
-
- public void testBorrowReturn() throws Exception {
- Object obj0 = pool.borrowObject("");
- assertEquals("0",obj0);
- Object obj1 = pool.borrowObject("");
- assertEquals("1",obj1);
- Object obj2 = pool.borrowObject("");
- assertEquals("2",obj2);
- pool.returnObject("",obj2);
- obj2 = pool.borrowObject("");
- assertEquals("2",obj2);
- pool.returnObject("",obj1);
- obj1 = pool.borrowObject("");
- assertEquals("1",obj1);
- pool.returnObject("",obj0);
- pool.returnObject("",obj2);
- obj2 = pool.borrowObject("");
- assertEquals("2",obj2);
- obj0 = pool.borrowObject("");
- assertEquals("0",obj0);
- }
-
- public void testNumActiveNumIdle() throws Exception {
- assertEquals(0,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- Object obj0 = pool.borrowObject("");
- assertEquals(1,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- Object obj1 = pool.borrowObject("");
- assertEquals(2,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- pool.returnObject("",obj1);
- assertEquals(1,pool.getNumActive(""));
- assertEquals(1,pool.getNumIdle(""));
- pool.returnObject("",obj0);
- assertEquals(0,pool.getNumActive(""));
- assertEquals(2,pool.getNumIdle(""));
- }
-
public void testNumActiveNumIdle2() throws Exception {
assertEquals(0,pool.getNumActive());
assertEquals(0,pool.getNumIdle());
@@ -207,39 +198,6 @@
assertEquals(2,pool.getNumIdle("A"));
assertEquals(0,pool.getNumActive("B"));
assertEquals(2,pool.getNumIdle("B"));
- }
-
- public void testClear() throws Exception {
- assertEquals(0,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- Object obj0 = pool.borrowObject("");
- Object obj1 = pool.borrowObject("");
- assertEquals(2,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- pool.returnObject("",obj1);
- pool.returnObject("",obj0);
- assertEquals(0,pool.getNumActive(""));
- assertEquals(2,pool.getNumIdle(""));
- pool.clear("");
- assertEquals(0,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- Object obj2 = pool.borrowObject("");
- assertEquals("2",obj2);
- }
-
- public void testInvalidateObject() throws Exception {
- assertEquals(0,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- Object obj0 = pool.borrowObject("");
- Object obj1 = pool.borrowObject("");
- assertEquals(2,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- pool.invalidateObject("",obj0);
- assertEquals(1,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- pool.invalidateObject("",obj1);
- assertEquals(0,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
}
public void testMaxIdle() throws Exception {
1.6 +46 -138
jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java
Index: TestStackKeyedObjectPool.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestStackKeyedObjectPool.java 30 Oct 2002 22:54:42 -0000 1.5
+++ TestStackKeyedObjectPool.java 31 Oct 2002 15:04:24 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * $Header$
+ * $Id$
* $Revision$
* $Date$
*
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,12 +61,18 @@
package org.apache.commons.pool.impl;
-import junit.framework.*;
-import org.apache.commons.pool.*;
+import java.util.HashMap;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.commons.pool.KeyedObjectPool;
+import org.apache.commons.pool.KeyedPoolableObjectFactory;
/**
* @author Rodney Waldhoff
- * @version $Id$
+ * @version $Revision$ $Date$
*/
public class TestStackKeyedObjectPool extends TestCase {
public TestStackKeyedObjectPool(String testName) {
@@ -77,14 +83,39 @@
return new TestSuite(TestStackKeyedObjectPool.class);
}
- public static void main(String args[]) {
- String[] testCaseName = { TestStackKeyedObjectPool.class.getName() };
- junit.textui.TestRunner.main(testCaseName);
+ protected KeyedObjectPool makeEmptyPool(int mincapacity) {
+ StackKeyedObjectPool pool = new StackKeyedObjectPool(
+ new KeyedPoolableObjectFactory() {
+ HashMap map = new HashMap();
+ public Object makeObject(Object key) {
+ int counter = 0;
+ Integer Counter = (Integer)(map.get(key));
+ if(null != Counter) {
+ counter = Counter.intValue();
+ }
+ map.put(key,new Integer(counter + 1));
+ return String.valueOf(key) + String.valueOf(counter);
+ }
+ public void destroyObject(Object key, Object obj) { }
+ public boolean validateObject(Object key, Object obj) { return
true; }
+ public void activateObject(Object key, Object obj) { }
+ public void passivateObject(Object key, Object obj) { }
+ }, mincapacity);
+ return pool;
+ }
+
+ protected Object getNthObject(Object key, int n) {
+ return String.valueOf(key) + String.valueOf(n);
+ }
+
+ protected Object makeKey(int n) {
+ return String.valueOf(n);
}
private StackKeyedObjectPool pool = null;
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
pool = new StackKeyedObjectPool(
new KeyedPoolableObjectFactory() {
int counter = 0;
@@ -97,133 +128,10 @@
);
}
- public void testBorrow() throws Exception {
- Object obj0 = pool.borrowObject("");
- assertEquals("0",obj0);
- Object obj1 = pool.borrowObject("");
- assertEquals("1",obj1);
- Object obj2 = pool.borrowObject("");
- assertEquals("2",obj2);
- }
-
- public void testBorrowReturn() throws Exception {
- Object obj0 = pool.borrowObject("");
- assertEquals("0",obj0);
- Object obj1 = pool.borrowObject("");
- assertEquals("1",obj1);
- Object obj2 = pool.borrowObject("");
- assertEquals("2",obj2);
- pool.returnObject("",obj2);
- obj2 = pool.borrowObject("");
- assertEquals("2",obj2);
- pool.returnObject("",obj1);
- obj1 = pool.borrowObject("");
- assertEquals("1",obj1);
- pool.returnObject("",obj0);
- pool.returnObject("",obj2);
- obj2 = pool.borrowObject("");
- assertEquals("2",obj2);
- obj0 = pool.borrowObject("");
- assertEquals("0",obj0);
- }
-
- public void testNumActiveNumIdle() throws Exception {
- assertEquals(0,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- Object obj0 = pool.borrowObject("");
- assertEquals(1,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- Object obj1 = pool.borrowObject("");
- assertEquals(2,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- pool.returnObject("",obj1);
- assertEquals(1,pool.getNumActive(""));
- assertEquals(1,pool.getNumIdle(""));
- pool.returnObject("",obj0);
- assertEquals(0,pool.getNumActive(""));
- assertEquals(2,pool.getNumIdle(""));
- }
-
- public void testNumActiveNumIdle2() throws Exception {
- assertEquals(0,pool.getNumActive());
- assertEquals(0,pool.getNumIdle());
- assertEquals(0,pool.getNumActive("A"));
- assertEquals(0,pool.getNumIdle("A"));
- assertEquals(0,pool.getNumActive("B"));
- assertEquals(0,pool.getNumIdle("B"));
-
- Object objA0 = pool.borrowObject("A");
- Object objB0 = pool.borrowObject("B");
-
- assertEquals(2,pool.getNumActive());
- assertEquals(0,pool.getNumIdle());
- assertEquals(1,pool.getNumActive("A"));
- assertEquals(0,pool.getNumIdle("A"));
- assertEquals(1,pool.getNumActive("B"));
- assertEquals(0,pool.getNumIdle("B"));
-
- Object objA1 = pool.borrowObject("A");
- Object objB1 = pool.borrowObject("B");
-
- assertEquals(4,pool.getNumActive());
- assertEquals(0,pool.getNumIdle());
- assertEquals(2,pool.getNumActive("A"));
- assertEquals(0,pool.getNumIdle("A"));
- assertEquals(2,pool.getNumActive("B"));
- assertEquals(0,pool.getNumIdle("B"));
-
- pool.returnObject("A",objA0);
- pool.returnObject("B",objB0);
-
- assertEquals(2,pool.getNumActive());
- assertEquals(2,pool.getNumIdle());
- assertEquals(1,pool.getNumActive("A"));
- assertEquals(1,pool.getNumIdle("A"));
- assertEquals(1,pool.getNumActive("B"));
- assertEquals(1,pool.getNumIdle("B"));
-
- pool.returnObject("A",objA1);
- pool.returnObject("B",objB1);
-
- assertEquals(0,pool.getNumActive());
- assertEquals(4,pool.getNumIdle());
- assertEquals(0,pool.getNumActive("A"));
- assertEquals(2,pool.getNumIdle("A"));
- assertEquals(0,pool.getNumActive("B"));
- assertEquals(2,pool.getNumIdle("B"));
- }
-
- public void testClear() throws Exception {
- assertEquals(0,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- Object obj0 = pool.borrowObject("");
- Object obj1 = pool.borrowObject("");
- assertEquals(2,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- pool.returnObject("",obj1);
- pool.returnObject("",obj0);
- assertEquals(0,pool.getNumActive(""));
- assertEquals(2,pool.getNumIdle(""));
- pool.clear("");
- assertEquals(0,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- Object obj2 = pool.borrowObject("");
- assertEquals("2",obj2);
- }
-
- public void testInvalidateObject() throws Exception {
- assertEquals(0,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- Object obj0 = pool.borrowObject("");
- Object obj1 = pool.borrowObject("");
- assertEquals(2,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- pool.invalidateObject("",obj0);
- assertEquals(1,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
- pool.invalidateObject("",obj1);
- assertEquals(0,pool.getNumActive(""));
- assertEquals(0,pool.getNumIdle(""));
+
+ public void tearDown() throws Exception {
+ super.tearDown();
+ pool = null;
}
public void testCloseBug() throws Exception {
--
To unsubscribe, e-mail: <mailto:commons-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@;jakarta.apache.org>
