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:02:35 UTC
cvs commit: jakarta-commons/pool/src/test/org/apache/commons/pool/impl TestGenericObjectPool.java TestSoftReferenceObjectPool.java TestStackObjectPool.java
rwaldhoff 02/04/30 23:02:35
Modified: pool/src/java/org/apache/commons/pool BaseObjectPool.java
ObjectPool.java
pool/src/java/org/apache/commons/pool/impl
GenericObjectPool.java SoftReferenceObjectPool.java
StackObjectPool.java
pool/src/test/org/apache/commons/pool/impl
TestGenericObjectPool.java
TestSoftReferenceObjectPool.java
TestStackObjectPool.java
Log:
replace ObjectPool.numIdle/numActive with getNumIdle and getNumActive (safe to do throughout the entire Jakarta tree as far as I can tell)
Revision Changes Path
1.3 +21 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseObjectPool.java 1 May 2002 04:54:52 -0000 1.2
+++ BaseObjectPool.java 1 May 2002 06:02:34 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseObjectPool.java,v 1.2 2002/05/01 04:54:52 rwaldhoff Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/01 04:54:52 $
+ * $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 $
*
* ====================================================================
*
@@ -65,9 +65,9 @@
* A simple base impementation of {@link ObjectPool}.
* All optional operations are implemented as throwing
* {@link UnsupportedOperationException}.
- *
+ *
* @author Rodney Waldhoff
- * @version $Revision: 1.2 $ $Date: 2002/05/01 04:54:52 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/01 06:02:34 $
*/
public abstract class BaseObjectPool implements ObjectPool {
public abstract Object borrowObject() throws Exception;
@@ -75,15 +75,31 @@
/**
* Not supported in this base implementation.
+ * @deprecated Use {@link getNumIdle} instead;
*/
public int numIdle() throws UnsupportedOperationException {
+ return getNumIdle();
+ }
+
+ /**
+ * Not supported in this base implementation.
+ */
+ public int getNumIdle() throws UnsupportedOperationException {
throw new UnsupportedOperationException();
}
/**
* Not supported in this base implementation.
+ * @deprecated Use {@link getNumActive} instead;
*/
public int numActive() throws UnsupportedOperationException {
+ return getNumActive();
+ }
+
+ /**
+ * Not supported in this base implementation.
+ */
+ public int getNumActive() throws UnsupportedOperationException {
throw new UnsupportedOperationException();
}
1.6 +7 -7 jakarta-commons/pool/src/java/org/apache/commons/pool/ObjectPool.java
Index: ObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/ObjectPool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ObjectPool.java 29 Apr 2002 12:11:30 -0000 1.5
+++ ObjectPool.java 1 May 2002 06:02:34 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/ObjectPool.java,v 1.5 2002/04/29 12:11:30 rwaldhoff Exp $
- * $Revision: 1.5 $
- * $Date: 2002/04/29 12:11:30 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/ObjectPool.java,v 1.6 2002/05/01 06:02:34 rwaldhoff Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/01 06:02:34 $
*
* ====================================================================
*
@@ -82,10 +82,10 @@
* pool.returnObject(obj);
* }
* }</pre></td></tr></table>
- * See {@link org.apache.commons.pool.impl.BaseObjectPool BaseObjectPool} for a simple base implementation.
+ * See {@link org.apache.commons.pool.BaseObjectPool BaseObjectPool} for a simple base implementation.
*
* @author Rodney Waldhoff
- * @version $Revision: 1.5 $ $Date: 2002/04/29 12:11:30 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/01 06:02:34 $
*
*/
public interface ObjectPool {
@@ -125,7 +125,7 @@
* @return the number of instances currently idle in my pool
* @throws UnsupportedOperationException if this implementation does not support the operation
*/
- int numIdle() throws UnsupportedOperationException;
+ int getNumIdle() throws UnsupportedOperationException;
/**
* Return the number of instances
@@ -135,7 +135,7 @@
* @return the number of instances currently borrowed in my pool
* @throws UnsupportedOperationException if this implementation does not support the operation
*/
- int numActive() throws UnsupportedOperationException;
+ int getNumActive() throws UnsupportedOperationException;
/**
* Clears any objects sitting idle in the pool, releasing any
1.5 +9 -9 jakarta-commons/pool/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
Index: GenericObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/GenericObjectPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GenericObjectPool.java 29 Apr 2002 12:11:30 -0000 1.4
+++ GenericObjectPool.java 1 May 2002 06:02:34 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/GenericObjectPool.java,v 1.4 2002/04/29 12:11:30 rwaldhoff Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/29 12:11:30 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/GenericObjectPool.java,v 1.5 2002/05/01 06:02:34 rwaldhoff Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/01 06:02:34 $
*
* ====================================================================
*
@@ -159,7 +159,7 @@
* </ul>
* @see GenericKeyedObjectPool
* @author Rodney Waldhoff
- * @version $Revision: 1.4 $ $Date: 2002/04/29 12:11:30 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/01 06:02:34 $
*/
public class GenericObjectPool extends BaseObjectPool implements ObjectPool {
@@ -784,11 +784,11 @@
notifyAll(); // num sleeping has changed
}
- public int numActive() {
+ public int getNumActive() {
return _numActive;
}
- public int numIdle() {
+ public int getNumIdle() {
return _pool.size();
}
@@ -836,7 +836,7 @@
}
synchronized public void setFactory(PoolableObjectFactory factory) throws IllegalStateException {
- if(0 < numActive()) {
+ if(0 < getNumActive()) {
throw new IllegalStateException("Objects are already active");
} else {
clear();
@@ -848,8 +848,8 @@
synchronized String debugInfo() {
StringBuffer buf = new StringBuffer();
- buf.append("Active: ").append(numActive()).append("\n");
- buf.append("Idle: ").append(numIdle()).append("\n");
+ buf.append("Active: ").append(getNumActive()).append("\n");
+ buf.append("Idle: ").append(getNumIdle()).append("\n");
buf.append("Idle Objects:\n");
Iterator it = _pool.iterator();
long time = System.currentTimeMillis();
1.5 +7 -7 jakarta-commons/pool/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java
Index: SoftReferenceObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SoftReferenceObjectPool.java 29 Apr 2002 12:11:30 -0000 1.4
+++ SoftReferenceObjectPool.java 1 May 2002 06:02:34 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java,v 1.4 2002/04/29 12:11:30 rwaldhoff Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/29 12:11:30 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java,v 1.5 2002/05/01 06:02:34 rwaldhoff Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/01 06:02:34 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* {@link ObjectPool}.
*
* @author Rodney Waldhoff
- * @version $Revision: 1.4 $ $Date: 2002/04/29 12:11:30 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/01 06:02:34 $
*/
public class SoftReferenceObjectPool extends BaseObjectPool implements ObjectPool {
public SoftReferenceObjectPool() {
@@ -153,11 +153,11 @@
}
/** Returns an approximation not less than the of the number of idle instances in the pool. */
- public int numIdle() {
+ public int getNumIdle() {
return _pool.size();
}
- public int numActive() {
+ public int getNumActive() {
return _numActive;
}
@@ -185,7 +185,7 @@
}
synchronized public void setFactory(PoolableObjectFactory factory) throws IllegalStateException {
- if(0 < numActive()) {
+ if(0 < getNumActive()) {
throw new IllegalStateException("Objects are already active");
} else {
clear();
1.5 +7 -7 jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackObjectPool.java
Index: StackObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackObjectPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StackObjectPool.java 29 Apr 2002 12:11:30 -0000 1.4
+++ StackObjectPool.java 1 May 2002 06:02:34 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackObjectPool.java,v 1.4 2002/04/29 12:11:30 rwaldhoff Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/29 12:11:30 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/impl/StackObjectPool.java,v 1.5 2002/05/01 06:02:34 rwaldhoff Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/01 06:02:34 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* artificial limits.
*
* @author Rodney Waldhoff
- * @version $Revision: 1.4 $ $Date: 2002/04/29 12:11:30 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/01 06:02:34 $
*/
public class StackObjectPool extends BaseObjectPool implements ObjectPool {
/**
@@ -205,11 +205,11 @@
}
}
- public int numIdle() {
+ public int getNumIdle() {
return _pool.size();
}
- public int numActive() {
+ public int getNumActive() {
return _numActive;
}
@@ -234,7 +234,7 @@
}
synchronized public void setFactory(PoolableObjectFactory factory) throws IllegalStateException {
- if(0 < numActive()) {
+ if(0 < getNumActive()) {
throw new IllegalStateException("Objects are already active");
} else {
clear();
1.4 +38 -38 jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java
Index: TestGenericObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestGenericObjectPool.java 17 Mar 2002 14:55:21 -0000 1.3
+++ TestGenericObjectPool.java 1 May 2002 06:02:35 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.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/TestGenericObjectPool.java,v 1.4 2002/05/01 06:02:35 rwaldhoff Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/01 06:02:35 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
/**
* @author Rodney Waldhoff
- * @version $Id: TestGenericObjectPool.java,v 1.3 2002/03/17 14:55:21 rwaldhoff Exp $
+ * @version $Id: TestGenericObjectPool.java,v 1.4 2002/05/01 06:02:35 rwaldhoff Exp $
*/
public class TestGenericObjectPool extends TestCase {
public TestGenericObjectPool(String testName) {
@@ -128,36 +128,36 @@
}
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 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);
}
@@ -169,12 +169,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());
}
}
@@ -209,17 +209,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();
@@ -229,17 +229,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());
}
1.2 +22 -22 jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java
Index: TestSoftReferenceObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestSoftReferenceObjectPool.java 19 Mar 2002 17:27:54 -0000 1.1
+++ TestSoftReferenceObjectPool.java 1 May 2002 06:02:35 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java,v 1.1 2002/03/19 17:27:54 rwaldhoff Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/19 17:27:54 $
+ * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java,v 1.2 2002/05/01 06:02:35 rwaldhoff Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/01 06:02:35 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
/**
* @author Rodney Waldhoff
- * @version $Revision: 1.1 $ $Date: 2002/03/19 17:27:54 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/01 06:02:35 $
*/
public class TestSoftReferenceObjectPool extends TestCase {
public TestSoftReferenceObjectPool(String testName) {
@@ -132,36 +132,36 @@
}
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 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);
}
1.3 +26 -26 jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestStackObjectPool.java
Index: TestStackObjectPool.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestStackObjectPool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestStackObjectPool.java 17 Mar 2002 14:55:21 -0000 1.2
+++ TestStackObjectPool.java 1 May 2002 06:02:35 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/pool/src/test/org/apache/commons/pool/impl/TestStackObjectPool.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/TestStackObjectPool.java,v 1.3 2002/05/01 06:02:35 rwaldhoff Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/01 06:02:35 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
/**
* @author Rodney Waldhoff
- * @version $Id: TestStackObjectPool.java,v 1.2 2002/03/17 14:55:21 rwaldhoff Exp $
+ * @version $Id: TestStackObjectPool.java,v 1.3 2002/05/01 06:02:35 rwaldhoff Exp $
*/
public class TestStackObjectPool extends TestCase {
public TestStackObjectPool(String testName) {
@@ -128,36 +128,36 @@
}
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 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);
}
@@ -167,12 +167,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>