MockMultipartHttpServletRequest pre-defines method "POST" and content type "multipart/form-data"

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3587 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java

@@ -47,6 +47,12 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 			new LinkedMultiValueMap<String, MultipartFile>();
 
 
+	public MockMultipartHttpServletRequest() {
+		setMethod("POST");
+		setContentType("multipart/form-data");
+	}
+
+
 	/**
 	 * Add a file to this request. The parameter name from the multipart
 	 * form is taken from the {@link MultipartFile#getName()}.

org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -18,13 +18,12 @@ package org.springframework.mock.web;
 
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.util.Assert;
-import org.springframework.util.MultiValueMap;
 import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
@@ -44,7 +43,14 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
  */
 public class MockMultipartHttpServletRequest extends MockHttpServletRequest implements MultipartHttpServletRequest {
 
-	private final MultiValueMap<String, MultipartFile> multipartFiles = new LinkedMultiValueMap<String, MultipartFile>();
+	private final MultiValueMap<String, MultipartFile> multipartFiles =
+			new LinkedMultiValueMap<String, MultipartFile>();
+
+
+	public MockMultipartHttpServletRequest() {
+		setMethod("POST");
+		setContentType("multipart/form-data");
+	}
 
 
 	/**
@@ -58,7 +64,7 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 	}
 
 	public Iterator<String> getFileNames() {
-		return getFileMap().keySet().iterator();
+		return this.multipartFiles.keySet().iterator();
 	}
 
 	public MultipartFile getFile(String name) {
@@ -73,13 +79,14 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 		else {
 			return Collections.emptyList();
 		}
-	}	
+	}
 
 	public Map<String, MultipartFile> getFileMap() {
-		return Collections.unmodifiableMap(this.multipartFiles.toSingleValueMap());
+		return this.multipartFiles.toSingleValueMap();
 	}
 
 	public MultiValueMap<String, MultipartFile> getMultiFileMap() {
-		return new LinkedMultiValueMap<String, MultipartFile>(Collections.unmodifiableMap(this.multipartFiles));
+		return new LinkedMultiValueMap<String, MultipartFile>(this.multipartFiles);
 	}
+
 }

org.springframework.web/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java

@@ -32,14 +32,14 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
  * {@link org.springframework.web.multipart.MultipartHttpServletRequest} interface.
  *
  * <p>Useful for testing application controllers that access multipart uploads.
- * The {@link org.springframework.mock.web.MockMultipartFile} can be used to populate these mock requests
+ * The {@link MockMultipartFile} can be used to populate these mock requests
  * with files.
  *
  * @author Juergen Hoeller
  * @author Eric Crampton
  * @author Arjen Poutsma
  * @since 2.0
- * @see org.springframework.mock.web.MockMultipartFile
+ * @see MockMultipartFile
  */
 public class MockMultipartHttpServletRequest extends MockHttpServletRequest implements MultipartHttpServletRequest {
 
@@ -47,9 +47,15 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 			new LinkedMultiValueMap<String, MultipartFile>();
 
 
+	public MockMultipartHttpServletRequest() {
+		setMethod("POST");
+		setContentType("multipart/form-data");
+	}
+
+
 	/**
 	 * Add a file to this request. The parameter name from the multipart
-	 * form is taken from the {@link org.springframework.web.multipart.MultipartFile#getName()}.
+	 * form is taken from the {@link MultipartFile#getName()}.
 	 * @param file multipart file to be added
 	 */
 	public void addFile(MultipartFile file) {
@@ -83,4 +89,4 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 		return new LinkedMultiValueMap<String, MultipartFile>(this.multipartFiles);
 	}
 
-}
+}