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

Move requests.add(request) into finally block.

Browse Source 
This avoids "IllegalStateException: Expectations already declared" when
a MockRestServiceServer is used after one request throws an exception.

Issues: SPR-16132
This commit is contained in:
Eric Pabst
2017-10-30 08:53:13 -06:00
parent 49787493a6
commit 43d88e4a25
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-test/src/test/java/org/springframework/test/web/client/SimpleRequestExpectationManagerTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.test.web.client;
import java.net.SocketException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -30,6 +31,7 @@ import org.springframework.mock.http.client.MockClientHttpRequest;
import static org.junit.Assert.assertEquals;
import static org.springframework.http.HttpMethod.GET;
import static org.springframework.http.HttpMethod.POST;
import static org.springframework.test.util.AssertionErrors.fail;
import static org.springframework.test.web.client.ExpectedCount.max;
import static org.springframework.test.web.client.ExpectedCount.min;
import static org.springframework.test.web.client.ExpectedCount.once;
@@ -184,6 +186,23 @@ public class SimpleRequestExpectationManagerTests {
this.manager.validateRequest(createRequest(GET, "/bar"));
}
@Test // SPR-16132
public void sequentialRequestsWithFirstFailing() throws Exception {
this.manager.expectRequest(once(), requestTo("/foo")).andExpect(method(GET))
.andRespond(request -> { throw new SocketException("pseudo network error"); });
this.manager.expectRequest(once(), requestTo("/handle-error")).andExpect(method(POST)).andRespond(withSuccess());
try {
this.manager.validateRequest(createRequest(GET, "/foo"));
fail("expected exception");
}
catch (SocketException e) {
//expected
}
this.manager.validateRequest(createRequest(POST, "/handle-error"));
this.manager.verify();
}
private ClientHttpRequest createRequest(HttpMethod method, String url) {
try {