Fixed errors in comments; reduced execution time of POOL-259 tests.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/pool/trunk@1648001 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
index 7782cf5..a971612 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -1575,19 +1575,20 @@
public void testClientWaitStats() throws Exception {
SimpleFactory<String> factory = new SimpleFactory<String>();
// Give makeObject a little latency
- factory.setMakeLatency(1000);
+ factory.setMakeLatency(200);
final GenericKeyedObjectPool<String, String> pool = new GenericKeyedObjectPool<String, String>(
factory, new GenericKeyedObjectPoolConfig());
String s = pool.borrowObject("one");
- // First borrow waits on create, so wait time should be at least 100 ms
+ // First borrow waits on create, so wait time should be at least 200 ms
+ // Allow 100ms error in clock times
Assert.assertTrue(pool.getMaxBorrowWaitTimeMillis() >= 100);
Assert.assertTrue(pool.getMeanBorrowWaitTimeMillis() >= 100);
pool.returnObject("one", s);
pool.borrowObject("one");
- // Second borrow does not have to wait on create, average should be about 50
- Assert.assertTrue(pool.getMaxBorrowWaitTimeMillis() > 500);
- Assert.assertTrue(pool.getMeanBorrowWaitTimeMillis() < 800);
- Assert.assertTrue(pool.getMeanBorrowWaitTimeMillis() > 100);
+ // Second borrow does not have to wait on create, average should be about 100
+ Assert.assertTrue(pool.getMaxBorrowWaitTimeMillis() > 100);
+ Assert.assertTrue(pool.getMeanBorrowWaitTimeMillis() < 200);
+ Assert.assertTrue(pool.getMeanBorrowWaitTimeMillis() > 20);
}
// POOL-276
diff --git a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
index 31b99dd..dd57a25 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -2357,19 +2357,20 @@
public void testClientWaitStats() throws Exception {
SimpleFactory factory = new SimpleFactory();
// Give makeObject a little latency
- factory.setMakeLatency(1000);
+ factory.setMakeLatency(200);
final GenericObjectPool<String> pool = new GenericObjectPool<String>(
factory, new GenericObjectPoolConfig());
String s = pool.borrowObject();
- // First borrow waits on create, so wait time should be at least 100 ms
+ // First borrow waits on create, so wait time should be at least 200 ms
+ // Allow 100ms error in clock times
Assert.assertTrue(pool.getMaxBorrowWaitTimeMillis() >= 100);
Assert.assertTrue(pool.getMeanBorrowWaitTimeMillis() >= 100);
pool.returnObject(s);
pool.borrowObject();
- // Second borrow does not have to wait on create, average should be about 50
- Assert.assertTrue(pool.getMaxBorrowWaitTimeMillis() > 500);
- Assert.assertTrue(pool.getMeanBorrowWaitTimeMillis() < 800);
- Assert.assertTrue(pool.getMeanBorrowWaitTimeMillis() > 100);
+ // Second borrow does not have to wait on create, average should be about 100
+ Assert.assertTrue(pool.getMaxBorrowWaitTimeMillis() > 100);
+ Assert.assertTrue(pool.getMeanBorrowWaitTimeMillis() < 200);
+ Assert.assertTrue(pool.getMeanBorrowWaitTimeMillis() > 20);
}
// POOL-276