Skip to content

Commit 998b83c

Browse files
committed
Fix hardcoded value MockRestServiceServerBuilder
1 parent d7320f4 commit 998b83c

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public DefaultBuilder(AsyncRestTemplate asyncRestTemplate) {
241241

242242
@Override
243243
public MockRestServiceServerBuilder ignoreExpectOrder(boolean ignoreExpectOrder) {
244-
this.ignoreExpectOrder = true;
244+
this.ignoreExpectOrder = ignoreExpectOrder;
245245
return this;
246246
}
247247

spring-test/src/test/java/org/springframework/test/web/client/MockRestServiceServerTests.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,28 @@ public void buildMultipleTimes() throws Exception {
5454
server.verify();
5555
}
5656

57+
@Test(expected = AssertionError.class)
58+
public void exactExpectOrder() throws Exception {
59+
MockRestServiceServer server = MockRestServiceServer.bindTo(this.restTemplate)
60+
.ignoreExpectOrder(false).build();
61+
62+
server.expect(requestTo("/foo")).andRespond(withSuccess());
63+
server.expect(requestTo("/bar")).andRespond(withSuccess());
64+
this.restTemplate.getForObject("/bar", Void.class);
65+
}
66+
67+
@Test
68+
public void ignoreExpectOrder() throws Exception {
69+
MockRestServiceServer server = MockRestServiceServer.bindTo(this.restTemplate)
70+
.ignoreExpectOrder(true).build();
71+
72+
server.expect(requestTo("/foo")).andRespond(withSuccess());
73+
server.expect(requestTo("/bar")).andRespond(withSuccess());
74+
this.restTemplate.getForObject("/bar", Void.class);
75+
this.restTemplate.getForObject("/foo", Void.class);
76+
server.verify();
77+
}
78+
5779
@Test
5880
public void resetAndReuseServer() throws Exception {
5981
MockRestServiceServer server = MockRestServiceServer.bindTo(this.restTemplate).build();

0 commit comments

Comments
 (0)