From 8ef9a46acb2ef4df74188127627ccb8dce152aaf Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 8 Sep 2011 14:32:08 +0000 Subject: [PATCH] Fix Eclipse warnings git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166712 13f79535-47bb-0310-9956-ffa450edef68 --- .../test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java | 2 +- .../test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java | 1 + .../test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java | 2 +- .../src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) 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 a86e6e970..2e1f620fd 100644 --- 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 e405ee857..c6915b713 100644 --- 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 cfc92101e..3b65667e3 100644 --- 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 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 12441409b..7e82b2463 100644 --- 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(); + */ } -- 2.11.0