You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rw...@apache.org on 2002/05/01 08:33:02 UTC
cvs commit: jakarta-commons/pool/src/test/org/apache/commons/pool/impl TestGenericKeyedObjectPool.java TestStackKeyedObjectPool.java
rwaldhoff 02/04/30 23:33:02
Modified: pool/src/java/org/apache/commons/pool
BaseKeyedObjectPool.java BaseObjectPool.java
KeyedObjectPool.java
pool/src/java/org/apache/commons/pool/impl
GenericKeyedObjectPool.java
StackKeyedObjectPool.java
pool/src/test/org/apache/commons/pool/impl
TestGenericKeyedObjectPool.java
TestStackKeyedObjectPool.java
Log:
deprecate numIdle/numActive, use getXXX instead
Revision Changes Path
1.2 +28 -8 jakarta-commons/pool/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java
Index: BaseKeyedObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseKeyedObjectPool.java 1 May 2002 04:54:18 -0000 1.1
+++ BaseKeyedObjectPool.java 1 May 2002 06:33:01 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java,v 1.1 2002/05/01 04:54:18 rwaldhoff Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/01 04:54:18 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java,v 1.2 2002/05/01 06:33:01 rwaldhoff Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/01 06:33:01 $
*
* ====================================================================
*
@@ -67,37 +67,57 @@
* {@link UnsupportedOperationException}.
*
* @author Rodney Waldhoff
- * @version $Revision: 1.1 $ $Date: 2002/05/01 04:54:18 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/01 06:33:01 $
*/
public abstract class BaseKeyedObjectPool implements KeyedObjectPool {
public abstract Object borrowObject(Object key) throws Exception;
public abstract void returnObject(Object key, Object obj) throws Exception;
+ /** @deprecated Use {@link #getNumIdle} */
+ public final int numIdle(Object key) throws UnsupportedOperationException {
+ return getNumIdle(key);
+ }
+
/**
* Not supported in this base implementation.
*/
- public int numIdle(Object key) throws UnsupportedOperationException {
+ public int getNumIdle(Object key) throws UnsupportedOperationException {
throw new UnsupportedOperationException();
}
+ /** @deprecated Use {@link #getNumActive} */
+ public final int numActive(Object key) throws UnsupportedOperationException {
+ return getNumActive(key);
+ }
+
/**
* Not supported in this base implementation.
*/
- public int numActive(Object key) throws UnsupportedOperationException {
+ public int getNumActive(Object key) throws UnsupportedOperationException {
throw new UnsupportedOperationException();
}
+ /** @deprecated Use {@link #getNumIdle} */
+ public final int numIdle() throws UnsupportedOperationException {
+ return getNumIdle();
+ }
+
/**
* Not supported in this base implementation.
*/
- public int numIdle() throws UnsupportedOperationException {
+ public int getNumIdle() throws UnsupportedOperationException {
throw new UnsupportedOperationException();
}
+ /** @deprecated Use {@link #getNumActive} */
+ public final int numActive() throws UnsupportedOperationException {
+ return getNumActive();
+ }
+
/**
* Not supported in this base implementation.
*/
- public int numActive() throws UnsupportedOperationException {
+ public int getNumActive() throws UnsupportedOperationException {
throw new UnsupportedOperationException();
}
1.4 +8 -10 jakarta-commons/pool/src/java/org/apache/commons/pool/BaseObjectPool.java
Index: BaseObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseObjectPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseObjectPool.java 1 May 2002 06:02:34 -0000 1.3
+++ BaseObjectPool.java 1 May 2002 06:33:01 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseObjectPool.java,v 1.3 2002/05/01 06:02:34 rwaldhoff Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/01 06:02:34 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseObjectPool.java,v 1.4 2002/05/01 06:33:01 rwaldhoff Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/01 06:33:01 $
*
* ====================================================================
*
@@ -67,17 +67,16 @@
* {@link UnsupportedOperationException}.
*
* @author Rodney Waldhoff
- * @version $Revision: 1.3 $ $Date: 2002/05/01 06:02:34 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/01 06:33:01 $
*/
public abstract class BaseObjectPool implements ObjectPool {
public abstract Object borrowObject() throws Exception;
public abstract void returnObject(Object obj) throws Exception;
/**
- * Not supported in this base implementation.
- * @deprecated Use {@link getNumIdle} instead;
+ * @deprecated Use {@link #getNumIdle} instead.
*/
- public int numIdle() throws UnsupportedOperationException {
+ public final int numIdle() throws UnsupportedOperationException {
return getNumIdle();
}
@@ -89,10 +88,9 @@
}
/**
- * Not supported in this base implementation.
- * @deprecated Use {@link getNumActive} instead;
+ * @deprecated Use {@link #getNumActive} instead.
*/
- public int numActive() throws UnsupportedOperationException {
+ public final int numActive() throws UnsupportedOperationException {
return getNumActive();
}
1.5 +20 -8 jakarta-commons/pool/src/java/org/apache/commons/pool/KeyedObjectPool.java
Index: KeyedObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/KeyedObjectPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KeyedObjectPool.java 1 May 2002 04:54:52 -0000 1.4
+++ KeyedObjectPool.java 1 May 2002 06:33:01 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/KeyedObjectPool.java,v 1.4 2002/05/01 04:54:52 rwaldhoff Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/01 04:54:52 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/KeyedObjectPool.java,v 1.5 2002/05/01 06:33:01 rwaldhoff Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/01 06:33:01 $
*
* ====================================================================
*
@@ -64,14 +64,14 @@
/**
* A "keyed" pooling interface.
* <p>
- * A keyed pool pools instances of multiple types. Each
+ * A keyed pool pools instances of multiple types. Each
* type may be accessed using an arbitrary key.
* <p>
* Example of use:
* <table border="1" cellspacing="0" cellpadding="3" align="center" bgcolor="#FFFFFF"><tr><td><pre>
* Object obj = <font color="#0000CC">null</font>;
* Object key = <font color="#CC0000">"Key"</font>;
- *
+ *
* <font color="#0000CC">try</font> {
* obj = pool.borrowObject(key);
* <font color="#00CC00">//...use the object...</font>
@@ -87,12 +87,12 @@
* <p>
* {@link KeyedObjectPool} implementations <i>may</i> choose to store at most
* one instance per key value, or may choose to maintain a pool of instances
- * for each key (essentially creating a {@link java.util.Map Map} of
+ * for each key (essentially creating a {@link java.util.Map Map} of
* {@link ObjectPool pools}).
* </p>
*
* @author Rodney Waldhoff
- * @version $Revision: 1.4 $ $Date: 2002/05/01 04:54:52 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/01 06:33:01 $
*
* @see KeyedPoolableObjectFactory
* @see KeyedObjectPoolFactory
@@ -140,11 +140,14 @@
* @return the number of instances corresponding to the given <i>key</i> currently idle in my pool
* @throws UnsupportedOperationException when this implementation doesn't support the operation
*/
+ int getNumIdle(Object key) throws UnsupportedOperationException;
+
+ /** @deprecated use {@link #getNumIdle} instead. */
int numIdle(Object key) throws UnsupportedOperationException;
/**
* Returns the number of instances
- * currently borrowed from but not yet returned
+ * currently borrowed from but not yet returned
* to my pool corresponding to the
* given <i>key</i> (optional operation).
* Throws {@link UnsupportedOperationException}
@@ -154,6 +157,9 @@
* @return the number of instances corresponding to the given <i>key</i> currently borrowed in my pool
* @throws UnsupportedOperationException when this implementation doesn't support the operation
*/
+ int getNumActive(Object key) throws UnsupportedOperationException;
+
+ /** @deprecated use {@link #getNumActive} instead. */
int numActive(Object key) throws UnsupportedOperationException;
/**
@@ -165,6 +171,9 @@
* @return the total number of instances currently idle in my pool
* @throws UnsupportedOperationException when this implementation doesn't support the operation
*/
+ int getNumIdle() throws UnsupportedOperationException;
+
+ /** @deprecated use {@link #getNumIdle} instead. */
int numIdle() throws UnsupportedOperationException;
/**
@@ -177,6 +186,9 @@
* @return the total number of instances currently borrowed from my pool
* @throws UnsupportedOperationException when this implementation doesn't support the operation
*/
+ int getNumActive() throws UnsupportedOperationException;
+
+ /** @deprecated use {@link #getNumActive} instead. */
int numActive() throws UnsupportedOperationException;
/**
1.4 +9 -9 jakarta-commons/pool/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
Index: GenericKeyedObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GenericKeyedObjectPool.java 1 May 2002 04:54:18 -0000 1.3
+++ GenericKeyedObjectPool.java 1 May 2002 06:33:01 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java,v 1.3 2002/05/01 04:54:18 rwaldhoff Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/01 04:54:18 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java,v 1.4 2002/05/01 06:33:01 rwaldhoff Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/01 06:33:01 $
*
* ====================================================================
*
@@ -161,7 +161,7 @@
* </ul>
* @see GenericObjectPool
* @author Rodney Waldhoff
- * @version $Id: GenericKeyedObjectPool.java,v 1.3 2002/05/01 04:54:18 rwaldhoff Exp $
+ * @version $Id: GenericKeyedObjectPool.java,v 1.4 2002/05/01 06:33:01 rwaldhoff Exp $
*/
public class GenericKeyedObjectPool extends BaseKeyedObjectPool implements KeyedObjectPool {
@@ -838,15 +838,15 @@
notifyAll();
}
- public int numActive() {
+ public int getNumActive() {
return _totalActive;
}
- public int numIdle() {
+ public int getNumIdle() {
return _totalIdle;
}
- public synchronized int numActive(Object key) {
+ public synchronized int getNumActive(Object key) {
try {
return((Integer)(_activeMap.get(key))).intValue();
} catch(Exception e) {
@@ -854,7 +854,7 @@
}
}
- public synchronized int numIdle(Object key) {
+ public synchronized int getNumIdle(Object key) {
try {
return((CursorableLinkedList)(_poolMap.get(key))).size();
} catch(Exception e) {
@@ -912,7 +912,7 @@
}
synchronized public void setFactory(KeyedPoolableObjectFactory factory) throws IllegalStateException {
- if(0 < numActive()) {
+ if(0 < getNumActive()) {
throw new IllegalStateException("Objects are already active");
} else {
clear();
1.4 +9 -9 jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
Index: StackKeyedObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StackKeyedObjectPool.java 1 May 2002 04:54:18 -0000 1.3
+++ StackKeyedObjectPool.java 1 May 2002 06:33:01 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java,v 1.3 2002/05/01 04:54:18 rwaldhoff Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/01 04:54:18 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java,v 1.4 2002/05/01 06:33:01 rwaldhoff Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/01 06:33:01 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
* artificial limits.
*
* @author Rodney Waldhoff
- * @version $Id: StackKeyedObjectPool.java,v 1.3 2002/05/01 04:54:18 rwaldhoff Exp $
+ * @version $Id: StackKeyedObjectPool.java,v 1.4 2002/05/01 06:33:01 rwaldhoff Exp $
*/
public class StackKeyedObjectPool extends BaseKeyedObjectPool implements KeyedObjectPool {
/**
@@ -219,15 +219,15 @@
_activeCount.put(key,new Integer(old.intValue() - 1));
}
- public int numIdle() {
+ public int getNumIdle() {
return _totIdle;
}
- public int numActive() {
+ public int getNumActive() {
return _totActive;
}
- public int numActive(Object key) {
+ public int getNumActive(Object key) {
try {
return ((Integer)_activeCount.get(key)).intValue();
} catch(NoSuchElementException e) {
@@ -237,7 +237,7 @@
}
}
- public synchronized int numIdle(Object key) {
+ public synchronized int getNumIdle(Object key) {
try {
return((Stack)(_pools.get(key))).size();
} catch(Exception e) {
@@ -296,7 +296,7 @@
}
synchronized public void setFactory(KeyedPoolableObjectFactory factory) throws IllegalStateException {
- if(0 < numActive()) {
+ if(0 < getNumActive()) {
throw new IllegalStateException("Objects are already active");
} else {
clear();
1.4 +79 -79 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestGenericKeyedObjectPool.java 17 Mar 2002 14:55:21 -0000 1.3
+++ TestGenericKeyedObjectPool.java 1 May 2002 06:33:02 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java,v 1.3 2002/03/17 14:55:21 rwaldhoff Exp $
- * $Revision: 1.3 $
- * $Date: 2002/03/17 14:55:21 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java,v 1.4 2002/05/01 06:33:02 rwaldhoff Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/01 06:33:02 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
/**
* @author Rodney Waldhoff
- * @version $Id: TestGenericKeyedObjectPool.java,v 1.3 2002/03/17 14:55:21 rwaldhoff Exp $
+ * @version $Id: TestGenericKeyedObjectPool.java,v 1.4 2002/05/01 06:33:02 rwaldhoff Exp $
*/
public class TestGenericKeyedObjectPool extends TestCase {
public TestGenericKeyedObjectPool(String testName) {
@@ -128,85 +128,85 @@
}
public void testNumActiveNumIdle() throws Exception {
- assertEquals(0,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(0,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
Object obj0 = pool.borrowObject("");
- assertEquals(1,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(1,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
Object obj1 = pool.borrowObject("");
- assertEquals(2,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(2,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
pool.returnObject("",obj1);
- assertEquals(1,pool.numActive(""));
- assertEquals(1,pool.numIdle(""));
+ assertEquals(1,pool.getNumActive(""));
+ assertEquals(1,pool.getNumIdle(""));
pool.returnObject("",obj0);
- assertEquals(0,pool.numActive(""));
- assertEquals(2,pool.numIdle(""));
+ assertEquals(0,pool.getNumActive(""));
+ assertEquals(2,pool.getNumIdle(""));
}
public void testNumActiveNumIdle2() throws Exception {
- assertEquals(0,pool.numActive());
- assertEquals(0,pool.numIdle());
- assertEquals(0,pool.numActive("A"));
- assertEquals(0,pool.numIdle("A"));
- assertEquals(0,pool.numActive("B"));
- assertEquals(0,pool.numIdle("B"));
+ 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.numActive());
- assertEquals(0,pool.numIdle());
- assertEquals(1,pool.numActive("A"));
- assertEquals(0,pool.numIdle("A"));
- assertEquals(1,pool.numActive("B"));
- assertEquals(0,pool.numIdle("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.numActive());
- assertEquals(0,pool.numIdle());
- assertEquals(2,pool.numActive("A"));
- assertEquals(0,pool.numIdle("A"));
- assertEquals(2,pool.numActive("B"));
- assertEquals(0,pool.numIdle("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.numActive());
- assertEquals(2,pool.numIdle());
- assertEquals(1,pool.numActive("A"));
- assertEquals(1,pool.numIdle("A"));
- assertEquals(1,pool.numActive("B"));
- assertEquals(1,pool.numIdle("B"));
+ 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.numActive());
- assertEquals(4,pool.numIdle());
- assertEquals(0,pool.numActive("A"));
- assertEquals(2,pool.numIdle("A"));
- assertEquals(0,pool.numActive("B"));
- assertEquals(2,pool.numIdle("B"));
+ 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.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(0,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
Object obj0 = pool.borrowObject("");
Object obj1 = pool.borrowObject("");
- assertEquals(2,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(2,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
pool.returnObject("",obj1);
pool.returnObject("",obj0);
- assertEquals(0,pool.numActive(""));
- assertEquals(2,pool.numIdle(""));
+ assertEquals(0,pool.getNumActive(""));
+ assertEquals(2,pool.getNumIdle(""));
pool.clear("");
- assertEquals(0,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(0,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
Object obj2 = pool.borrowObject("");
assertEquals("2",obj2);
}
@@ -218,12 +218,12 @@
for(int i=0;i<100;i++) {
active[i] = pool.borrowObject("");
}
- assertEquals(100,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(100,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
for(int i=0;i<100;i++) {
pool.returnObject("",active[i]);
- assertEquals(99 - i,pool.numActive(""));
- assertEquals((i < 8 ? i+1 : 8),pool.numIdle(""));
+ assertEquals(99 - i,pool.getNumActive(""));
+ assertEquals((i < 8 ? i+1 : 8),pool.getNumIdle(""));
}
}
@@ -258,17 +258,17 @@
}
try { Thread.currentThread().sleep(2000L); } catch(Exception e) { }
- assertTrue("Should be less than 500 idle, found " + pool.numIdle(""),pool.numIdle("") < 500);
+ assertTrue("Should be less than 500 idle, found " + pool.getNumIdle(""),pool.getNumIdle("") < 500);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 400 idle, found " + pool.numIdle(""),pool.numIdle("") < 400);
+ assertTrue("Should be less than 400 idle, found " + pool.getNumIdle(""),pool.getNumIdle("") < 400);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 300 idle, found " + pool.numIdle(""),pool.numIdle("") < 300);
+ assertTrue("Should be less than 300 idle, found " + pool.getNumIdle(""),pool.getNumIdle("") < 300);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 200 idle, found " + pool.numIdle(""),pool.numIdle("") < 200);
+ assertTrue("Should be less than 200 idle, found " + pool.getNumIdle(""),pool.getNumIdle("") < 200);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 100 idle, found " + pool.numIdle(""),pool.numIdle("") < 100);
+ assertTrue("Should be less than 100 idle, found " + pool.getNumIdle(""),pool.getNumIdle("") < 100);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertEquals("Should be zero idle, found " + pool.numIdle(""),0,pool.numIdle(""));
+ assertEquals("Should be zero idle, found " + pool.getNumIdle(""),0,pool.getNumIdle(""));
for(int i=0;i<500;i++) {
active[i] = pool.borrowObject("");
@@ -278,17 +278,17 @@
}
try { Thread.currentThread().sleep(2000L); } catch(Exception e) { }
- assertTrue("Should be less than 500 idle, found " + pool.numIdle(""),pool.numIdle("") < 500);
+ assertTrue("Should be less than 500 idle, found " + pool.getNumIdle(""),pool.getNumIdle("") < 500);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 400 idle, found " + pool.numIdle(""),pool.numIdle("") < 400);
+ assertTrue("Should be less than 400 idle, found " + pool.getNumIdle(""),pool.getNumIdle("") < 400);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 300 idle, found " + pool.numIdle(""),pool.numIdle("") < 300);
+ assertTrue("Should be less than 300 idle, found " + pool.getNumIdle(""),pool.getNumIdle("") < 300);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 200 idle, found " + pool.numIdle(""),pool.numIdle("") < 200);
+ assertTrue("Should be less than 200 idle, found " + pool.getNumIdle(""),pool.getNumIdle("") < 200);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 100 idle, found " + pool.numIdle(""),pool.numIdle("") < 100);
+ assertTrue("Should be less than 100 idle, found " + pool.getNumIdle(""),pool.getNumIdle("") < 100);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertEquals("Should be zero idle, found " + pool.numIdle(""),0,pool.numIdle(""));
+ assertEquals("Should be zero idle, found " + pool.getNumIdle(""),0,pool.getNumIdle(""));
}
public void testEviction2() throws Exception {
@@ -310,27 +310,27 @@
}
try { Thread.currentThread().sleep(2000L); } catch(Exception e) { }
- assertTrue("Should be less than 1000 idle, found " + pool.numIdle(),pool.numIdle() < 1000);
+ assertTrue("Should be less than 1000 idle, found " + pool.getNumIdle(),pool.getNumIdle() < 1000);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 900 idle, found " + pool.numIdle(),pool.numIdle() < 900);
+ assertTrue("Should be less than 900 idle, found " + pool.getNumIdle(),pool.getNumIdle() < 900);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 800 idle, found " + pool.numIdle(),pool.numIdle() < 800);
+ assertTrue("Should be less than 800 idle, found " + pool.getNumIdle(),pool.getNumIdle() < 800);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 700 idle, found " + pool.numIdle(),pool.numIdle() < 700);
+ assertTrue("Should be less than 700 idle, found " + pool.getNumIdle(),pool.getNumIdle() < 700);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 600 idle, found " + pool.numIdle(),pool.numIdle() < 600);
+ assertTrue("Should be less than 600 idle, found " + pool.getNumIdle(),pool.getNumIdle() < 600);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 500 idle, found " + pool.numIdle(),pool.numIdle() < 500);
+ assertTrue("Should be less than 500 idle, found " + pool.getNumIdle(),pool.getNumIdle() < 500);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 400 idle, found " + pool.numIdle(),pool.numIdle() < 400);
+ assertTrue("Should be less than 400 idle, found " + pool.getNumIdle(),pool.getNumIdle() < 400);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 300 idle, found " + pool.numIdle(),pool.numIdle() < 300);
+ assertTrue("Should be less than 300 idle, found " + pool.getNumIdle(),pool.getNumIdle() < 300);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 200 idle, found " + pool.numIdle(),pool.numIdle() < 200);
+ assertTrue("Should be less than 200 idle, found " + pool.getNumIdle(),pool.getNumIdle() < 200);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertTrue("Should be less than 100 idle, found " + pool.numIdle(),pool.numIdle() < 100);
+ assertTrue("Should be less than 100 idle, found " + pool.getNumIdle(),pool.getNumIdle() < 100);
try { Thread.currentThread().sleep(600L); } catch(Exception e) { }
- assertEquals("Should be zero idle, found " + pool.numIdle(),0,pool.numIdle());
+ assertEquals("Should be zero idle, found " + pool.getNumIdle(),0,pool.getNumIdle());
}
public void testThreaded1() throws Exception {
1.3 +56 -56 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestStackKeyedObjectPool.java 17 Mar 2002 14:55:21 -0000 1.2
+++ TestStackKeyedObjectPool.java 1 May 2002 06:33:02 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java,v 1.2 2002/03/17 14:55:21 rwaldhoff Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/17 14:55:21 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java,v 1.3 2002/05/01 06:33:02 rwaldhoff Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/01 06:33:02 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
/**
* @author Rodney Waldhoff
- * @version $Id: TestStackKeyedObjectPool.java,v 1.2 2002/03/17 14:55:21 rwaldhoff Exp $
+ * @version $Id: TestStackKeyedObjectPool.java,v 1.3 2002/05/01 06:33:02 rwaldhoff Exp $
*/
public class TestStackKeyedObjectPool extends TestCase {
public TestStackKeyedObjectPool(String testName) {
@@ -128,85 +128,85 @@
}
public void testNumActiveNumIdle() throws Exception {
- assertEquals(0,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(0,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
Object obj0 = pool.borrowObject("");
- assertEquals(1,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(1,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
Object obj1 = pool.borrowObject("");
- assertEquals(2,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(2,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
pool.returnObject("",obj1);
- assertEquals(1,pool.numActive(""));
- assertEquals(1,pool.numIdle(""));
+ assertEquals(1,pool.getNumActive(""));
+ assertEquals(1,pool.getNumIdle(""));
pool.returnObject("",obj0);
- assertEquals(0,pool.numActive(""));
- assertEquals(2,pool.numIdle(""));
+ assertEquals(0,pool.getNumActive(""));
+ assertEquals(2,pool.getNumIdle(""));
}
public void testNumActiveNumIdle2() throws Exception {
- assertEquals(0,pool.numActive());
- assertEquals(0,pool.numIdle());
- assertEquals(0,pool.numActive("A"));
- assertEquals(0,pool.numIdle("A"));
- assertEquals(0,pool.numActive("B"));
- assertEquals(0,pool.numIdle("B"));
+ 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.numActive());
- assertEquals(0,pool.numIdle());
- assertEquals(1,pool.numActive("A"));
- assertEquals(0,pool.numIdle("A"));
- assertEquals(1,pool.numActive("B"));
- assertEquals(0,pool.numIdle("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.numActive());
- assertEquals(0,pool.numIdle());
- assertEquals(2,pool.numActive("A"));
- assertEquals(0,pool.numIdle("A"));
- assertEquals(2,pool.numActive("B"));
- assertEquals(0,pool.numIdle("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.numActive());
- assertEquals(2,pool.numIdle());
- assertEquals(1,pool.numActive("A"));
- assertEquals(1,pool.numIdle("A"));
- assertEquals(1,pool.numActive("B"));
- assertEquals(1,pool.numIdle("B"));
+ 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.numActive());
- assertEquals(4,pool.numIdle());
- assertEquals(0,pool.numActive("A"));
- assertEquals(2,pool.numIdle("A"));
- assertEquals(0,pool.numActive("B"));
- assertEquals(2,pool.numIdle("B"));
+ 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.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(0,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
Object obj0 = pool.borrowObject("");
Object obj1 = pool.borrowObject("");
- assertEquals(2,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(2,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
pool.returnObject("",obj1);
pool.returnObject("",obj0);
- assertEquals(0,pool.numActive(""));
- assertEquals(2,pool.numIdle(""));
+ assertEquals(0,pool.getNumActive(""));
+ assertEquals(2,pool.getNumIdle(""));
pool.clear("");
- assertEquals(0,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(0,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
Object obj2 = pool.borrowObject("");
assertEquals("2",obj2);
}
@@ -216,12 +216,12 @@
for(int i=0;i<100;i++) {
active[i] = pool.borrowObject("");
}
- assertEquals(100,pool.numActive(""));
- assertEquals(0,pool.numIdle(""));
+ assertEquals(100,pool.getNumActive(""));
+ assertEquals(0,pool.getNumIdle(""));
for(int i=0;i<100;i++) {
pool.returnObject("",active[i]);
- assertEquals(99 - i,pool.numActive(""));
- assertEquals((i < 8 ? i+1 : 8),pool.numIdle(""));
+ assertEquals(99 - i,pool.getNumActive(""));
+ assertEquals((i < 8 ? i+1 : 8),pool.getNumIdle(""));
}
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>