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

Polish

Browse Source 
Closes gh-6244
This commit is contained in:
Johnny Lim
2016-06-29 13:51:52 +09:00
committed by Stephane Nicoll
parent f54bec835d
commit 5bc9d5b380
8 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java
View File

@@ -37,7 +37,7 @@ import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriTemplateHandler;
/**
* {@link RequestExpectationManager} that strips any the specified root URI from the
* {@link RequestExpectationManager} that strips the specified root URI from the
* request before verification. Can be used to simply test declarations when all REST
* calls start the same way. For example: <pre class="code">
* RestTemplate restTemplate = new RestTemplateBuilder().rootUri("http://example.com").build();
@@ -107,7 +107,7 @@ public class RootUriRequestExpectationManager implements RequestExpectationManag
/**
* Return a bound {@link MockRestServiceServer} for the given {@link RestTemplate},
* configured with {@link RootUriRequestExpectationManager} when possible.
* @param restTemplate the source reset template
* @param restTemplate the source REST template
* @return a configured {@link MockRestServiceServer}
*/
public static MockRestServiceServer bindTo(RestTemplate restTemplate) {
@@ -117,7 +117,7 @@ public class RootUriRequestExpectationManager implements RequestExpectationManag
/**
* Return a bound {@link MockRestServiceServer} for the given {@link RestTemplate},
* configured with {@link RootUriRequestExpectationManager} when possible.
* @param restTemplate the source reset template
* @param restTemplate the source REST template
* @param expectationManager the source {@link RequestExpectationManager}
* @return a configured {@link MockRestServiceServer}
*/
@@ -132,7 +132,7 @@ public class RootUriRequestExpectationManager implements RequestExpectationManag
* {@link RestTemplate}. If the {@link RestTemplate} is using a
* {@link RootUriTemplateHandler} then a {@link RootUriRequestExpectationManager} is
* returned, otherwise the source manager is returned unchanged.
* @param restTemplate the source reset template
* @param restTemplate the source REST template
* @param expectationManager the source {@link RequestExpectationManager}
* @return a {@link RequestExpectationManager} to be bound to the template
*/

6
spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java
View File

@@ -134,7 +134,7 @@ public class RootUriRequestExpectationManagerTests {
}
@Test
public void bindToShouldReturnMockResetServiceServer() throws Exception {
public void bindToShouldReturnMockRestServiceServer() throws Exception {
RestTemplate restTemplate = new RestTemplateBuilder().build();
MockRestServiceServer bound = RootUriRequestExpectationManager
.bindTo(restTemplate);
@@ -142,7 +142,7 @@ public class RootUriRequestExpectationManagerTests {
}
@Test
public void bindToWithExpectationManagerShouldReturnMockResetServiceServer()
public void bindToWithExpectationManagerShouldReturnMockRestServiceServer()
throws Exception {
RestTemplate restTemplate = new RestTemplateBuilder().build();
MockRestServiceServer bound = RootUriRequestExpectationManager
@@ -161,7 +161,7 @@ public class RootUriRequestExpectationManagerTests {
}
@Test
public void forRestTemplateWhenNotUsingRootUriTemplateHandlerShouldReturnOriginalUriRequestExpectationManager()
public void forRestTemplateWhenNotUsingRootUriTemplateHandlerShouldReturnOriginalRequestExpectationManager()
throws Exception {
RestTemplate restTemplate = new RestTemplateBuilder().build();
RequestExpectationManager actual = RootUriRequestExpectationManager