svn commit: r797529 - in /tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test: AbandonPercentageTest.java BorrowWaitTest.java DefaultTestCase.java TestConcurrency.java

2009-07-24 Thread fhanik 
Author: fhanik
Date: Fri Jul 24 15:25:17 2009
New Revision: 797529

URL: http://svn.apache.org/viewvc?rev=797529view=rev
Log:
update test cases

Modified:

tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java

tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java

tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java

tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConcurrency.java

Modified: 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java?rev=797529r1=797528r2=797529view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
 Fri Jul 24 15:25:17 2009
@@ -38,7 +38,6 @@
 this.datasource.getPoolProperties().setRemoveAbandoned(true);
 this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
 Connection con = datasource.getConnection();
-long start = System.currentTimeMillis();
 assertEquals(Number of connections active/busy should be 
1,1,datasource.getPool().getActive());
 Thread.sleep(2000);
 assertEquals(Number of connections active/busy should be 
0,0,datasource.getPool().getActive());
@@ -56,7 +55,6 @@
 this.datasource.getPoolProperties().setRemoveAbandoned(true);
 this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
 Connection con = datasource.getConnection();
-long start = System.currentTimeMillis();
 assertEquals(Number of connections active/busy should be 
1,1,datasource.getPool().getActive());
 Thread.sleep(2000);
 assertEquals(Number of connections active/busy should be 
1,1,datasource.getPool().getActive());
@@ -75,7 +73,6 @@
 this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
 
this.datasource.getPoolProperties().setJdbcInterceptors(ResetAbandonedTimer.class.getName());
 Connection con = datasource.getConnection();
-long start = System.currentTimeMillis();
 assertEquals(Number of connections active/busy should be 
1,1,datasource.getPool().getActive());
 for (int i=0; i20; i++) {
 Thread.sleep(200);
@@ -97,7 +94,6 @@
 this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
 Connection[] con = new Connection[size];
 con[0] = datasource.getConnection();
-long start = System.currentTimeMillis();
 assertEquals(Number of connections active/busy should be 
1,1,datasource.getPool().getActive());
 for (int i=1; i25; i++) {
 con[i] = datasource.getConnection();

Modified: 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java?rev=797529r1=797528r2=797529view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
 Fri Jul 24 15:25:17 2009
@@ -32,10 +32,10 @@
 this.datasource.setMaxActive(1);
 this.datasource.setMaxWait(wait);
 Connection con = datasource.getConnection();
-long start = System.currentTimeMillis();
 try {
 Connection con2 = datasource.getConnection();
 assertFalse(This should not happen, connection should be 
unavailable.,true);
+con2.close();
 }catch (SQLException x) {
 long delta = System.currentTimeMillis();
 boolean inrange = Math.abs(wait-delta)  1000;

Modified: 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java?rev=797529r1=797528r2=797529view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
 Fri Jul 24 15:25:17 2009
@@ -52,6 +52,7 @@
 public org.apache.tomcat.jdbc.pool.DataSource createDefaultDataSource() {
 org.apache.tomcat.jdbc.pool.DataSource datasource = null;
 PoolConfiguration p = new DefaultProperties();
+p.setFairQueue(false);
 p.setJmxEnabled(false);
 p.setTestWhileIdle(false);

Re: svn commit: r797529 - in /tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test: AbandonPercentageTest.java BorrowWaitTest.java DefaultTestCase.java TestConcurrency.java

2009-07-24 Thread sebb 
On 24/07/2009, fha...@apache.org fha...@apache.org wrote:
 Author: fhanik
  Date: Fri Jul 24 15:25:17 2009
  New Revision: 797529

  URL: http://svn.apache.org/viewvc?rev=797529view=rev
  Log:
  update test cases

  Modified:
 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConcurrency.java

  Modified: 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
  URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java?rev=797529r1=797528r2=797529view=diff
  
 ==
  --- 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
  (original)
  +++ 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
  Fri Jul 24 15:25:17 2009
  @@ -38,7 +38,6 @@
  this.datasource.getPoolProperties().setRemoveAbandoned(true);
  this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
  Connection con = datasource.getConnection();
  -long start = System.currentTimeMillis();
  assertEquals(Number of connections active/busy should be 
 1,1,datasource.getPool().getActive());
  Thread.sleep(2000);
  assertEquals(Number of connections active/busy should be 
 0,0,datasource.getPool().getActive());
  @@ -56,7 +55,6 @@
  this.datasource.getPoolProperties().setRemoveAbandoned(true);
  this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
  Connection con = datasource.getConnection();
  -long start = System.currentTimeMillis();
  assertEquals(Number of connections active/busy should be 
 1,1,datasource.getPool().getActive());
  Thread.sleep(2000);
  assertEquals(Number of connections active/busy should be 
 1,1,datasource.getPool().getActive());
  @@ -75,7 +73,6 @@
  this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
  
 this.datasource.getPoolProperties().setJdbcInterceptors(ResetAbandonedTimer.class.getName());
  Connection con = datasource.getConnection();
  -long start = System.currentTimeMillis();
  assertEquals(Number of connections active/busy should be 
 1,1,datasource.getPool().getActive());
  for (int i=0; i20; i++) {
  Thread.sleep(200);
  @@ -97,7 +94,6 @@
  this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
  Connection[] con = new Connection[size];
  con[0] = datasource.getConnection();
  -long start = System.currentTimeMillis();
  assertEquals(Number of connections active/busy should be 
 1,1,datasource.getPool().getActive());
  for (int i=1; i25; i++) {
  con[i] = datasource.getConnection();

  Modified: 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
  URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java?rev=797529r1=797528r2=797529view=diff
  
 ==
  --- 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
  (original)
  +++ 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
  Fri Jul 24 15:25:17 2009
  @@ -32,10 +32,10 @@
  this.datasource.setMaxActive(1);
  this.datasource.setMaxWait(wait);
  Connection con = datasource.getConnection();
  -long start = System.currentTimeMillis();
  try {
  Connection con2 = datasource.getConnection();
  assertFalse(This should not happen, connection should be 
 unavailable.,true);
  +con2.close();
  }catch (SQLException x) {
  long delta = System.currentTimeMillis();
  boolean inrange = Math.abs(wait-delta)  1000;

  Modified: 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
  URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java?rev=797529r1=797528r2=797529view=diff
  
 ==
  --- 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
  (original)
  +++ 
 tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
  Fri Jul 24 15:25:17 2009
  @@ -52,6 +52,7 @@
  public org.apache.tomcat.jdbc.pool.DataSource createDefaultDataSource() {