Merge pull request #1930 from fl4via/UNDERTOW-2536

[UNDERTOW-2536] Update test to work with Servlet spec version 6.1

Author: fl4via

servlet/src/test/java/io/undertow/servlet/test/dispatcher/attributes/DispatcherErrorForwardServletTestCase.java

@@ -104,19 +104,23 @@ public void testSimpleForwardWithError() throws IOException, InterruptedExceptio
         expectedParams.put("jakarta.servlet.forward.context_path", "/servletContext");
         expectedParams.put("jakarta.servlet.forward.mapping",
                 "match_value=forward,pattern=/forward,servlet_name=fwd,mapping_match=EXACT");
-        //https://jakarta.ee/specifications/servlet/5.0/jakarta-servlet-spec-5.0#request-attributes
+        //https://jakarta.ee/specifications/servlet/6.1/jakarta-servlet-spec-6.1#request-attributes
         //        jakarta.servlet.error.request_uri
         //        jakarta.servlet.error.servlet_name
         //        jakarta.servlet.error.exception_type
         //        jakarta.servlet.error.exception
         //        jakarta.servlet.error.message
         //        jakarta.servlet.error.status_code
+        // plus, we have the new jakarta.servlet.error.method as specified in
+        // https://jakarta.ee/specifications/servlet/6.1/jakarta-servlet-spec-6.1#changes-since-jakarta-servlet-6-0 issue
+        // https://github.com/eclipse-ee4j/servlet-api/issues/544
         expectedParams.put("jakarta.servlet.error.request_uri", "/servletContext/forward");
         expectedParams.put("jakarta.servlet.error.servlet_name", "fwd");
         expectedParams.put("jakarta.servlet.error.exception_type", "class jakarta.servlet.ServletException");
         expectedParams.put("jakarta.servlet.error.exception", "jakarta.servlet.ServletException: HEY");
         expectedParams.put("jakarta.servlet.error.message", "HEY");
         expectedParams.put("jakarta.servlet.error.status_code", "500");
+        expectedParams.put("jakarta.servlet.error.method", "GET");
         TestHttpClient client = new TestHttpClient();
         try {
             HttpGet get = new HttpGet(DefaultServer.getDefaultServerURL() + "/servletContext/forward");
@@ -135,7 +139,7 @@ public void testSimpleForwardWithError() throws IOException, InterruptedExceptio
     @Test
     public void testSimpleForwardWithNoError() throws IOException, InterruptedException {
         //Expected params:
-        //https://jakarta.ee/specifications/servlet/5.0/jakarta-servlet-spec-5.0#forwarded-request-parameters
+        //https://jakarta.ee/specifications/servlet/6.1/jakarta-servlet-spec-6.1#forwarded-request-parameters
         //Some are missing, since null == omission.
         //        jakarta.servlet.forward.mapping
         //        jakarta.servlet.forward.request_uri

servlet/src/test/java/io/undertow/servlet/test/dispatcher/attributes/DispatcherErrorIncludeServletTestCase.java

@@ -105,7 +105,7 @@ public void testSimpleIncludeWithError() throws IOException, InterruptedExceptio
         expectedParams.put("jakarta.servlet.forward.mapping",
                 "match_value=include,pattern=/include,servlet_name=inc,mapping_match=EXACT");
         expectedParams.put("jakarta.servlet.forward.context_path", "/servletContext");
-        //https://jakarta.ee/specifications/servlet/5.0/jakarta-servlet-spec-5.0#request-attributes
+        //https://jakarta.ee/specifications/servlet/6.1/jakarta-servlet-spec-6.1#request-attributes
         //        jakarta.servlet.error.request_uri
         //        jakarta.servlet.error.servlet_name
         //        jakarta.servlet.error.exception_type
@@ -117,6 +117,7 @@ public void testSimpleIncludeWithError() throws IOException, InterruptedExceptio
         expectedParams.put("jakarta.servlet.error.exception", "jakarta.servlet.ServletException: HEY");
         expectedParams.put("jakarta.servlet.error.message", "HEY");
         expectedParams.put("jakarta.servlet.error.status_code", "500");
+        expectedParams.put("jakarta.servlet.error.method", "GET");
         TestHttpClient client = new TestHttpClient();
         try {
             HttpGet get = new HttpGet(DefaultServer.getDefaultServerURL() + "/servletContext/include");
@@ -134,7 +135,7 @@ public void testSimpleIncludeWithError() throws IOException, InterruptedExceptio
 
     @Test
     public void testSimpleIncludeWithNoError() throws IOException, InterruptedException {
-        //https://jakarta.ee/specifications/servlet/5.0/jakarta-servlet-spec-5.0#included-request-parameters
+        //https://jakarta.ee/specifications/servlet/6.1/jakarta-servlet-spec-6.1#included-request-parameters
         //        jakarta.servlet.include.request_uri
         //        jakarta.servlet.include.context_path
         //        jakarta.servlet.include.query_string