From c5200978b0b4a8eea25cb83bb5a4d2468a31b8ed Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 18 Mar 2016 19:44:20 +0100
Subject: [PATCH] Polishing

---
 .../htmlunit/MockMvcWebClientBuilderTests.java     | 11 +++++++----
 .../MockMvcHtmlUnitDriverBuilderTests.java         | 14 ++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
index dabaa5c8512..7d82bdc6bb1 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
@@ -24,6 +24,7 @@ import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebRequest;
 import com.gargoylesoftware.htmlunit.WebResponse;
 import com.gargoylesoftware.htmlunit.util.Cookie;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,7 +32,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
@@ -55,7 +56,7 @@ import static org.junit.Assert.assertThat;
  * @author Rossen Stoyanchev
  * @since 4.2
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 @WebAppConfiguration
 public class MockMvcWebClientBuilderTests {
@@ -139,9 +140,11 @@ public class MockMvcWebClientBuilderTests {
 
 	@RestController
 	static class CookieController {
-		@RequestMapping(value="/", produces="text/plain")
-		public String cookie(@CookieValue("cookie") String cookie) {
+
+		@RequestMapping(path = "/", produces = "text/plain")
+		String cookie(@CookieValue("cookie") String cookie) {
 			return cookie;
 		}
 	}
+
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java
index dfb1da856e9..85ff5e3ec4b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java
@@ -28,7 +28,7 @@ import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertTrue;
  * @author Sam Brannen
  * @since 4.2
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 @WebAppConfiguration
 public class MockMvcHtmlUnitDriverBuilderTests {
@@ -124,7 +124,7 @@ public class MockMvcHtmlUnitDriverBuilderTests {
 		assertThat(get("http://localhost/"), equalTo(""));
 		Cookie cookie = new Cookie("localhost", "cookie", "cookieManagerShared");
 		otherDriver.getWebClient().getCookieManager().addCookie(cookie);
-		assertThat(get("http://localhost/"), containsString("cookieManagerShared"));
+		assertThat(get("http://localhost/"), equalTo("cookieManagerShared"));
 	}
 
 
@@ -158,9 +158,11 @@ public class MockMvcHtmlUnitDriverBuilderTests {
 
 	@RestController
 	static class CookieController {
-		@RequestMapping(value="/", produces="text/plain")
-		public String cookie(@CookieValue("cookie") String cookie) {
+
+		@RequestMapping(path = "/", produces = "text/plain")
+		String cookie(@CookieValue("cookie") String cookie) {
 			return cookie;
 		}
 	}
-}
\ No newline at end of file
+
+}