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

Polishing

This commit is contained in:
Sam Brannen 2016-03-18 19:44:20 +01:00
parent 11221f5ccb
commit c5200978b0
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
View File

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

14
spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java
View File

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