Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
a4f5c46f
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
a4f5c46f
编写于
12月 02, 2015
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MockHttpServletResponse.setIntHeader supports 'Content-Length' header as well
Issue: SPR-13752
上级
4d4d2e29
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
20 deletion
+34
-20
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
...org/springframework/mock/web/MockHttpServletResponse.java
+4
-3
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
...pringframework/mock/web/MockHttpServletResponseTests.java
+10
-12
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
...pringframework/mock/web/test/MockHttpServletResponse.java
+20
-5
未找到文件。
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
浏览文件 @
a4f5c46f
...
...
@@ -154,7 +154,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
* <p>If {@code false}, {@link #getCharacterEncoding()} will return a default encoding value.
*/
public
boolean
isCharset
()
{
return
charset
;
return
this
.
charset
;
}
@Override
...
...
@@ -552,11 +552,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
private
boolean
setSpecialHeader
(
String
name
,
Object
value
)
{
if
(
CONTENT_TYPE_HEADER
.
equalsIgnoreCase
(
name
))
{
setContentType
(
(
String
)
value
);
setContentType
(
value
.
toString
()
);
return
true
;
}
else
if
(
CONTENT_LENGTH_HEADER
.
equalsIgnoreCase
(
name
))
{
setContentLength
(
Integer
.
parseInt
((
String
)
value
));
setContentLength
(
value
instanceof
Number
?
((
Number
)
value
).
intValue
()
:
Integer
.
parseInt
(
value
.
toString
()));
return
true
;
}
else
{
...
...
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
浏览文件 @
a4f5c46f
...
...
@@ -19,7 +19,6 @@ package org.springframework.mock.web;
import
java.io.IOException
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
javax.servlet.http.HttpServletResponse
;
import
org.junit.Test
;
...
...
@@ -92,9 +91,7 @@ public class MockHttpServletResponseTests {
assertEquals
(
"UTF-8"
,
response
.
getCharacterEncoding
());
}
// SPR-12677
@Test
@Test
// SPR-12677
public
void
contentTypeHeaderWithMoreComplexCharsetSyntax
()
{
String
contentType
=
"test/plain;charset=\"utf-8\";foo=\"charset=bar\";foocharset=bar;foo=bar"
;
response
.
setHeader
(
"Content-Type"
,
contentType
);
...
...
@@ -141,6 +138,13 @@ public class MockHttpServletResponseTests {
assertEquals
(
"66"
,
response
.
getHeader
(
"Content-Length"
));
}
@Test
public
void
contentLengthIntHeader
()
{
response
.
addIntHeader
(
"Content-Length"
,
66
);
assertEquals
(
66
,
response
.
getContentLength
());
assertEquals
(
"66"
,
response
.
getHeader
(
"Content-Length"
));
}
@Test
public
void
httpHeaderNameCasingIsPreserved
()
throws
Exception
{
final
String
headerName
=
"Header1"
;
...
...
@@ -269,20 +273,14 @@ public class MockHttpServletResponseTests {
response
.
getDateHeader
(
"Last-Modified"
);
}
/**
* SPR-10414
*/
@Test
@Test
// SPR-10414
public
void
modifyStatusAfterSendError
()
throws
IOException
{
response
.
sendError
(
HttpServletResponse
.
SC_NOT_FOUND
);
response
.
setStatus
(
HttpServletResponse
.
SC_OK
);
assertEquals
(
response
.
getStatus
(),
HttpServletResponse
.
SC_NOT_FOUND
);
}
/**
* SPR-10414
*/
@Test
@Test
// SPR-10414
@SuppressWarnings
(
"deprecation"
)
public
void
modifyStatusMessageAfterSendError
()
throws
IOException
{
response
.
sendError
(
HttpServletResponse
.
SC_NOT_FOUND
);
...
...
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
浏览文件 @
a4f5c46f
...
...
@@ -23,6 +23,7 @@ import java.io.OutputStreamWriter;
import
java.io.PrintWriter
;
import
java.io.UnsupportedEncodingException
;
import
java.io.Writer
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Collection
;
...
...
@@ -32,7 +33,6 @@ import java.util.List;
import
java.util.Locale
;
import
java.util.Map
;
import
java.util.TimeZone
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.Cookie
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -490,16 +490,30 @@ public class MockHttpServletResponse implements HttpServletResponse {
@Override
public
void
setDateHeader
(
String
name
,
long
value
)
{
setHeaderValue
(
name
,
formatDate
(
value
));
}
public
long
getDateHeader
(
String
name
)
{
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
DATE_FORMAT
,
Locale
.
US
);
dateFormat
.
setTimeZone
(
GMT
);
setHeaderValue
(
name
,
dateFormat
.
format
(
new
Date
(
value
)));
try
{
return
dateFormat
.
parse
(
getHeader
(
name
)).
getTime
();
}
catch
(
ParseException
ex
)
{
throw
new
IllegalArgumentException
(
"Value for header '"
+
name
+
"' is not a valid Date: "
+
getHeader
(
name
));
}
}
@Override
public
void
addDateHeader
(
String
name
,
long
value
)
{
addHeaderValue
(
name
,
formatDate
(
value
));
}
private
String
formatDate
(
long
date
)
{
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
DATE_FORMAT
,
Locale
.
US
);
dateFormat
.
setTimeZone
(
GMT
);
setHeaderValue
(
name
,
dateFormat
.
format
(
new
Date
(
value
)
));
return
dateFormat
.
format
(
new
Date
(
date
));
}
@Override
...
...
@@ -538,11 +552,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
private
boolean
setSpecialHeader
(
String
name
,
Object
value
)
{
if
(
CONTENT_TYPE_HEADER
.
equalsIgnoreCase
(
name
))
{
setContentType
(
(
String
)
value
);
setContentType
(
value
.
toString
()
);
return
true
;
}
else
if
(
CONTENT_LENGTH_HEADER
.
equalsIgnoreCase
(
name
))
{
setContentLength
(
Integer
.
parseInt
((
String
)
value
));
setContentLength
(
value
instanceof
Number
?
((
Number
)
value
).
intValue
()
:
Integer
.
parseInt
(
value
.
toString
()));
return
true
;
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录