You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ps...@apache.org on 2010/01/10 20:27:14 UTC
svn commit: r897688 - in
/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp:
TestConnectionPool.java datasources/TestPerUserPoolDataSource.java
datasources/TestSharedPoolDataSource.java
Author: psteitz
Date: Sun Jan 10 19:27:13 2010
New Revision: 897688
URL: http://svn.apache.org/viewvc?rev=897688&view=rev
Log:
Fixed errors in r897678 commit - loopOnce should be *true* not false; javadoc fix.
Modified:
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java?rev=897688&r1=897687&r2=897688&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestConnectionPool.java Sun Jan 10 19:27:13 2010
@@ -686,8 +686,8 @@
/**
* Launches a group of 2 * getMaxActive() threads, each of which will attempt to obtain a connection
* from the pool, hold it for <holdTime> ms, and then return it to the pool. If <loopOnce> is false,
- * threads will continue this process indefinitely. If <expectingError> is true, exactly 1/2 of the
- * threads are expected to either throw exceptions or fail to complete. If <expectingError> is false,
+ * threads will continue this process indefinitely. If <expectError> is true, exactly 1/2 of the
+ * threads are expected to either throw exceptions or fail to complete. If <expectError> is false,
* all threads are expected to complete successfully.
*
* @param holdTime time in ms that a thread holds a connection before returning it to the pool
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java?rev=897688&r1=897687&r2=897688&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java Sun Jan 10 19:27:13 2010
@@ -378,11 +378,11 @@
final int defaultMaxWait = 430;
((PerUserPoolDataSource) ds).setDefaultMaxWait(defaultMaxWait);
((PerUserPoolDataSource) ds).setPerUserMaxWait("foo",new Integer(defaultMaxWait));
- multipleThreads(1, false, false, defaultMaxWait);
+ multipleThreads(1, false, true, defaultMaxWait);
}
public void testMultipleThreads2() throws Exception {
- multipleThreads(2 * (int)(getMaxWait()), true, false, getMaxWait());
+ multipleThreads(2 * (int)(getMaxWait()), true, true, getMaxWait());
}
public void testTransactionIsolationBehavior() throws Exception {
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java?rev=897688&r1=897687&r2=897688&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java Sun Jan 10 19:27:13 2010
@@ -368,11 +368,11 @@
// some JVMs, e.g. Windows.
final int defaultMaxWait = 430;
((SharedPoolDataSource) ds).setMaxWait(defaultMaxWait);
- multipleThreads(1, false, false, defaultMaxWait);
+ multipleThreads(1, false, true, defaultMaxWait);
}
public void testMultipleThreads2() throws Exception {
- multipleThreads(2 * (int)(getMaxWait()), true, false, getMaxWait());
+ multipleThreads(2 * (int)(getMaxWait()), true, true, getMaxWait());
}
public void testTransactionIsolationBehavior() throws Exception {