From 998b83ce8c8d6cb17dfd6bf57fe81d11e82d03df Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 6 Jun 2016 08:46:50 -0400 Subject: [PATCH] Fix hardcoded value MockRestServiceServerBuilder --- .../web/client/MockRestServiceServer.java | 2 +- .../client/MockRestServiceServerTests.java | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java b/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java index 28fa4c8eb13..aea658e0bbb 100644 --- a/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java +++ b/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java @@ -241,7 +241,7 @@ public class MockRestServiceServer { @Override public MockRestServiceServerBuilder ignoreExpectOrder(boolean ignoreExpectOrder) { - this.ignoreExpectOrder = true; + this.ignoreExpectOrder = ignoreExpectOrder; return this; } diff --git a/spring-test/src/test/java/org/springframework/test/web/client/MockRestServiceServerTests.java b/spring-test/src/test/java/org/springframework/test/web/client/MockRestServiceServerTests.java index ac0de446990..ddf8b26fdb1 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/MockRestServiceServerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/MockRestServiceServerTests.java @@ -54,6 +54,28 @@ public class MockRestServiceServerTests { server.verify(); } + @Test(expected = AssertionError.class) + public void exactExpectOrder() throws Exception { + MockRestServiceServer server = MockRestServiceServer.bindTo(this.restTemplate) + .ignoreExpectOrder(false).build(); + + server.expect(requestTo("/foo")).andRespond(withSuccess()); + server.expect(requestTo("/bar")).andRespond(withSuccess()); + this.restTemplate.getForObject("/bar", Void.class); + } + + @Test + public void ignoreExpectOrder() throws Exception { + MockRestServiceServer server = MockRestServiceServer.bindTo(this.restTemplate) + .ignoreExpectOrder(true).build(); + + server.expect(requestTo("/foo")).andRespond(withSuccess()); + server.expect(requestTo("/bar")).andRespond(withSuccess()); + this.restTemplate.getForObject("/bar", Void.class); + this.restTemplate.getForObject("/foo", Void.class); + server.verify(); + } + @Test public void resetAndReuseServer() throws Exception { MockRestServiceServer server = MockRestServiceServer.bindTo(this.restTemplate).build();