Fix TCK bug in mapping test that led to challenge and re-enable test

Challenges: jakartaee/servlet#385 jakartaee#594
scottmarlow · Jan 14, 2022 · 1e6547d · 1e6547d
1 parent fa4b540
commit 1e6547d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/install/jakartaee/bin/ts.jtx b/install/jakartaee/bin/ts.jtx
@@ -24,11 +24,6 @@
 #
 com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpupgradehandler/URLClient.java#upgradeTest
 
-#
-# In response to accepted Platform TCK challenge servlet-api/issues/385 + https://github.com/eclipse-ee4j/jakartaee-tck/issues/594, exclude the following tests:
-#    com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest40/Client.java#httpServletMappingDispatchTest
-com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest40/Client.java#httpServletMappingDispatchTest
-
 #
 # In response to accepted challenge eclipse-ee4j/servlet-api#378 + https://github.com/eclipse-ee4j/jakartaee-tck/issues/593, exclude the following tests:
 #    com.sun.ts.tests.servlet.api.jakarta_servlet_http.cookie.URLClient#setMaxAgePositiveTest

diff --git a/install/servlet/bin/ts.jtx b/install/servlet/bin/ts.jtx
@@ -15,20 +15,12 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-#
-# $Id$
-
 #
 # Servlet 6.0 TCK Exclude List
 #
 #
 com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest30/URLClient.java#asyncStartedTest3
 
-#
-# In response to accepted Platform TCK challenge servlet-api/issues/385 + https://github.com/eclipse-ee4j/jakartaee-tck/issues/594, exclude the following tests:
-#    com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest40/Client.java#httpServletMappingDispatchTest
-com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest40/Client.java#httpServletMappingDispatchTest
-
 #
 # In response to accepted challenge eclipse-ee4j/servlet-api#378 + https://github.com/eclipse-ee4j/jakartaee-tck/issues/593, exclude the following tests:
 #    com.sun.ts.tests.servlet.api.jakarta_servlet_http.cookie.URLClient#setMaxAgePositiveTest

diff --git a/src/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest40/Client.java b/src/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest40/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -210,7 +210,7 @@ public void httpServletMappingFilterTest() throws Fault {
   public void httpServletMappingDispatchTest() throws Fault {
     simpleTest("httpServletMappingDispatchTest",
         CONTEXT_ROOT + "/DispatchServlet", "GET",
-        "matchValue=DispatchServlet, pattern=/DispatchServlet, servletName=DispatchServlet, mappingMatch=EXACT");
+        "matchValue=TestServlet, pattern=/TestServlet, servletName=TestServlet, mappingMatch=EXACT");
   }
 
   private void simpleTest(String testName, String request, String method,