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

Redesign MockMvcWebClientBuilder API

Browse Source 
This commit introduces a dedicated build() method in
MockMvcWebClientBuilder to replace createWebClient(). In addition, the
configureWebClient() method has been renamed to withDelegate() and now
returns the builder for further customization.

This commit also overhauls the constructor and class-level Javadoc in
MockMvcWebClientBuilder for greater clarity to end users.

Issues SPR-13158
This commit is contained in:
Sam Brannen
2015-07-27 19:27:15 +02:00
parent 288d253b8b
commit 3b84a7e84d
3 changed files with 79 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package org.springframework.test.web.servlet.htmlunit;
import java.io.IOException;
import java.net.URL;
import javax.servlet.http.HttpServletRequest;
import org.junit.Before;
@@ -42,14 +43,15 @@ import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.WebRequest;
import com.gargoylesoftware.htmlunit.WebResponse;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder.*;
/**
* Integration tests for {@link MockMvcWebClientBuilder}.
*
* @author Rob Winch
* @author Sam Brannen
* @since 4.2
*/
@RunWith(SpringJUnit4ClassRunner.class)
@@ -57,7 +59,7 @@ import static org.junit.Assert.assertThat;
@WebAppConfiguration
public class MockMvcWebClientBuilderTests {
private WebClient webClient = new WebClient();
private WebClient webClient;
@Autowired
private WebApplicationContext wac;
@@ -81,27 +83,20 @@ public class MockMvcWebClientBuilderTests {
}
@Test
public void mockMvcSetupAndConfigureWebClient() throws Exception {
Assume.group(TestGroup.PERFORMANCE);
this.webClient = MockMvcWebClientBuilder
.mockMvcSetup(this.mockMvc)
.configureWebClient(this.webClient);
public void mockMvcSetupWithDefaultWebClientDelegate() throws Exception {
this.webClient = mockMvcSetup(this.mockMvc).build();
assertMvcProcessed("http://localhost/test");
assertDelegateProcessed("http://example.com/");
Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("http://example.com/"));
}
@Test
public void mockMvcSetupAndCreateWebClient() throws Exception {
Assume.group(TestGroup.PERFORMANCE);
this.webClient = MockMvcWebClientBuilder
.mockMvcSetup(this.mockMvc)
.createWebClient();
public void mockMvcSetupWithCustomWebClientDelegate() throws Exception {
WebClient preconfiguredWebClient = new WebClient();
this.webClient = mockMvcSetup(this.mockMvc).withDelegate(preconfiguredWebClient).build();
assertMvcProcessed("http://localhost/test");
assertDelegateProcessed("http://example.com/");
Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("http://example.com/"));
}
private void assertMvcProcessed(String url) throws Exception {