From 9bf8fc04e4b5b163533cb49dc7b60bd0cbed4a89 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 18 Dec 2009 17:34:43 +0000
Subject: [PATCH] Fix some Eclipse warnings in the tests

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@892321 13f79535-47bb-0310-9956-ffa450edef68
---
 test/org/apache/catalina/connector/TestKeepAliveCount.java         | 2 +-
 test/org/apache/catalina/connector/TestRequest.java                | 2 +-
 test/org/apache/catalina/ha/session/TestSerializablePrincipal.java | 1 +
 test/org/apache/catalina/ha/session/TesterPrincipal.java           | 2 ++
 test/org/apache/catalina/startup/TestWebXml.java                   | 6 +++---
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/org/apache/catalina/connector/TestKeepAliveCount.java b/test/org/apache/catalina/connector/TestKeepAliveCount.java
index 97e9b9a3b..00e86bcf0 100644
--- a/test/org/apache/catalina/connector/TestKeepAliveCount.java
+++ b/test/org/apache/catalina/connector/TestKeepAliveCount.java
@@ -46,7 +46,7 @@ public class TestKeepAliveCount extends TomcatBaseTest{
 
         private boolean init;
         
-        private synchronized void init() throws Exception {
+        private synchronized void init() {
             if (init) return;
             
             Tomcat tomcat = getTomcatInstance();
diff --git a/test/org/apache/catalina/connector/TestRequest.java b/test/org/apache/catalina/connector/TestRequest.java
index 7b2d276b9..0df0df3f3 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -44,7 +44,7 @@ public class TestRequest extends TomcatBaseTest {
      * any of the {@link HttpServletRequest} getParameterXXX() methods if the
      * request is chunked.
      */
-    public void testBug37794() throws Exception {
+    public void testBug37794() {
         Bug37794Client client = new Bug37794Client();
         client.setPort(getPort());
 
diff --git a/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java b/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
index 8323bf919..02f74cd37 100644
--- a/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
+++ b/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
@@ -36,6 +36,7 @@ public class TestSerializablePrincipal extends TestCase {
     /**
      * Simple serialization / de-serialization test for bug 43840.
      */
+    @SuppressWarnings("null")
     public void testWriteReadPrincipal() {
         // Get a temporary file to use for the serialization test
         File file = null;
diff --git a/test/org/apache/catalina/ha/session/TesterPrincipal.java b/test/org/apache/catalina/ha/session/TesterPrincipal.java
index 774f31076..8daf8cb1e 100644
--- a/test/org/apache/catalina/ha/session/TesterPrincipal.java
+++ b/test/org/apache/catalina/ha/session/TesterPrincipal.java
@@ -22,6 +22,8 @@ import java.security.Principal;
 
 public class TesterPrincipal implements Principal, Serializable {
     
+    private static final long serialVersionUID = 1L;
+
     private String name;
 
     public TesterPrincipal(String theName) {
diff --git a/test/org/apache/catalina/startup/TestWebXml.java b/test/org/apache/catalina/startup/TestWebXml.java
index a09c6df69..6952acb03 100644
--- a/test/org/apache/catalina/startup/TestWebXml.java
+++ b/test/org/apache/catalina/startup/TestWebXml.java
@@ -232,14 +232,14 @@ public class TestWebXml extends TestCase {
         a.addBeforeOrder("b");
         b.addBeforeOrder("a");
 
-        Exception e = null;
+        Exception exception = null;
         
         try {
             WebXml.orderWebFragments(app, fragments);
         } catch (Exception e1) {
-            e = e1;
+            exception = e1;
         }
         
-        assertTrue(e instanceof IllegalArgumentException);
+        assertTrue(exception instanceof IllegalArgumentException);
     }
 }
-- 
2.11.0