Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-01 03:19:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert TCK work around

Browse Source 
Revert temporary fix for challenged TCK test (#5803)
This commit is contained in:
gregw 2021-01-05 13:55:33 +01:00
parent 51120b1f0b
commit 7dfb44f7ad
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -2416,14 +2416,6 @@ public class Request implements HttpServletRequest
@Override @Override
public HttpServletMapping getHttpServletMapping() public HttpServletMapping getHttpServletMapping()
{ {
// TODO This is to pass the current TCK. This has been challenged in https://github.com/eclipse-ee4j/jakartaee-tck/issues/585
if (_dispatcherType == DispatcherType.ASYNC)
{
Object async = getAttribute(AsyncContext.ASYNC_MAPPING);
if (async != null)
return (ServletPathMapping)async;
}
// The mapping returned is normally for the current servlet. Except during an // The mapping returned is normally for the current servlet. Except during an
// INCLUDE dispatch, in which case this method returns the mapping of the source servlet, // INCLUDE dispatch, in which case this method returns the mapping of the source servlet,
// which we recover from the IncludeAttributes wrapper. // which we recover from the IncludeAttributes wrapper.

3
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
View File

@ -477,8 +477,7 @@ public class DispatcherTest
_contextHandler.addServlet(new ServletHolder("DispatchServlet", AsyncDispatch2TestServlet.class), "/DispatchServlet"); _contextHandler.addServlet(new ServletHolder("DispatchServlet", AsyncDispatch2TestServlet.class), "/DispatchServlet");
String response = _connector.getResponse("GET /context/DispatchServlet HTTP/1.0\n\n"); String response = _connector.getResponse("GET /context/DispatchServlet HTTP/1.0\n\n");
// TODO This is to pass the current TCK. This has been challenged in https://github.com/eclipse-ee4j/jakartaee-tck/issues/585 assertThat(response, containsString("matchValue=TestServlet, pattern=/TestServlet, servletName=TestServlet, mappingMatch=EXACT"));
assertThat(response, containsString("matchValue=DispatchServlet, pattern=/DispatchServlet, servletName=DispatchServlet, mappingMatch=EXACT"));
} }
public static class WrappingFilter implements Filter public static class WrappingFilter implements Filter