master
Sam Brannen 9 years ago
parent d781ac0c92
commit 59d60c60cf
  1. 4
      spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
  2. 1
      spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java

@ -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;
} }

@ -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);

Loading…
Cancel
Save