Fix Eclipse warnings

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

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
index a86e6e9..2e1f620 100644 (file)
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
@@ -108,7 +108,7 @@ public class AbandonPercentageTest extends DefaultTestCase {
         assertEquals("Number of connections active/busy should be "+con.length,con.length,datasource.getPool().getActive());
         this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
         Thread.sleep(2500);
-        this.assertTrue("Number of connections should be less than 50.", (datasource.getPool().getActive()<50));
+        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());

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
index e405ee8..c6915b7 100644 (file)
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
@@ -106,6 +106,7 @@ public class AlternateUsernameTest extends DefaultTestCase {
             useuser = user!=null;
         }
         
+        @Override
         public TestResult call() {
             TestResult test = new TestResult();
             PooledConnection pcon = null;

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
index cfc9210..3b65667 100644 (file)
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
@@ -40,7 +40,7 @@ public class Async0IdleTestBug50477 extends DefaultTestCase {
         this.datasource.getPoolProperties().setInitialSize(0);
         try {
             Future<Connection> cf = ((DataSourceProxy)datasource).getConnectionAsync();
-            Connection con  = cf.get(5, TimeUnit.SECONDS);
+            cf.get(5, TimeUnit.SECONDS);
         }finally {
             tearDown();
         }

diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
index 1244140..7e82b24 100644 (file)
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
@@ -49,6 +49,7 @@ public class BorrowWaitTest extends DefaultTestCase {
             System.err.println("testWaitTimeInfinite() test is disabled.");
             return;//this would lock up the test suite
         }
+        /*
         int wait = -1;
         this.init();
         this.datasource.setMaxActive(1);
@@ -64,6 +65,7 @@ public class BorrowWaitTest extends DefaultTestCase {
             assertTrue("Connection should have been acquired within +/- 1 second.",true);
         }
         con.close();
+        */
     }