From e3e0e302d8c9cceb69bdc2d6223b29064d9d2731 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 8 Sep 2011 15:39:11 +0000 Subject: [PATCH] Fix Eclipse warnings in unit tests git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1166757 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/catalina/comet/TestCometProcessor.java | 2 ++ test/org/apache/catalina/connector/TestMaxConnections.java | 2 +- test/org/apache/catalina/session/Benchmarks.java | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/org/apache/catalina/comet/TestCometProcessor.java b/test/org/apache/catalina/comet/TestCometProcessor.java index e36955252..c73cebaca 100644 --- a/test/org/apache/catalina/comet/TestCometProcessor.java +++ b/test/org/apache/catalina/comet/TestCometProcessor.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpSession; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Test; @@ -160,6 +161,7 @@ public class TestCometProcessor extends TomcatBaseTest { // Write should trigger an exception once the connector stops since the // socket should be closed assertNotNull(writeThread.getException()); + assertNull(readThread.getException()); } private boolean isCometSupported() { diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java b/test/org/apache/catalina/connector/TestMaxConnections.java index c9b45ca74..5723b02fd 100644 --- a/test/org/apache/catalina/connector/TestMaxConnections.java +++ b/test/org/apache/catalina/connector/TestMaxConnections.java @@ -60,7 +60,7 @@ public class TestMaxConnections extends TomcatBaseTest { } assertTrue("The number of successful requests should have been 4-5, actual "+passcount,4==passcount || 5==passcount); - + System.out.println("There were [" + connectfail + "] connection failures"); } private static class ConnectThread extends Thread { diff --git a/test/org/apache/catalina/session/Benchmarks.java b/test/org/apache/catalina/session/Benchmarks.java index 9376dba2c..1e6c545f6 100644 --- a/test/org/apache/catalina/session/Benchmarks.java +++ b/test/org/apache/catalina/session/Benchmarks.java @@ -152,7 +152,7 @@ public class Benchmarks { * 16 threads - ~45,600ms */ @Test - public void testManagerBaseCreateSession() throws LifecycleException { + public void testManagerBaseCreateSession() { doTestManagerBaseCreateSession(1, 1000000); doTestManagerBaseCreateSession(2, 1000000); doTestManagerBaseCreateSession(4, 1000000); @@ -163,8 +163,8 @@ public class Benchmarks { } - private void doTestManagerBaseCreateSession(int threadCount, int iterCount) - throws LifecycleException { + private void doTestManagerBaseCreateSession(int threadCount, + int iterCount) { // Create a default session manager StandardManager mgr = new StandardManager(); -- 2.11.0