[tomcat] 01/03: Revert "Fix failing test. There should be no C-L for HEAD unless Servlet sets it"
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
commit 97d6ef12c09e52e43c2ddf0bb7cf9e6fc32b84b2
Author: Mark Thomas
AuthorDate: Thu May 25 14:00:57 2023 +0100
Revert "Fix failing test. There should be no C-L for HEAD unless Servlet
sets it"
This reverts commit 7828614e36069ef1d08ad7eab36b4708bfaae9a2.
The change that necessitated this change is also being reverted.
---
test/org/apache/catalina/servlets/TestDefaultServlet.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/test/org/apache/catalina/servlets/TestDefaultServlet.java
b/test/org/apache/catalina/servlets/TestDefaultServlet.java
index dca67ff9cb..b67cc325d4 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServlet.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServlet.java
@@ -636,11 +636,10 @@ public class TestDefaultServlet extends TomcatBaseTest {
String length = resHeaders.get("Content-Length").get(0);
Assert.assertEquals(Long.parseLong(length), out.getLength());
out.recycle();
-resHeaders.clear();
rc = headUrl(path, out, resHeaders);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
Assert.assertEquals(0, out.getLength());
-Assert.assertNull(resHeaders.get("Content-Length"));
+Assert.assertEquals(length, resHeaders.get("Content-Length").get(0));
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Fix failing test.
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
commit b079eb4f84828b389c1d5862fcc2aeb1abb2926e
Author: Mark Thomas
AuthorDate: Thu May 25 14:37:36 2023 +0100
Fix failing test.
Content-length for HEAD is not reliable. We could have the default
servlet return the correct value but that creates work for little/no
value.
---
test/org/apache/catalina/servlets/TestDefaultServlet.java | 8
1 file changed, 8 deletions(-)
diff --git a/test/org/apache/catalina/servlets/TestDefaultServlet.java
b/test/org/apache/catalina/servlets/TestDefaultServlet.java
index b67cc325d4..ab83f8ce17 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServlet.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServlet.java
@@ -633,13 +633,5 @@ public class TestDefaultServlet extends TomcatBaseTest {
int rc = getUrl(path, out, resHeaders);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-String length = resHeaders.get("Content-Length").get(0);
-Assert.assertEquals(Long.parseLong(length), out.getLength());
-out.recycle();
-
-rc = headUrl(path, out, resHeaders);
-Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-Assert.assertEquals(0, out.getLength());
-Assert.assertEquals(length, resHeaders.get("Content-Length").get(0));
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated (21a5c1ddf7 -> b079eb4f84)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 21a5c1ddf7 Drop files Windows doesn't like. new 97d6ef12c0 Revert "Fix failing test. There should be no C-L for HEAD unless Servlet sets it" new b38281c826 Revert "Don't set 'C-L: 0' for HEAD requests if Servlet doesn't specify C-L" new b079eb4f84 Fix failing test. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/connector/OutputBuffer.java | 6 +++--- test/org/apache/catalina/servlets/TestDefaultServlet.java | 9 - webapps/docs/changelog.xml| 5 - 3 files changed, 3 insertions(+), 17 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Revert "Don't set 'C-L: 0' for HEAD requests if Servlet doesn't specify C-L"
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
commit b38281c8263d1a978594dd4e950f382bc7d96dba
Author: Mark Thomas
AuthorDate: Thu May 25 14:15:09 2023 +0100
Revert "Don't set 'C-L: 0' for HEAD requests if Servlet doesn't specify C-L"
This reverts commit 7d9cacdfc2e073ef4b1493d14f5c8f9f47a00c7f.
This broke too many things. It was also not quite right but even the correct
fix broke quite a few tests.
The fundamental problem is that Tomcat can't differentiate between a HEAD
request
that opts not to write any data to save resources (and should not have any
C-L
header) and a HEAD request explicitly writes zero byres because that is
what the
corresponding GET would do (which should have a header of C-L: 0).
Rather than risk regressions, leave the current behaviour as-is.
---
java/org/apache/catalina/connector/OutputBuffer.java | 6 +++---
webapps/docs/changelog.xml | 5 -
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/connector/OutputBuffer.java
b/java/org/apache/catalina/connector/OutputBuffer.java
index 0e5bd6659e..62966c653b 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -232,9 +232,9 @@ public class OutputBuffer extends Writer {
flushCharBuffer();
}
-if (!coyoteResponse.isCommitted() &&
coyoteResponse.getContentLengthLong() == -1 &&
-!coyoteResponse.getRequest().method().equals("HEAD")) {
-// If this didn't cause a commit of the response, the final
content length can be calculated.
+if ((!coyoteResponse.isCommitted()) &&
(coyoteResponse.getContentLengthLong() == -1)) {
+// If this didn't cause a commit of the response, the final content
+// length can be calculated.
if (!coyoteResponse.isCommitted()) {
coyoteResponse.setContentLength(bb.remaining());
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d7cc56b496..d1fe84b1d2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,11 +124,6 @@
file names in directory listings when using XML output. Based on pull
request 621 by Alex Kachanov. (markt)
-
-When processing a HEAD request, do not set an HTTP response header for
-Content-Length with the value zero if the Servlet does not set the
-header. (markt)
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-10.1.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/814 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 10.1.x] b079eb4f84828b389c1d5862fcc2aeb1abb2926e Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Consolidated code to remove duplication
This is an automated email from the ASF dual-hosted git repository.
isapir pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 9b0546a78f Consolidated code to remove duplication
9b0546a78f is described below
commit 9b0546a78fee88e3fd8b132540231695c2a5e41b
Author: Igal Sapir
AuthorDate: Thu May 25 21:13:42 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 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 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 =
TesterFilterConf
[tomcat] branch 10.1.x updated: Consolidated code to remove duplication
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
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 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 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 =
TesterFilter
[tomcat] branch 9.0.x updated: Consolidated code to remove duplication
This is an automated email from the ASF dual-hosted git repository.
isapir pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new ba7b5f4a24 Consolidated code to remove duplication
ba7b5f4a24 is described below
commit ba7b5f4a2490f94a06e1bf01c61e94b20d14af1c
Author: Igal Sapir
AuthorDate: Thu May 25 21:57:52 2023 -0700
Consolidated code to remove duplication
---
.../catalina/filters/TestRateLimitFilter.java | 38 +---
.../catalina/filters/TestRemoteCIDRFilter.java | 40 +-
.../catalina/filters/TesterFilterConfigs.java | 35 +++
3 files changed, 37 insertions(+), 76 deletions(-)
diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java
b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index 19281ac4ae..5205d97b61 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -19,12 +19,9 @@ package org.apache.catalina.filters;
import java.io.IOException;
import java.time.Instant;
-import java.util.Enumeration;
-import java.util.Map;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import org.junit.Assert;
@@ -36,7 +33,6 @@ 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;
@@ -104,7 +100,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 +165,4 @@ public class TestRateLimitFilter extends TomcatBaseTest {
}
}
-private static FilterConfig generateFilterConfig(FilterDef filterDef) {
-
-TesterServletContext mockServletContext = new TesterServletContext();
-Map 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 getInitParameterNames() {
-return null;
-}
-};
-
-return filterConfig;
-}
-
}
diff --git a/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
b/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
index a10d5b31ed..87f9c3b0d0 100644
--- a/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
+++ b/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
@@ -17,13 +17,8 @@
package org.apache.catalina.filters;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Map;
-
import javax.servlet.Filter;
import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
@@ -35,7 +30,6 @@ 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;
@@ -146,43 +140,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 parameters = filterDef.getParameterMap();
-
-FilterConfig filterConfig = new FilterConfig() {
-
-@Override
-public String getFilterName() {
-
[tomcat] branch 8.5.x updated: Consolidated code to remove duplication
This is an automated email from the ASF dual-hosted git repository.
isapir pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 746373b0bc Consolidated code to remove duplication
746373b0bc is described below
commit 746373b0bc28bd6cf73e67dfe3eb8ee04a4cd812
Author: Igal Sapir
AuthorDate: Thu May 25 22:15:54 2023 -0700
Consolidated code to remove duplication
---
.../catalina/filters/TestRateLimitFilter.java | 36 +--
.../catalina/filters/TestRemoteCIDRFilter.java | 40 +-
.../catalina/filters/TesterFilterConfigs.java | 35 +++
3 files changed, 37 insertions(+), 74 deletions(-)
diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java
b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index 6f780b4c88..49e785d7e6 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -24,7 +24,6 @@ import java.util.Map;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import org.junit.Assert;
@@ -36,7 +35,6 @@ 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;
@@ -104,7 +102,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 +167,4 @@ public class TestRateLimitFilter extends TomcatBaseTest {
}
}
-private static FilterConfig generateFilterConfig(FilterDef filterDef) {
-
-final TesterServletContext mockServletContext = new
TesterServletContext();
-final Map 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 getInitParameterNames() {
-return null;
-}
-};
-
-return filterConfig;
-}
-
}
diff --git a/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
b/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
index c7a2854c3f..87f9c3b0d0 100644
--- a/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
+++ b/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
@@ -17,13 +17,8 @@
package org.apache.catalina.filters;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Map;
-
import javax.servlet.Filter;
import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
@@ -35,7 +30,6 @@ 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;
@@ -146,43 +140,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(final FilterDef
filterDef) {
-
-final TesterServletContext mockServletContext = new
TesterServletContext();
-final Map parameters = filterDef.getParameterMap();
-
-FilterConfig filterConfig = new FilterConfig() {
-
-@Override
-public String getFilterName() {
-return filterDef.getFilterName();
-}
-
-@Override
-publi
