root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Sam Brannen 2015-11-16 01:44:16 +01:00
parent d781ac0c92
commit 59d60c60cf
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
View File

@ -173,8 +173,8 @@ public final class MockMvc {
} }
@Override @Override
public ResultActions andDo(ResultHandler printer) throws Exception { public ResultActions andDo(ResultHandler handler) throws Exception {
printer.handle(mvcResult); handler.handle(mvcResult);
return this; return this;
} }

1
spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
View File

@ -119,7 +119,6 @@ public class JavaConfigTests {
assertNotNull(parent); assertNotNull(parent);
assertTrue(parent instanceof WebApplicationContext); assertTrue(parent instanceof WebApplicationContext);
WebApplicationContext root = (WebApplicationContext) parent; WebApplicationContext root = (WebApplicationContext) parent;
assertFalse(root.getBeansOfType(String.class).containsKey("bar"));
ServletContext childServletContext = wac.getServletContext(); ServletContext childServletContext = wac.getServletContext();
assertNotNull(childServletContext); assertNotNull(childServletContext);