Fix failing test and further align code

Author: markt-asf

test/org/apache/catalina/filters/TestRateLimitFilter.java

@@ -17,8 +17,6 @@
 package org.apache.catalina.filters;
 
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
@@ -47,11 +45,12 @@ private void testRateLimitWith4Clients(boolean exposeHeaders, boolean enforce) t
 
         Tomcat tomcat = getTomcatInstance();
         Context root = tomcat.addContext("", TEMP_DIR);
-        tomcat.start();
 
         MockFilterChain filterChain = new MockFilterChain();
         RateLimitFilter rateLimitFilter = testRateLimitFilter(filterDef, root);
 
+        tomcat.start();
+
         FastRateLimiter fastRateLimiter = (FastRateLimiter) rateLimitFilter.rateLimiter;
 
         int allowedRequests = fastRateLimiter.getRequests();
@@ -127,7 +126,7 @@ public void testUnexposeHeaderAndEnforcedRateLimitWith4Clients() throws Exceptio
         testRateLimitWith4Clients(false, true);
     }
 
-    private RateLimitFilter testRateLimitFilter(FilterDef filterDef, Context root) throws ServletException {
+    private RateLimitFilter testRateLimitFilter(FilterDef filterDef, Context root) {
 
         RateLimitFilter rateLimitFilter = new RateLimitFilter();
         filterDef.setFilterClass(RateLimitFilter.class.getName());
@@ -140,10 +139,6 @@ private RateLimitFilter testRateLimitFilter(FilterDef filterDef, Context root) t
         filterMap.addURLPatternDecoded("*");
         root.addFilterMap(filterMap);
 
-        FilterConfig filterConfig = TesterFilterConfigs.generateFilterConfig(filterDef);
-
-        rateLimitFilter.init(filterConfig);
-
         return rateLimitFilter;
     }
 

test/org/apache/catalina/filters/TestRateLimitFilterWithExactRateLimiter.java

@@ -31,7 +31,8 @@
 import org.apache.tomcat.util.descriptor.web.FilterMap;
 
 public class TestRateLimitFilterWithExactRateLimiter extends TomcatBaseTest {
-    private void testRateLimitWith1Clients(boolean exposeHeaders, boolean enforce) throws Exception {
+
+    private void testRateLimitWith4Clients(boolean exposeHeaders, boolean enforce) throws Exception {
 
         int bucketRequests = 40;
         int bucketDuration = 4;
@@ -45,11 +46,12 @@ private void testRateLimitWith1Clients(boolean exposeHeaders, boolean enforce) t
 
         Tomcat tomcat = getTomcatInstance();
         Context root = tomcat.addContext("", TEMP_DIR);
-        tomcat.start();
 
         MockFilterChain filterChain = new MockFilterChain();
         RateLimitFilter rateLimitFilter = testRateLimitFilter(filterDef, root);
 
+        tomcat.start();
+
         ExactRateLimiter exactRateLimiter = (ExactRateLimiter) rateLimitFilter.rateLimiter;
 
         int allowedRequests = exactRateLimiter.getRequests();
@@ -111,22 +113,22 @@ private void testRateLimitWith1Clients(boolean exposeHeaders, boolean enforce) t
 
     @Test
     public void testExposeHeaderAndReferenceRateLimitWith4Clients() throws Exception {
-        testRateLimitWith1Clients(true, false);
+        testRateLimitWith4Clients(true, false);
     }
 
     @Test
     public void testUnexposeHeaderAndReferenceRateLimitWith4Clients() throws Exception {
-        testRateLimitWith1Clients(false, false);
+        testRateLimitWith4Clients(false, false);
     }
 
     @Test
     public void testExposeHeaderAndEnforceRateLimitWith4Clients() throws Exception {
-        testRateLimitWith1Clients(true, true);
+        testRateLimitWith4Clients(true, true);
     }
 
     @Test
     public void testUnexposeHeaderAndEnforceRateLimitWith4Clients() throws Exception {
-        testRateLimitWith1Clients(false, true);
+        testRateLimitWith4Clients(false, true);
     }
 
     private RateLimitFilter testRateLimitFilter(FilterDef filterDef, Context root) {