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

consistent mocks between modules

Browse Source
This commit is contained in:
Juergen Hoeller
2010-08-15 22:02:40 +00:00
parent 19fcbeafb4
commit 1841b14b21
7 changed files with 269 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
org.springframework.test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
View File

@@ -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,8 @@ 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>();
/**
@@ -58,7 +58,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) {
@@ -74,13 +74,13 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
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);
}
}

20
org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java
View File

@@ -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.
@@ -89,6 +89,8 @@ public class MockServletContext implements ServletContext {
private String contextPath = "";
private int minorVersion = 5;
private final Map<String, ServletContext> contexts = new HashMap<String, ServletContext>();
private final Map<String, String> initParameters = new LinkedHashMap<String, String>();
@@ -97,7 +99,6 @@ public class MockServletContext implements ServletContext {
private String servletContextName = "MockServletContext";
private int minorVersion = 5;
/**
* Create a new MockServletContext, using no base path and a
@@ -181,6 +182,13 @@ public class MockServletContext implements ServletContext {
return 2;
}
public void setMinorVersion(int minorVersion) {
if (minorVersion < 3 || minorVersion > 5) {
throw new IllegalArgumentException("Only Servlet minor versions between 3 and 5 are supported");
}
this.minorVersion = minorVersion;
}
public int getMinorVersion() {
return this.minorVersion;
}
@@ -341,11 +349,6 @@ public class MockServletContext implements ServletContext {
return this.servletContextName;
}
public void setMinorVersion(int minorVersion) {
if (minorVersion <3 || minorVersion > 5)
throw new IllegalArgumentException("Only Servlet minor versions between 3 and 5 are supported");
this.minorVersion = minorVersion;
}
/**
* Inner factory class used to just introduce a Java Activation Framework
@@ -357,4 +360,5 @@ public class MockServletContext implements ServletContext {
return FileTypeMap.getDefaultFileTypeMap().getContentType(filePath);
}
}
}
}

16
org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
View File

@@ -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.portlet;
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.portlet.multipart.MultipartActionRequest;
@@ -43,7 +42,8 @@ import org.springframework.web.portlet.multipart.MultipartActionRequest;
*/
public class MockMultipartActionRequest extends MockActionRequest implements MultipartActionRequest {
private final MultiValueMap<String, MultipartFile> multipartFiles = new LinkedMultiValueMap<String, MultipartFile>();
private final MultiValueMap<String, MultipartFile> multipartFiles =
new LinkedMultiValueMap<String, MultipartFile>();
/**
@@ -57,7 +57,7 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul
}
public Iterator<String> getFileNames() {
return getFileMap().keySet().iterator();
return this.multipartFiles.keySet().iterator();
}
public MultipartFile getFile(String name) {
@@ -75,11 +75,11 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul
}
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);
}
}