This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 4fb7e65938 Fix failing test and further align code
4fb7e65938 is described below
commit 4fb7e659386abbaccd354790895bb89312dd7525
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Apr 8 23:51:44 2026 +0100
Fix failing test and further align code
---
test/org/apache/catalina/filters/TestRateLimitFilter.java | 11 +++--------
.../filters/TestRateLimitFilterWithExactRateLimiter.java | 14 ++++++++------
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java
b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index 884b2c7913..580ee1652c 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -17,8 +17,6 @@
package org.apache.catalina.filters;
import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletResponse;
import org.junit.Assert;
@@ -47,11 +45,12 @@ public class TestRateLimitFilter extends TomcatBaseTest {
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 class TestRateLimitFilter extends TomcatBaseTest {
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 @@ public class TestRateLimitFilter extends TomcatBaseTest {
filterMap.addURLPatternDecoded("*");
root.addFilterMap(filterMap);
- FilterConfig filterConfig =
TesterFilterConfigs.generateFilterConfig(filterDef);
-
- rateLimitFilter.init(filterConfig);
-
return rateLimitFilter;
}
diff --git
a/test/org/apache/catalina/filters/TestRateLimitFilterWithExactRateLimiter.java
b/test/org/apache/catalina/filters/TestRateLimitFilterWithExactRateLimiter.java
index 5f5ea904e0..a92ec24ca4 100644
---
a/test/org/apache/catalina/filters/TestRateLimitFilterWithExactRateLimiter.java
+++
b/test/org/apache/catalina/filters/TestRateLimitFilterWithExactRateLimiter.java
@@ -31,7 +31,8 @@ import org.apache.tomcat.util.descriptor.web.FilterDef;
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 @@ public class TestRateLimitFilterWithExactRateLimiter
extends TomcatBaseTest {
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 @@ public class TestRateLimitFilterWithExactRateLimiter
extends TomcatBaseTest {
@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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
