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

Improve getMultipartContentType in mock request.

Browse Source 
See gh-24074
This commit is contained in:
Frederik Boster
2019-11-25 15:02:13 +01:00
committed by Rossen Stoyanchev
parent 47779df896
commit a15a726fef
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java
View File

@@ -27,6 +27,8 @@ import java.util.Set;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -61,6 +63,24 @@ class MockMultipartHttpServletRequestTests {
doTestMultipartHttpServletRequest(request);
}
@Test
void mockMultiPartHttpServletRequestWithMixedData() {
MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest();
request.addFile(new MockMultipartFile("file", "myOrigFilename", MediaType.TEXT_PLAIN_VALUE, "myContent2".getBytes()));
MockPart metadataPart = new MockPart("metadata", "{\"foo\": \"bar\"}".getBytes());
metadataPart.getHeaders().setContentType(MediaType.APPLICATION_JSON);
request.addPart(metadataPart);
HttpHeaders fileHttpHeaders = request.getMultipartHeaders("file");
assertThat(fileHttpHeaders).isNotNull();
assertThat(fileHttpHeaders.getContentType()).isEqualTo(MediaType.TEXT_PLAIN);
HttpHeaders dataHttpHeaders = request.getMultipartHeaders("metadata");
assertThat(dataHttpHeaders).isNotNull();
assertThat(dataHttpHeaders.getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
}
private void doTestMultipartHttpServletRequest(MultipartHttpServletRequest request) throws IOException {
Set<String> fileNames = new HashSet<>();
Iterator<String> fileIter = request.getFileNames();