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

Tests for non-required MultipartFile parameters 

Issue: SPR-16329
This commit is contained in:
Juergen Hoeller 2018-01-11 10:22:59 +01:00
parent 121f9e3734
commit 8f6d3feaa0
1 changed files with 64 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@ -71,6 +71,13 @@ public class MultipartControllerTests {
.andExpect(model().attribute("jsonContent", Collections.singletonMap("name", "yeeeah")));
}
@Test
public void multipartRequestWithSingleFileNotPresent() throws Exception {
standaloneSetup(new MultipartController()).build()
.perform(multipart("/multipartfile"))
.andExpect(status().isFound());
}
@Test
public void multipartRequestWithFileArray() throws Exception {
byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8);
@ -87,6 +94,20 @@ public class MultipartControllerTests {
.andExpect(model().attribute("jsonContent", Collections.singletonMap("name", "yeeeah")));
}
@Test
public void multipartRequestWithFileArrayNotPresent() throws Exception {
standaloneSetup(new MultipartController()).build()
.perform(multipart("/multipartfilearray"))
.andExpect(status().isFound());
}
@Test
public void multipartRequestWithFileArrayNoMultipart() throws Exception {
standaloneSetup(new MultipartController()).build()
.perform(post("/multipartfilearray"))
.andExpect(status().isFound());
}
@Test
public void multipartRequestWithFileList() throws Exception {
byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8);
@ -103,6 +124,20 @@ public class MultipartControllerTests {
.andExpect(model().attribute("jsonContent", Collections.singletonMap("name", "yeeeah")));
}
@Test
public void multipartRequestWithFileListNotPresent() throws Exception {
standaloneSetup(new MultipartController()).build()
.perform(multipart("/multipartfilelist"))
.andExpect(status().isFound());
}
@Test
public void multipartRequestWithFileListNoMultipart() throws Exception {
standaloneSetup(new MultipartController()).build()
.perform(post("/multipartfilelist"))
.andExpect(status().isFound());
}
@Test
public void multipartRequestWithOptionalFile() throws Exception {
byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8);
@ -219,35 +254,47 @@ public class MultipartControllerTests {
private static class MultipartController {
@RequestMapping(value = "/multipartfile", method = RequestMethod.POST)
public String processMultipartFile(@RequestParam MultipartFile file,
@RequestPart Map<String, String> json, Model model) throws IOException {
public String processMultipartFile(@RequestParam(required = false) MultipartFile file,
@RequestPart(required = false) Map<String, String> json, Model model) throws IOException {
model.addAttribute("fileContent", file.getBytes());
model.addAttribute("jsonContent", json);
if (file != null) {
model.addAttribute("fileContent", file.getBytes());
}
if (json != null) {
model.addAttribute("jsonContent", json);
}
return "redirect:/index";
}
@RequestMapping(value = "/multipartfilearray", method = RequestMethod.POST)
public String processMultipartFileArray(@RequestParam MultipartFile[] file,
@RequestPart Map<String, String> json, Model model) throws IOException {
public String processMultipartFileArray(@RequestParam(required = false) MultipartFile[] file,
@RequestPart(required = false) Map<String, String> json, Model model) throws IOException {
byte[] content = file[0].getBytes();
Assert.assertArrayEquals(content, file[1].getBytes());
model.addAttribute("fileContent", content);
model.addAttribute("jsonContent", json);
if (file != null && file.length > 0) {
byte[] content = file[0].getBytes();
Assert.assertArrayEquals(content, file[1].getBytes());
model.addAttribute("fileContent", content);
}
if (json != null) {
model.addAttribute("jsonContent", json);
}
return "redirect:/index";
}
@RequestMapping(value = "/multipartfilelist", method = RequestMethod.POST)
public String processMultipartFileList(@RequestParam List<MultipartFile> file,
@RequestPart Map<String, String> json, Model model) throws IOException {
public String processMultipartFileList(@RequestParam(required = false) List<MultipartFile> file,
@RequestPart(required = false) Map<String, String> json, Model model) throws IOException {
byte[] content = file.get(0).getBytes();
Assert.assertArrayEquals(content, file.get(1).getBytes());
model.addAttribute("fileContent", content);
model.addAttribute("jsonContent", json);
if (file != null && !file.isEmpty()) {
byte[] content = file.get(0).getBytes();
Assert.assertArrayEquals(content, file.get(1).getBytes());
model.addAttribute("fileContent", content);
}
if (json != null) {
model.addAttribute("jsonContent", json);
}
return "redirect:/index";
}