Skip to content

Move requests.add(request) into finally block. #1580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2017
Merged

Move requests.add(request) into finally block. #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .../src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,12 @@ public ClientHttpResponse validateRequest(ClientHttpRequest request) throws IOEx
if (requests.isEmpty()) {
afterExpectationsDeclared();
}
ClientHttpResponse response = validateRequestInternal(request);
requests.add(request);
return response;
try {
return validateRequestInternal(request);
}
finally {
requests.add(request);
}
}
}

Expand Down
19 changes: 19 additions & 0 deletions ...c/test/java/org/springframework/test/web/client/SimpleRequestExpectationManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.test.web.client;

import java.net.SocketException;
import java.net.URI;
import java.net.URISyntaxException;

Expand All @@ -30,6 +31,7 @@
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;
Expand Down Expand Up @@ -184,6 +186,23 @@ public void repeatedRequestsInSequentialOrder() throws Exception {
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 {
Expand Down