master
Sam Brannen 9 years ago
parent 43e36e2dee
commit 2afbfb2c0d
  1. 14
      spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
  2. 23
      spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java

@ -876,16 +876,18 @@ public class MockHttpServletRequest implements HttpServletRequest {
/** /**
* Add a header entry for the given name. * Add a header entry for the given name.
* <p>While this method can take any {@code Object} as a parameter, * <p>While this method can take any {@code Object} as a parameter, it
* it is recommended to use the following types: * is recommended to use the following types:
* <ul> * <ul>
* <li>String or any Object to be converted using {@code toString}, see {@link #getHeader} </li> * <li>String or any Object to be converted using {@code toString()}; see {@link #getHeader}.</li>
* <li>String, Number or Date for date headers, see {@link #getDateHeader}</li> * <li>String, Number, or Date for date headers; see {@link #getDateHeader}.</li>
* <li>String or Number for integer headers, see {@link #getIntHeader}</li> * <li>String or Number for integer headers; see {@link #getIntHeader}.</li>
* <li>{@code String[]} and {@code Collection<String>} for multiple values, see {@link #getHeaders}</li> * <li>{@code String[]} or {@code Collection<String>} for multiple values; see {@link #getHeaders}.</li>
* </ul> * </ul>
* @see #getHeaderNames * @see #getHeaderNames
* @see #getHeaders * @see #getHeaders
* @see #getHeader
* @see #getDateHeader
*/ */
public void addHeader(String name, Object value) { public void addHeader(String name, Object value) {
if (CONTENT_TYPE_HEADER.equalsIgnoreCase(name)) { if (CONTENT_TYPE_HEADER.equalsIgnoreCase(name)) {

@ -134,7 +134,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
"EEE MMM dd HH:mm:ss yyyy" "EEE MMM dd HH:mm:ss yyyy"
}; };
private static TimeZone GMT = TimeZone.getTimeZone("GMT"); private static final TimeZone GMT = TimeZone.getTimeZone("GMT");
private boolean active = true; private boolean active = true;
@ -696,7 +697,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
} }
/** /**
* Returns the first preferred {@linkplain Locale locale} configured * Return the first preferred {@linkplain Locale locale} configured
* in this mock request. * in this mock request.
* <p>If no locales have been explicitly configured, the default, * <p>If no locales have been explicitly configured, the default,
* preferred {@link Locale} for the <em>server</em> mocked by this * preferred {@link Locale} for the <em>server</em> mocked by this
@ -714,7 +715,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
} }
/** /**
* Returns an {@linkplain Enumeration enumeration} of the preferred * Return an {@linkplain Enumeration enumeration} of the preferred
* {@linkplain Locale locales} configured in this mock request. * {@linkplain Locale locales} configured in this mock request.
* <p>If no locales have been explicitly configured, the default, * <p>If no locales have been explicitly configured, the default,
* preferred {@link Locale} for the <em>server</em> mocked by this * preferred {@link Locale} for the <em>server</em> mocked by this
@ -743,7 +744,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
} }
/** /**
* Returns {@code true} if the {@link #setSecure secure} flag has been set * Return {@code true} if the {@link #setSecure secure} flag has been set
* to {@code true} or if the {@link #getScheme scheme} is {@code https}. * to {@code true} or if the {@link #getScheme scheme} is {@code https}.
* @see javax.servlet.ServletRequest#isSecure() * @see javax.servlet.ServletRequest#isSecure()
*/ */
@ -875,16 +876,18 @@ public class MockHttpServletRequest implements HttpServletRequest {
/** /**
* Add a header entry for the given name. * Add a header entry for the given name.
* <p>While this method can take any {@code Object} as a parameter, * <p>While this method can take any {@code Object} as a parameter, it
* it is recommended to use the following types: * is recommended to use the following types:
* <ul> * <ul>
* <li>String or any Object to be converted using {@code toString}, see {@link #getHeader}</li> * <li>String or any Object to be converted using {@code toString()}; see {@link #getHeader}.</li>
* <li>String, Number or Date for date headers, see {@link #getDateHeader}</li> * <li>String, Number, or Date for date headers; see {@link #getDateHeader}.</li>
* <li>String or Number for integer headers, see {@link #getIntHeader}</li> * <li>String or Number for integer headers; see {@link #getIntHeader}.</li>
* <li>{@code String[]} and {@code Collection<String>} for multiple values, see {@link #getHeaders}</li> * <li>{@code String[]} or {@code Collection<String>} for multiple values; see {@link #getHeaders}.</li>
* </ul> * </ul>
* @see #getHeaderNames * @see #getHeaderNames
* @see #getHeaders * @see #getHeaders
* @see #getHeader
* @see #getDateHeader
*/ */
public void addHeader(String name, Object value) { public void addHeader(String name, Object value) {
if (CONTENT_TYPE_HEADER.equalsIgnoreCase(name)) { if (CONTENT_TYPE_HEADER.equalsIgnoreCase(name)) {

Loading…
Cancel
Save