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

Polishing 

(cherry picked from commit 9475c06)
This commit is contained in:
Juergen Hoeller 2016-08-09 12:29:15 +02:00
parent 4627545a3b
commit aade2d1ec9
8 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,8 @@ public class DefaultRequestExpectation implements RequestExpectation {
* @param expectedCount the expected request expectedCount
*/
public DefaultRequestExpectation(ExpectedCount expectedCount, RequestMatcher requestMatcher) {
Assert.notNull(expectedCount, "'expectedCount' is required");
Assert.notNull(requestMatcher, "'requestMatcher' is required");
Assert.notNull(expectedCount, "ExpectedCount is required");
Assert.notNull(requestMatcher, "RequestMatcher is required");
this.requestCount = new RequestCount(expectedCount);
this.requestMatchers.add(requestMatcher);
}

6
spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
View File

@ -33,6 +33,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.util.Assert;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@ -50,6 +51,7 @@ public class MockMvcClientHttpRequestFactory implements ClientHttpRequestFactory
public MockMvcClientHttpRequestFactory(MockMvc mockMvc) {
Assert.notNull(mockMvc, "MockMvc must not be null");
this.mockMvc = mockMvc;
}
@ -63,17 +65,13 @@ public class MockMvcClientHttpRequestFactory implements ClientHttpRequestFactory
MockHttpServletRequestBuilder requestBuilder = request(httpMethod, uri.toString());
requestBuilder.content(getBodyAsBytes());
requestBuilder.headers(getHeaders());
MvcResult mvcResult = MockMvcClientHttpRequestFactory.this.mockMvc.perform(requestBuilder).andReturn();
MockHttpServletResponse servletResponse = mvcResult.getResponse();
HttpStatus status = HttpStatus.valueOf(servletResponse.getStatus());
byte[] body = servletResponse.getContentAsByteArray();
HttpHeaders headers = getResponseHeaders(servletResponse);
MockClientHttpResponse clientResponse = new MockClientHttpResponse(body, status);
clientResponse.getHeaders().putAll(headers);
return clientResponse;
}
catch (Exception ex) {

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

@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* 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.
@ -32,7 +32,7 @@ import org.springframework.http.client.ClientHttpRequest;
public interface RequestMatcher {
/**
* Match the given request against some expectations.
* Match the given request against specific expectations.
* @param request the request to make assertions on
* @throws IOException in case of I/O errors
* @throws AssertionError if expectations are not met

1
spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
View File

@ -58,6 +58,7 @@ public class ContentRequestMatchers {
this.xmlHelper = new XmlExpectationsHelper();
}
/**
* Assert the request content type as a String.
*/

9
spring-test/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* 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.
@ -19,6 +19,7 @@ package org.springframework.test.web.client.match;
import java.io.IOException;
import java.text.ParseException;
import com.jayway.jsonpath.JsonPath;
import org.hamcrest.Matcher;
import org.springframework.http.client.ClientHttpRequest;
@ -26,8 +27,6 @@ import org.springframework.mock.http.client.MockClientHttpRequest;
import org.springframework.test.util.JsonPathExpectationsHelper;
import org.springframework.test.web.client.RequestMatcher;
import com.jayway.jsonpath.JsonPath;
/**
* Factory for assertions on the request content using
* <a href="https://github.com/jayway/JsonPath">JsonPath</a> expressions.
@ -235,8 +234,8 @@ public class JsonPathRequestMatchers {
MockClientHttpRequest mockRequest = (MockClientHttpRequest) request;
matchInternal(mockRequest);
}
catch (ParseException e) {
throw new AssertionError("Failed to parse JSON request content: " + e.getMessage());
catch (ParseException ex) {
throw new AssertionError("Failed to parse JSON request content: " + ex.getMessage());
}
}

6
spring-test/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* 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.
@ -46,12 +46,10 @@ public class XpathRequestMatchers {
* Class constructor, not for direct instantiation. Use
* {@link MockRestRequestMatchers#xpath(String, Object...)} or
* {@link MockRestRequestMatchers#xpath(String, Map, Object...)}.
*
* @param expression the XPath expression
* @param namespaces XML namespaces referenced in the XPath expression, or {@code null}
* @param args arguments to parameterize the XPath expression with using the
* formatting specifiers defined in {@link String#format(String, Object...)}
*
* @throws XPathExpressionException
*/
protected XpathRequestMatchers(String expression, Map<String, String> namespaces, Object ... args)
@ -60,6 +58,7 @@ public class XpathRequestMatchers {
this.xpathHelper = new XpathExpectationsHelper(expression, namespaces, args);
}
/**
* Apply the XPath and assert it with the given {@code Matcher<Node>}.
*/
@ -199,7 +198,6 @@ public class XpathRequestMatchers {
}
protected abstract void matchInternal(MockClientHttpRequest request) throws Exception;
}
}

33
spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
View File

@ -42,14 +42,14 @@ public class DefaultResponseCreator implements ResponseCreator {
private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
private HttpStatus statusCode;
private byte[] content;
private Resource contentResource;
private final HttpHeaders headers = new HttpHeaders();
private HttpStatus statusCode;
/**
* Protected constructor.
@ -61,20 +61,6 @@ public class DefaultResponseCreator implements ResponseCreator {
}
@Override
public ClientHttpResponse createResponse(ClientHttpRequest request) throws IOException {
MockClientHttpResponse response;
if (this.contentResource != null) {
InputStream stream = this.contentResource.getInputStream();
response = new MockClientHttpResponse(stream, this.statusCode);
}
else {
response = new MockClientHttpResponse(this.content, this.statusCode);
}
response.getHeaders().putAll(this.headers);
return response;
}
/**
* Set the body as a UTF-8 String.
*/
@ -129,4 +115,19 @@ public class DefaultResponseCreator implements ResponseCreator {
return this;
}
@Override
public ClientHttpResponse createResponse(ClientHttpRequest request) throws IOException {
MockClientHttpResponse response;
if (this.contentResource != null) {
InputStream stream = this.contentResource.getInputStream();
response = new MockClientHttpResponse(stream, this.statusCode);
}
else {
response = new MockClientHttpResponse(this.content, this.statusCode);
}
response.getHeaders().putAll(this.headers);
return response;
}
}

6
spring-test/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* 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.
@ -33,10 +33,6 @@ import org.springframework.test.web.client.ResponseCreator;
*/
public abstract class MockRestResponseCreators {
private MockRestResponseCreators() {
}
/**
* {@code ResponseCreator} for a 200 response (OK).
*/