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

Separate from expectations from response creation

Browse Source 
This commit separates the creation of a response so that it is executed
after the synchronized block inside which requests need to be matched
and validated (for order and count).

This allows a ResponseCreator to be slow or block if it has to.

Issue: SPR-16319
This commit is contained in:
Rossen Stoyanchev
2018-01-17 12:55:52 -05:00
parent 7ab4d0ca08
commit 0c289283ff
6 changed files with 88 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-test/src/test/java/org/springframework/test/web/client/DefaultRequestExpectationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -62,26 +62,26 @@ public class DefaultRequestExpectationTests {
}
@Test
public void hasRemainingCount() throws Exception {
public void hasRemainingCount() {
RequestExpectation expectation = new DefaultRequestExpectation(twice(), requestTo("/foo"));
expectation.andRespond(withSuccess());
expectation.createResponse(createRequest(GET, "/foo"));
expectation.incrementAndValidate();
assertTrue(expectation.hasRemainingCount());
expectation.createResponse(createRequest(GET, "/foo"));
expectation.incrementAndValidate();
assertFalse(expectation.hasRemainingCount());
}
@Test
public void isSatisfied() throws Exception {
public void isSatisfied() {
RequestExpectation expectation = new DefaultRequestExpectation(twice(), requestTo("/foo"));
expectation.andRespond(withSuccess());
expectation.createResponse(createRequest(GET, "/foo"));
expectation.incrementAndValidate();
assertFalse(expectation.isSatisfied());
expectation.createResponse(createRequest(GET, "/foo"));
expectation.incrementAndValidate();
assertTrue(expectation.isSatisfied());
}