(tomcat) branch 9.0.x updated: Align scheme variance test implementation with port variance

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt 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 4e6c7141ec Align scheme variance test implementation with port variance
4e6c7141ec is described below

commit 4e6c7141ec0e7f86d57b117a667eb0dd8d423e81
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 22 20:31:57 2024 +0100

    Align scheme variance test implementation with port variance
    
    Without this change, this test will incorrectly fail when BZ 69214 is
    fixed
---
 test/org/apache/catalina/filters/TestCorsFilter.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/catalina/filters/TestCorsFilter.java 
b/test/org/apache/catalina/filters/TestCorsFilter.java
index dc6affb3b8..7989a85145 100644
--- a/test/org/apache/catalina/filters/TestCorsFilter.java
+++ b/test/org/apache/catalina/filters/TestCorsFilter.java
@@ -1036,14 +1036,15 @@ public class TestCorsFilter {
      * @throws ServletException
      */
     @Test
-    public void testCheckForSchemeVariance() throws ServletException {
+    public void testCheckForSchemeVariance() throws ServletException, 
IOException {
         TesterHttpServletRequest request = new TesterHttpServletRequest();
+        TesterHttpServletResponse response = new TesterHttpServletResponse();
         request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN, 
"https://tomcat.apache.org";);
         request.setMethod("POST");
         CorsFilter corsFilter = new CorsFilter();
         corsFilter.init(TesterFilterConfigs.getSpecificOriginFilterConfig());
-        CorsFilter.CORSRequestType requestType = 
corsFilter.checkRequestType(request);
-        Assert.assertEquals(CorsFilter.CORSRequestType.INVALID_CORS, 
requestType);
+        corsFilter.doFilter(request, response, filterChain);
+        Assert.assertEquals(HttpServletResponse.SC_FORBIDDEN, 
response.getStatus());
     }
 
     /*


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org