root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

SimpleRequestExpectationManager properly handles sequential requests with different count 

Issue: SPR-15672
This commit is contained in:
Juergen Hoeller 2017-06-16 13:32:43 +02:00
parent d5f9ad03a7
commit efb735aa99
4 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
View File

@ -39,6 +39,7 @@ import org.springframework.util.Assert;
* to expectations following the order of declaration or not. * to expectations following the order of declaration or not.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Juergen Hoeller
* @since 4.3 * @since 4.3
*/ */
public abstract class AbstractRequestExpectationManager implements RequestExpectationManager { public abstract class AbstractRequestExpectationManager implements RequestExpectationManager {
@ -47,8 +48,6 @@ public abstract class AbstractRequestExpectationManager implements RequestExpect
private final List<ClientHttpRequest> requests = new LinkedList<>(); private final List<ClientHttpRequest> requests = new LinkedList<>();
private final Object lock = new Object();
protected List<RequestExpectation> getExpectations() { protected List<RequestExpectation> getExpectations() {
return this.expectations; return this.expectations;
@ -69,12 +68,13 @@ public abstract class AbstractRequestExpectationManager implements RequestExpect
@Override @Override
public ClientHttpResponse validateRequest(ClientHttpRequest request) throws IOException { public ClientHttpResponse validateRequest(ClientHttpRequest request) throws IOException {
synchronized (this.lock) { List<ClientHttpRequest> requests = getRequests();
if (getRequests().isEmpty()) { synchronized (requests) {
if (requests.isEmpty()) {
afterExpectationsDeclared(); afterExpectationsDeclared();
} }
ClientHttpResponse response = validateRequestInternal(request); ClientHttpResponse response = validateRequestInternal(request);
getRequests().add(request); requests.add(request);
return response; return response;
} }
} }
@ -188,7 +188,7 @@ public abstract class AbstractRequestExpectationManager implements RequestExpect
} }
public void reset() { public void reset() {
this.expectations.clear(); getExpectations().clear();
} }
} }

4
spring-test/src/main/java/org/springframework/test/web/client/RequestExpectationManager.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -45,7 +45,7 @@ public interface RequestExpectationManager {
* @param request the request * @param request the request
* @return the response to return if the request was validated. * @return the response to return if the request was validated.
* @throws AssertionError when some expectations were not met * @throws AssertionError when some expectations were not met
* @throws IOException * @throws IOException in case of any validation errors
*/ */
ClientHttpResponse validateRequest(ClientHttpRequest request) throws IOException; ClientHttpResponse validateRequest(ClientHttpRequest request) throws IOException;

21
spring-test/src/main/java/org/springframework/test/web/client/SimpleRequestExpectationManager.java
View File

@ -32,6 +32,7 @@ import org.springframework.util.Assert;
* Subsequent request executions may be inserted anywhere thereafter. * Subsequent request executions may be inserted anywhere thereafter.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Juergen Hoeller
* @since 4.3 * @since 4.3
*/ */
public class SimpleRequestExpectationManager extends AbstractRequestExpectationManager { public class SimpleRequestExpectationManager extends AbstractRequestExpectationManager {
@ -49,29 +50,19 @@ public class SimpleRequestExpectationManager extends AbstractRequestExpectationM
@Override @Override
public ClientHttpResponse validateRequestInternal(ClientHttpRequest request) throws IOException { public ClientHttpResponse validateRequestInternal(ClientHttpRequest request) throws IOException {
RequestExpectation expectation; RequestExpectation expectation = this.repeatExpectations.findExpectation(request);
try {
expectation = next(request);
expectation.match(request);
}
catch (AssertionError error) {
expectation = this.repeatExpectations.findExpectation(request);
if (expectation == null) { if (expectation == null) {
throw error; if (!this.expectationIterator.hasNext()) {
throw createUnexpectedRequestError(request);
} }
expectation = this.expectationIterator.next();
expectation.match(request);
} }
ClientHttpResponse response = expectation.createResponse(request); ClientHttpResponse response = expectation.createResponse(request);
this.repeatExpectations.update(expectation); this.repeatExpectations.update(expectation);
return response; return response;
} }
private RequestExpectation next(ClientHttpRequest request) {
if (this.expectationIterator.hasNext()) {
return this.expectationIterator.next();
}
throw createUnexpectedRequestError(request);
}
@Override @Override
public void reset() { public void reset() {
super.reset(); super.reset();

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,26 +25,22 @@ import org.junit.rules.ExpectedException;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpRequest;
import org.springframework.mock.http.client.MockClientHttpRequest;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.*;
import static org.springframework.http.HttpMethod.GET; import static org.springframework.http.HttpMethod.*;
import static org.springframework.http.HttpMethod.POST; import static org.springframework.test.web.client.ExpectedCount.*;
import static org.springframework.test.web.client.ExpectedCount.max; import static org.springframework.test.web.client.match.MockRestRequestMatchers.*;
import static org.springframework.test.web.client.ExpectedCount.min; import static org.springframework.test.web.client.response.MockRestResponseCreators.*;
import static org.springframework.test.web.client.ExpectedCount.once;
import static org.springframework.test.web.client.ExpectedCount.times;
import static org.springframework.test.web.client.ExpectedCount.twice;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
/** /**
* Unit tests for {@link SimpleRequestExpectationManager}. * Unit tests for {@link SimpleRequestExpectationManager}.
*
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
*/ */
public class SimpleRequestExpectationManagerTests { public class SimpleRequestExpectationManagerTests {
private SimpleRequestExpectationManager manager = new SimpleRequestExpectationManager(); private final SimpleRequestExpectationManager manager = new SimpleRequestExpectationManager();
@Rule @Rule
public ExpectedException thrown = ExpectedException.none(); public ExpectedException thrown = ExpectedException.none();
@ -162,11 +158,21 @@ public class SimpleRequestExpectationManagerTests {
this.manager.validateRequest(createRequest(POST, "/foo")); this.manager.validateRequest(createRequest(POST, "/foo"));
} }
@Test // SPR-15672
public void sequentialRequestsWithDifferentCount() throws Exception {
this.manager.expectRequest(times(2), requestTo("/foo")).andExpect(method(GET)).andRespond(withSuccess());
this.manager.expectRequest(once(), requestTo("/bar")).andExpect(method(GET)).andRespond(withSuccess());
this.manager.validateRequest(createRequest(GET, "/foo"));
this.manager.validateRequest(createRequest(GET, "/foo"));
this.manager.validateRequest(createRequest(GET, "/bar"));
}
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
private ClientHttpRequest createRequest(HttpMethod method, String url) { private ClientHttpRequest createRequest(HttpMethod method, String url) {
try { try {
return new org.springframework.mock.http.client.MockAsyncClientHttpRequest(method, new URI(url)); return new MockClientHttpRequest(method, new URI(url));
} }
catch (URISyntaxException ex) { catch (URISyntaxException ex) {
throw new IllegalStateException(ex); throw new IllegalStateException(ex);