SPR-2784: Support MultipartFile-array property

org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java

@@ -20,8 +20,11 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.List;
 
 import org.springframework.util.Assert;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.portlet.multipart.MultipartActionRequest;
 
@@ -34,12 +37,13 @@ import org.springframework.web.portlet.multipart.MultipartActionRequest;
  * populate these mock requests with files.
  *
  * @author Juergen Hoeller
+ * @author Arjen Poutsma
  * @since 2.0
  * @see org.springframework.mock.web.MockMultipartFile
  */
 public class MockMultipartActionRequest extends MockActionRequest implements MultipartActionRequest {
 
-	private final Map<String, MultipartFile> multipartFiles = new LinkedHashMap<String, MultipartFile>();
+	private final MultiValueMap<String, MultipartFile> multipartFiles = new LinkedMultiValueMap<String, MultipartFile>();
 
 
 	/**
@@ -49,7 +53,7 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul
 	 */
 	public void addFile(MultipartFile file) {
 		Assert.notNull(file, "MultipartFile must not be null");
-		this.multipartFiles.put(file.getName(), file);
+		this.multipartFiles.add(file.getName(), file);
 	}
 
 	public Iterator<String> getFileNames() {
@@ -57,11 +61,24 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul
 	}
 
 	public MultipartFile getFile(String name) {
-		return this.multipartFiles.get(name);
+		return this.multipartFiles.getFirst(name);
+	}
+
+	public List<MultipartFile> getFiles(String name) {
+		List<MultipartFile> multipartFiles = this.multipartFiles.get(name);
+		if (multipartFiles != null) {
+			return multipartFiles;
+		}
+		else {
+			return Collections.emptyList();
+		}
 	}
 
 	public Map<String, MultipartFile> getFileMap() {
-		return Collections.unmodifiableMap(this.multipartFiles);
+		return Collections.unmodifiableMap(this.multipartFiles.toSingleValueMap());
 	}
 
+	public MultiValueMap<String, MultipartFile> getMultiFileMap() {
+		return new LinkedMultiValueMap<String, MultipartFile>(Collections.unmodifiableMap(this.multipartFiles));		 
+	}
 }

org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java

@@ -67,10 +67,13 @@ import org.springframework.web.portlet.multipart.MultipartActionRequest;
 import org.springframework.web.portlet.multipart.PortletMultipartResolver;
 import org.springframework.web.portlet.mvc.Controller;
 import org.springframework.web.portlet.mvc.SimpleControllerHandlerAdapter;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.LinkedMultiValueMap;
 
 /**
  * @author Juergen Hoeller
  * @author Mark Fisher
+ * @author Arjen Poutsma
  */
 public class ComplexPortletApplicationContext extends StaticPortletApplicationContext {
 
@@ -472,8 +475,8 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 				throw new IllegalStateException("Already resolved");
 			}
 			request.setAttribute("resolved", Boolean.TRUE);
-			Map files = new HashMap();
-			files.put("someFile", "someFile");
+			MultiValueMap files = new LinkedMultiValueMap();
+			files.set("someFile", "someFile");
 			Map params = new HashMap();
 			params.put("someParam", "someParam");
 			return new DefaultMultipartActionRequest(request, files, params);