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

MockRestServiceServerBuilder can be re-used

Browse Source 
Issue: SPR-14306
This commit is contained in:
Rossen Stoyanchev
2016-05-26 09:48:16 -04:00
parent a1851845ad
commit f4ab6d8d52
4 changed files with 91 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
View File

@@ -179,34 +179,35 @@ public class MockRestServiceServer {
}
/**
* Builder to create a {@code MockRestServiceServer}.
*/
public interface MockRestServiceServerBuilder {
/**
* Allow expected requests to be executed in any order not necessarily
* matching the order of declaration. This is a shortcut for:<br>
* {@code builder.expectationManager(new UnorderedRequestExpectationManager)}
* Whether to allow expected requests to be executed in any order not
* necessarily matching the order of declaration.
*
* <p>When set to "true" this is effectively a shortcut for:<br>
* {@code builder.build(new UnorderedRequestExpectationManager)}.
*
* @param ignoreExpectOrder whether to ignore the order of expectations
*/
MockRestServiceServerBuilder ignoreExpectOrder();
MockRestServiceServerBuilder ignoreExpectOrder(boolean ignoreExpectOrder);
/**
* Configure a custom {@code RequestExpectationManager}.
* <p>By default {@link SimpleRequestExpectationManager} is used. It is
* also possible to switch to {@link UnorderedRequestExpectationManager}
* by setting {@link #ignoreExpectOrder()}.
*/
MockRestServiceServerBuilder expectationManager(RequestExpectationManager manager);
/**
* Build the {@code MockRestServiceServer} and setting up the underlying
* Build the {@code MockRestServiceServer} and set up the underlying
* {@code RestTemplate} or {@code AsyncRestTemplate} with a
* {@link ClientHttpRequestFactory} that creates mock requests.
*/
MockRestServiceServer build();
/**
* An overloaded build alternative that accepts a custom
* {@link RequestExpectationManager}.
*/
MockRestServiceServer build(RequestExpectationManager manager);
}
private static class DefaultBuilder implements MockRestServiceServerBuilder {
@@ -215,7 +216,7 @@ public class MockRestServiceServer {
private final AsyncRestTemplate asyncRestTemplate;
private RequestExpectationManager expectationManager = new SimpleRequestExpectationManager();
private boolean ignoreExpectOrder;
public DefaultBuilder(RestTemplate restTemplate) {
@@ -232,21 +233,24 @@ public class MockRestServiceServer {
@Override
public MockRestServiceServerBuilder ignoreExpectOrder() {
expectationManager(new UnorderedRequestExpectationManager());
return this;
}
@Override
public MockRestServiceServerBuilder expectationManager(RequestExpectationManager manager) {
Assert.notNull(manager, "'manager' is required.");
this.expectationManager = manager;
public MockRestServiceServerBuilder ignoreExpectOrder(boolean ignoreExpectOrder) {
this.ignoreExpectOrder = true;
return this;
}
@Override
public MockRestServiceServer build() {
MockRestServiceServer server = new MockRestServiceServer(this.expectationManager);
if (this.ignoreExpectOrder) {
return build(new UnorderedRequestExpectationManager());
}
else {
return build(new SimpleRequestExpectationManager());
}
}
@Override
public MockRestServiceServer build(RequestExpectationManager manager) {
MockRestServiceServer server = new MockRestServiceServer(manager);
MockClientHttpRequestFactory factory = server.new MockClientHttpRequestFactory();
if (this.restTemplate != null) {
this.restTemplate.setRequestFactory(factory);