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

Polish

Browse Source
This commit is contained in:
Rossen Stoyanchev
2017-08-15 15:08:23 +02:00
parent 809189be1a
commit ea2864c73e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
View File

@@ -31,9 +31,10 @@ import org.springframework.util.Assert;
import org.springframework.util.MultiValueMap;
import org.springframework.web.util.UriComponentsBuilder;
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNotNull;
import static org.springframework.test.util.AssertionErrors.*;
import static org.springframework.test.util.AssertionErrors.assertEquals;
import static org.springframework.test.util.AssertionErrors.assertTrue;
/**
* Static factory methods for {@link RequestMatcher} classes. Typically used to
@@ -77,7 +78,7 @@ public abstract class MockRestRequestMatchers {
}
/**
* Assert the request URI string.
* Assert the request URI matches the given string.
* @param expectedUri the expected URI
* @return the request matcher
*/
@@ -87,15 +88,17 @@ public abstract class MockRestRequestMatchers {
}
/**
* Assert the request URI string.
* @param expectedUri the expected URI
* Variant of {@link #requestTo(URI)} that prepares the URI from a URI
* template plus optional variables via {@link UriComponentsBuilder}
* including encoding.
* @param expectedUri the expected URI template
* @param uriVars zero or more URI variables to populate the expected URI
* @return the request matcher
*/
public static RequestMatcher requestToUriTemplate(final String expectedUri, final Object... uriVars) {
Assert.notNull(expectedUri, "'uri' must not be null");
String uri = UriComponentsBuilder.fromUriString(expectedUri).buildAndExpand(uriVars).encode().toString();
return request -> assertEquals("Request URI", uri, request.getURI().toString());
URI uri = UriComponentsBuilder.fromUriString(expectedUri).buildAndExpand(uriVars).encode().toUri();
return requestTo(uri);
}
/**