Fix halfway test

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@787684 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
index 3f30b6b..a0437f6 100644 (file)
--- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
+++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
@@ -105,13 +105,18 @@ public class AbandonPercentageTest extends DefaultTestCase {
         assertEquals("Number of connections active/busy should be 25",25,datasource.getPool().getActive());
         Thread.sleep(2500);
         assertEquals("Number of connections active/busy should be 25",25,datasource.getPool().getActive());
+        this.datasource.getPoolProperties().setRemoveAbandonedTimeout(100);
         for (int i=25; i<con.length; i++) {
             con[i] = datasource.getConnection();
         }
         int active = datasource.getPool().getActive();
-        System.out.println("Active!:"+active);
+        System.out.println("Active:"+active);
         assertEquals("Number of connections active/busy should be "+con.length,con.length,datasource.getPool().getActive());
+        this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
         Thread.sleep(2500);
-        assertEquals("Number of connections active/busy should be 0",0,datasource.getPool().getActive());
+        this.assertTrue("Number of connections should be less than 50.", (datasource.getPool().getActive()<50));
+        this.datasource.getPoolProperties().setAbandonWhenPercentageFull(0);
+        Thread.sleep(2500);
+        assertEquals("Number of connections active/busy should be "+0,0,datasource.getPool().getActive());
     }
 }