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

Polishing contribution

Browse Source 
See gh-24926
This commit is contained in:
Rossen Stoyanchev
2020-05-06 09:24:39 +01:00
parent e15ed44a68
commit 5883ea2721
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
View File

@@ -120,8 +120,9 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
UriComponents uriComponents = uriComponents();
String path = uriComponents.getPath();
MockHttpServletRequest request = new HtmlUnitMockHttpServletRequest(
servletContext, httpMethod, (path != null ? path : ""));
MockHttpServletRequest request =
new HtmlUnitMockHttpServletRequest(servletContext, httpMethod, (path != null ? path : ""));
parent(request, this.parentBuilder);
String host = uriComponents.getHost();
request.setServerName(host != null ? host : ""); // needs to be first for additional headers
@@ -371,10 +372,9 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
});
for (NameValuePair param : this.webRequest.getRequestParameters()) {
if (param instanceof KeyDataPair) {
KeyDataPair fileParam = (KeyDataPair) param;
File file = fileParam.getFile();
MockPart part = new MockPart(fileParam.getName(), file.getName(), readAllBytes(file));
part.getHeaders().setContentType(MediaType.valueOf(fileParam.getMimeType()));
KeyDataPair pair = (KeyDataPair) param;
MockPart part = new MockPart(pair.getName(), pair.getFile().getName(), readAllBytes(pair.getFile()));
part.getHeaders().setContentType(MediaType.valueOf(pair.getMimeType()));
request.addPart(part);
}
else {