This is an automated email from the ASF dual-hosted git repository.
isapir 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 b89e50d4f8 Consolidated code to remove duplication
b89e50d4f8 is described below
commit b89e50d4f8a00c35039c84f85399acac3a1ab718
Author: Igal Sapir <[email protected]>
AuthorDate: Thu May 25 21:36:17 2023 -0700
Consolidated code to remove duplication
---
.../catalina/filters/TestRateLimitFilter.java | 50 +++-------------------
.../catalina/filters/TestRemoteCIDRFilter.java | 46 ++------------------
.../catalina/filters/TesterFilterConfigs.java | 35 +++++++++++++++
3 files changed, 44 insertions(+), 87 deletions(-)
diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java
b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index 2797b8cf9b..d754b0cc72 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -17,28 +17,22 @@
package org.apache.catalina.filters;
-import java.io.IOException;
-import java.time.Instant;
-import java.util.Enumeration;
-import java.util.Map;
-
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
-
-import org.junit.Assert;
-import org.junit.Test;
-
import org.apache.catalina.Context;
import org.apache.catalina.filters.TestRemoteIpFilter.MockFilterChain;
import org.apache.catalina.filters.TestRemoteIpFilter.MockHttpServletRequest;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.unittest.TesterResponse;
-import org.apache.tomcat.unittest.TesterServletContext;
import org.apache.tomcat.util.descriptor.web.FilterDef;
import org.apache.tomcat.util.descriptor.web.FilterMap;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.time.Instant;
public class TestRateLimitFilter extends TomcatBaseTest {
@@ -104,7 +98,7 @@ public class TestRateLimitFilter extends TomcatBaseTest {
filterMap.addURLPatternDecoded("*");
root.addFilterMap(filterMap);
- FilterConfig filterConfig = generateFilterConfig(filterDef);
+ FilterConfig filterConfig =
TesterFilterConfigs.generateFilterConfig(filterDef);
rateLimitFilter.init(filterConfig);
@@ -169,36 +163,4 @@ public class TestRateLimitFilter extends TomcatBaseTest {
}
}
- private static FilterConfig generateFilterConfig(FilterDef filterDef) {
-
- TesterServletContext mockServletContext = new TesterServletContext();
- Map<String,String> parameters = filterDef.getParameterMap();
-
- FilterConfig filterConfig = new FilterConfig() {
-
- @Override
- public String getFilterName() {
- return "rate-limit-filter";
- }
-
- @Override
- public ServletContext getServletContext() {
- return mockServletContext;
- }
-
- @Override
- public String getInitParameter(String name) {
-
- return parameters.get(name);
- }
-
- @Override
- public Enumeration<String> getInitParameterNames() {
- return null;
- }
- };
-
- return filterConfig;
- }
-
}
diff --git a/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
b/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
index 94eaab2cea..ffac84a7b9 100644
--- a/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
+++ b/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
@@ -17,27 +17,19 @@
package org.apache.catalina.filters;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Map;
-
import jakarta.servlet.Filter;
import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletResponse;
-
-import org.junit.Assert;
-import org.junit.Test;
-
import org.apache.catalina.Context;
import org.apache.catalina.connector.Request;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.unittest.TesterResponse;
-import org.apache.tomcat.unittest.TesterServletContext;
import org.apache.tomcat.util.descriptor.web.FilterDef;
import org.apache.tomcat.util.descriptor.web.FilterMap;
+import org.junit.Assert;
+import org.junit.Test;
public class TestRemoteCIDRFilter extends TomcatBaseTest {
@@ -146,43 +138,11 @@ public class TestRemoteCIDRFilter extends TomcatBaseTest {
filterMap.addURLPatternDecoded(urlPattern);
root.addFilterMap(filterMap);
- FilterConfig filterConfig = generateFilterConfig(filterDef);
+ FilterConfig filterConfig =
TesterFilterConfigs.generateFilterConfig(filterDef);
remoteCIDRFilter.init(filterConfig);
return remoteCIDRFilter;
}
- private static FilterConfig generateFilterConfig(FilterDef filterDef) {
-
- TesterServletContext mockServletContext = new TesterServletContext();
- Map<String,String> parameters = filterDef.getParameterMap();
-
- FilterConfig filterConfig = new FilterConfig() {
-
- @Override
- public String getFilterName() {
- return filterDef.getFilterName();
- }
-
- @Override
- public ServletContext getServletContext() {
- return mockServletContext;
- }
-
- @Override
- public String getInitParameter(String name) {
-
- return parameters.get(name);
- }
-
- @Override
- public Enumeration<String> getInitParameterNames() {
- return Collections.enumeration(parameters.keySet());
- }
- };
-
- return filterConfig;
- }
-
}
diff --git a/test/org/apache/catalina/filters/TesterFilterConfigs.java
b/test/org/apache/catalina/filters/TesterFilterConfigs.java
index bf70c9c509..c902240293 100644
--- a/test/org/apache/catalina/filters/TesterFilterConfigs.java
+++ b/test/org/apache/catalina/filters/TesterFilterConfigs.java
@@ -16,12 +16,15 @@
*/
package org.apache.catalina.filters;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.Map;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletContext;
import org.apache.tomcat.unittest.TesterServletContext;
+import org.apache.tomcat.util.descriptor.web.FilterDef;
public class TesterFilterConfigs {
public static final String HTTPS_WWW_APACHE_ORG = "https://www.apache.org";;
@@ -197,6 +200,38 @@ public class TesterFilterConfigs {
supportCredentials, preflightMaxAge, decorateRequest);
}
+ public static FilterConfig generateFilterConfig(FilterDef filterDef) {
+
+ TesterServletContext mockServletContext = new TesterServletContext();
+ Map<String,String> parameters = filterDef.getParameterMap();
+
+ FilterConfig filterConfig = new FilterConfig() {
+
+ @Override
+ public String getFilterName() {
+ return filterDef.getFilterName();
+ }
+
+ @Override
+ public ServletContext getServletContext() {
+ return mockServletContext;
+ }
+
+ @Override
+ public String getInitParameter(String name) {
+
+ return parameters.get(name);
+ }
+
+ @Override
+ public Enumeration<String> getInitParameterNames() {
+ return Collections.enumeration(parameters.keySet());
+ }
+ };
+
+ return filterConfig;
+ }
+
private static FilterConfig generateFilterConfig(final String
allowedHttpHeaders, final String allowedHttpMethods,
final String allowedOrigins, final String exposedHeaders, final
String supportCredentials,
final String preflightMaxAge, final String decorateRequest) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
