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

Revisit MockPart constructors

Browse Source 
Issue: SPR-15854
This commit is contained in:
Juergen Hoeller
2017-09-20 10:55:06 +02:00
parent 4cbef27f90
commit ea01c4113a
4 changed files with 46 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/MultipartControllerTests.java
View File

@@ -16,7 +16,6 @@
package org.springframework.test.web.servlet.samples.standalone;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
@@ -44,10 +43,9 @@ import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.filter.OncePerRequestFilter;
import org.springframework.web.multipart.MultipartFile;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*;
/**
* @author Rossen Stoyanchev
@@ -73,10 +71,10 @@ public class MultipartControllerTests {
@Test
public void multipartRequestWithServletParts() throws Exception {
byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8);
MockPart filePart = new MockPart("file", "orig", new ByteArrayInputStream(fileContent));
MockPart filePart = new MockPart("file", "orig", fileContent);
byte[] json = "{\"name\":\"yeeeah\"}".getBytes(StandardCharsets.UTF_8);
MockPart jsonPart = new MockPart("json", "json", new ByteArrayInputStream(json));
MockPart jsonPart = new MockPart("json", "json", json);
jsonPart.getHeaders().setContentType(MediaType.APPLICATION_JSON);
standaloneSetup(new MultipartController()).build()