Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add handleFailure property to FrameworkServlet"

Browse Source 
This reverts commit 29ce6685ca.
This commit is contained in:
Rossen Stoyanchev
2018-08-17 09:47:00 +03:00
parent 0dd9e8ce02
commit 498984324d
4 changed files with 9 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -614,32 +614,6 @@ public class DispatcherServletTests {
assertTrue(!ex.toString().contains("bar"));
}
@Test // SPR-17100
public void shouldHandleFailure() throws ServletException, IOException {
IllegalStateException ex = new IllegalStateException("dummy");
@SuppressWarnings("serial")
FrameworkServlet servlet = new FrameworkServlet() {
@Override
protected void doService(HttpServletRequest request, HttpServletResponse response) {
throw ex;
}
};
servlet.setShouldHandleFailure(true);
MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/error");
MockHttpServletResponse response = new MockHttpServletResponse();
servlet.service(request, response);
assertEquals(500, response.getStatus());
assertEquals(500, request.getAttribute(WebUtils.ERROR_STATUS_CODE_ATTRIBUTE));
assertEquals(ex.getClass(), request.getAttribute(WebUtils.ERROR_EXCEPTION_TYPE_ATTRIBUTE));
assertEquals(ex.getMessage(), request.getAttribute(WebUtils.ERROR_MESSAGE_ATTRIBUTE));
assertEquals(ex, request.getAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE));
assertEquals(request.getRequestURI(), request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE));
}
@Test
public void cleanupAfterIncludeWithRemove() throws ServletException, IOException {
MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/main.do");