From 59d60c60cf9084598dd95ad016d77df3dd98c4be Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 16 Nov 2015 01:44:16 +0100
Subject: [PATCH] Polishing

---
 .../java/org/springframework/test/web/servlet/MockMvc.java    | 4 ++--
 .../test/web/servlet/samples/context/JavaConfigTests.java     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
index e6f859e8109..360bf33c255 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
@@ -173,8 +173,8 @@ public final class MockMvc {
 			}
 
 			@Override
-			public ResultActions andDo(ResultHandler printer) throws Exception {
-				printer.handle(mvcResult);
+			public ResultActions andDo(ResultHandler handler) throws Exception {
+				handler.handle(mvcResult);
 				return this;
 			}
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
index 221f33b4dee..70e49dc3332 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
@@ -119,7 +119,6 @@ public class JavaConfigTests {
 		assertNotNull(parent);
 		assertTrue(parent instanceof WebApplicationContext);
 		WebApplicationContext root = (WebApplicationContext) parent;
-		assertFalse(root.getBeansOfType(String.class).containsKey("bar"));
 
 		ServletContext childServletContext = wac.getServletContext();
 		assertNotNull(childServletContext);