dirkv 2004/07/04 10:41:36
Modified: pool/src/test/org/apache/commons/pool/impl
TestGenericKeyedObjectPool.java
Log:
Bugzilla Bug 29863
- implement the "Keyed" version of the fix
Revision Changes Path
1.20 +25 -9
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TestGenericKeyedObjectPool.java 4 Jul 2004 17:31:23 -0000 1.19
+++ TestGenericKeyedObjectPool.java 4 Jul 2004 17:41:36 -0000 1.20
@@ -95,14 +95,6 @@
}
}
- public void testZeroMaxActive() throws Exception {
- pool.setMaxActive(0);
- pool.setWhenExhaustedAction(GenericKeyedObjectPool.WHEN_EXHAUSTED_FAIL);
- Object obj = pool.borrowObject("");
- assertEquals("0",obj);
- pool.returnObject("",obj);
- }
-
public void testNegativeMaxActive() throws Exception {
pool.setMaxActive(-1);
pool.setWhenExhaustedAction(GenericKeyedObjectPool.WHEN_EXHAUSTED_FAIL);
@@ -191,6 +183,18 @@
}
}
+ public void testMaxActiveZero() throws Exception {
+ pool.setMaxActive(0);
+ pool.setWhenExhaustedAction(GenericObjectPool.WHEN_EXHAUSTED_FAIL);
+
+ try {
+ pool.borrowObject("a");
+ fail("Expected NoSuchElementException");
+ } catch(NoSuchElementException e) {
+ // expected
+ }
+ }
+
public void testMaxTotal() throws Exception {
pool.setMaxActive(2);
pool.setMaxTotal(3);
@@ -219,6 +223,18 @@
assertNotNull(o4);
assertEquals(0, pool.getNumIdle());
assertEquals(0, pool.getNumIdle("b"));
+ }
+
+ public void testMaxTotalZero() throws Exception {
+ pool.setMaxTotal(0);
+ pool.setWhenExhaustedAction(GenericObjectPool.WHEN_EXHAUSTED_FAIL);
+
+ try {
+ pool.borrowObject("a");
+ fail("Expected NoSuchElementException");
+ } catch(NoSuchElementException e) {
+ // expected
+ }
}
public void testMaxTotalLRU() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
