Introduce RequestExpectationManager
This commit factors out the logic to declare and manage expectations including matching them to requests and verifying at the end behind a commong abstraction. MockRestServiceServer delegates to the new abstraction and is no longer aware of how that's done. There are two implementations, one for ordered and another for unordered expectation. Issue: SPR-11365
This commit is contained in:
Rossen Stoyanchev
@@ -1,100 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2014 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.test.web.client;
|
||||
|
||||
import java.net.URI;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.springframework.http.HttpMethod;
|
||||
import org.springframework.http.client.ClientHttpRequest;
|
||||
import org.springframework.http.client.ClientHttpRequestFactory;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import static org.springframework.test.web.client.match.MockRestRequestMatchers.*;
|
||||
|
||||
/**
|
||||
* Tests for
|
||||
* {@link org.springframework.test.web.client.MockMvcClientHttpRequestFactory}.
|
||||
*
|
||||
* @author Rossen Stoyanchev
|
||||
*/
|
||||
public class MockClientHttpRequestFactoryTests {
|
||||
|
||||
private MockRestServiceServer server;
|
||||
|
||||
private ClientHttpRequestFactory factory;
|
||||
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
RestTemplate restTemplate = new RestTemplate();
|
||||
this.server = MockRestServiceServer.createServer(restTemplate);
|
||||
this.factory = restTemplate.getRequestFactory();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createRequest() throws Exception {
|
||||
URI uri = new URI("/foo");
|
||||
ClientHttpRequest actual = this.factory.createRequest(uri, HttpMethod.GET);
|
||||
|
||||
assertEquals(uri, actual.getURI());
|
||||
assertEquals(HttpMethod.GET, actual.getMethod());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void noFurtherRequestsExpected() throws Exception {
|
||||
try {
|
||||
this.factory.createRequest(new URI("/foo"), HttpMethod.GET);
|
||||
}
|
||||
catch (AssertionError error) {
|
||||
assertEquals("No further requests expected: HTTP GET /foo", error.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void verifyZeroExpected() throws Exception {
|
||||
this.server.verify();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void verifyExpectedEqualExecuted() throws Exception {
|
||||
this.server.expect(anything());
|
||||
this.server.expect(anything());
|
||||
|
||||
this.factory.createRequest(new URI("/foo"), HttpMethod.GET);
|
||||
this.factory.createRequest(new URI("/bar"), HttpMethod.POST);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void verifyMoreExpected() throws Exception {
|
||||
this.server.expect(anything());
|
||||
this.server.expect(anything());
|
||||
|
||||
this.factory.createRequest(new URI("/foo"), HttpMethod.GET);
|
||||
|
||||
try {
|
||||
this.server.verify();
|
||||
}
|
||||
catch (AssertionError error) {
|
||||
assertTrue(error.getMessage(), error.getMessage().contains("1 out of 2 were executed"));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
/*
|
||||
* Copyright 2002-2016 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.test.web.client;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import org.springframework.http.HttpMethod;
|
||||
import org.springframework.http.client.ClientHttpRequest;
|
||||
import org.springframework.mock.http.client.MockAsyncClientHttpRequest;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.springframework.test.web.client.match.MockRestRequestMatchers.anything;
|
||||
import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
|
||||
|
||||
/**
|
||||
* Unit tests for {@link AbstractRequestExpectationManager}.
|
||||
* @author Rossen Stoyanchev
|
||||
*/
|
||||
public class OrderedRequestExpectationManagerTests {
|
||||
|
||||
private OrderedRequestExpectationManager manager = new OrderedRequestExpectationManager();
|
||||
|
||||
|
||||
@Test
|
||||
public void validateWithUnexpectedRequest() throws Exception {
|
||||
try {
|
||||
this.manager.validateRequest(request(HttpMethod.GET, "/foo"));
|
||||
}
|
||||
catch (AssertionError error) {
|
||||
assertEquals("No further requests expected: HTTP GET /foo", error.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void verify() throws Exception {
|
||||
this.manager.expectRequest(anything()).andRespond(withSuccess());
|
||||
this.manager.expectRequest(anything()).andRespond(withSuccess());
|
||||
|
||||
this.manager.validateRequest(request(HttpMethod.GET, "/foo"));
|
||||
this.manager.validateRequest(request(HttpMethod.POST, "/bar"));
|
||||
this.manager.verify();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void verifyWithZeroExpectations() throws Exception {
|
||||
this.manager.verify();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void verifyWithRemainingExpectations() throws Exception {
|
||||
this.manager.expectRequest(anything()).andRespond(withSuccess());
|
||||
this.manager.expectRequest(anything()).andRespond(withSuccess());
|
||||
|
||||
this.manager.validateRequest(request(HttpMethod.GET, "/foo"));
|
||||
try {
|
||||
this.manager.verify();
|
||||
}
|
||||
catch (AssertionError error) {
|
||||
assertTrue(error.getMessage(), error.getMessage().contains("1 out of 2 were executed"));
|
||||
}
|
||||
}
|
||||
|
||||
private ClientHttpRequest request(HttpMethod method, String url) {
|
||||
try {
|
||||
return new MockAsyncClientHttpRequest(method, new URI(url));
|
||||
}
|
||||
catch (URISyntaxException ex) {
|
||||
throw new IllegalStateException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user