Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish MockMvcWebClientBuilderTests

Browse Source 
Inspired by the fact that example.com is currently not reachable from
my network.
This commit is contained in:
Sam Brannen
2019-08-17 12:36:45 +02:00
parent 3877087f5a
commit 163b97f1ff
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,13 +28,10 @@ import com.gargoylesoftware.htmlunit.WebResponse;
import com.gargoylesoftware.htmlunit.util.Cookie; import com.gargoylesoftware.htmlunit.util.Cookie;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.tests.Assume; import org.springframework.tests.Assume;
@@ -51,7 +48,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
/** /**
* Integration tests for {@link MockMvcWebClientBuilder}. * Integration tests for {@link MockMvcWebClientBuilder}.
* *
@@ -60,10 +56,8 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @since 4.2 * @since 4.2
*/ */
@ExtendWith(SpringExtension.class) @SpringJUnitWebConfig
@ContextConfiguration class MockMvcWebClientBuilderTests {
@WebAppConfiguration
public class MockMvcWebClientBuilderTests {
@Autowired @Autowired
private WebApplicationContext wac; private WebApplicationContext wac;
@@ -72,42 +66,42 @@ public class MockMvcWebClientBuilderTests {
@BeforeEach @BeforeEach
public void setup() { void setup() {
this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
} }
@Test @Test
public void mockMvcSetupNull() { void mockMvcSetupNull() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException().isThrownBy(() ->
MockMvcWebClientBuilder.mockMvcSetup(null)); MockMvcWebClientBuilder.mockMvcSetup(null));
} }
@Test @Test
public void webAppContextSetupNull() { void webAppContextSetupNull() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException().isThrownBy(() ->
MockMvcWebClientBuilder.webAppContextSetup(null)); MockMvcWebClientBuilder.webAppContextSetup(null));
} }
@Test @Test
public void mockMvcSetupWithDefaultWebClientDelegate() throws Exception { void mockMvcSetupWithDefaultWebClientDelegate() throws Exception {
WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build(); WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build();
assertMockMvcUsed(client, "http://localhost/test"); assertMockMvcUsed(client, "http://localhost/test");
Assume.group(TestGroup.PERFORMANCE, () -> assertMockMvcNotUsed(client, "https://example.com/")); Assume.group(TestGroup.PERFORMANCE, () -> assertMockMvcNotUsed(client, "https://spring.io/"));
} }
@Test @Test
public void mockMvcSetupWithCustomWebClientDelegate() throws Exception { void mockMvcSetupWithCustomWebClientDelegate() throws Exception {
WebClient otherClient = new WebClient(); WebClient otherClient = new WebClient();
WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).withDelegate(otherClient).build(); WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).withDelegate(otherClient).build();
assertMockMvcUsed(client, "http://localhost/test"); assertMockMvcUsed(client, "http://localhost/test");
Assume.group(TestGroup.PERFORMANCE, () -> assertMockMvcNotUsed(client, "https://example.com/")); Assume.group(TestGroup.PERFORMANCE, () -> assertMockMvcNotUsed(client, "https://spring.io/"));
} }
@Test // SPR-14066 @Test // SPR-14066
public void cookieManagerShared() throws Exception { void cookieManagerShared() throws Exception {
this.mockMvc = MockMvcBuilders.standaloneSetup(new CookieController()).build(); this.mockMvc = MockMvcBuilders.standaloneSetup(new CookieController()).build();
WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build(); WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build();
@@ -117,7 +111,7 @@ public class MockMvcWebClientBuilderTests {
} }
@Test // SPR-14265 @Test // SPR-14265
public void cookiesAreManaged() throws Exception { void cookiesAreManaged() throws Exception {
this.mockMvc = MockMvcBuilders.standaloneSetup(new CookieController()).build(); this.mockMvc = MockMvcBuilders.standaloneSetup(new CookieController()).build();
WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build(); WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build();
@@ -161,7 +155,7 @@ public class MockMvcWebClientBuilderTests {
static class ContextPathController { static class ContextPathController {
@RequestMapping("/test") @RequestMapping("/test")
public String contextPath(HttpServletRequest request) { String contextPath(HttpServletRequest request) {
return "mvc"; return "mvc";
} }
} }