Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
79ded1ca
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 搜索 >>
提交
79ded1ca
编写于
12月 02, 2015
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MockHttpServletResponse.setIntHeader supports 'Content-Length' header as well
Issue: SPR-13752 (cherry picked from commit
a4f5c46f
)
上级
fad0c958
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
22 deletion
+27
-22
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
-9
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
...pringframework/mock/web/test/MockHttpServletResponse.java
+13
-10
未找到文件。
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
浏览文件 @
79ded1ca
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -506,11 +506,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
浏览文件 @
79ded1ca
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -122,6 +122,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"
;
...
...
@@ -221,20 +228,14 @@ public class MockHttpServletResponseTests {
assertEquals
(
redirectUrl
,
response
.
getRedirectedUrl
());
}
/**
* 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
浏览文件 @
79ded1ca
/*
* Copyright 2002-201
3
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -71,7 +71,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
private
boolean
charset
=
false
;
private
final
ByteArrayOutputStream
content
=
new
ByteArrayOutputStream
();
private
final
ByteArrayOutputStream
content
=
new
ByteArrayOutputStream
(
1024
);
private
final
ServletOutputStream
outputStream
=
new
ResponseServletOutputStream
(
this
.
content
);
...
...
@@ -189,8 +189,8 @@ public class MockHttpServletResponse implements HttpServletResponse {
public
String
getContentAsString
()
throws
UnsupportedEncodingException
{
flushBuffer
();
return
(
this
.
characterEncoding
!=
null
)
?
this
.
content
.
toString
(
this
.
characterEncoding
)
:
this
.
content
.
toString
();
return
(
this
.
characterEncoding
!=
null
?
this
.
content
.
toString
(
this
.
characterEncoding
)
:
this
.
content
.
toString
()
)
;
}
@Override
...
...
@@ -218,8 +218,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
if
(
contentType
!=
null
)
{
int
charsetIndex
=
contentType
.
toLowerCase
().
indexOf
(
CHARSET_PREFIX
);
if
(
charsetIndex
!=
-
1
)
{
String
encoding
=
contentType
.
substring
(
charsetIndex
+
CHARSET_PREFIX
.
length
());
this
.
characterEncoding
=
encoding
;
this
.
characterEncoding
=
contentType
.
substring
(
charsetIndex
+
CHARSET_PREFIX
.
length
());
this
.
charset
=
true
;
}
updateContentTypeHeader
();
...
...
@@ -416,11 +415,13 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
@Override
@Deprecated
public
String
encodeUrl
(
String
url
)
{
return
encodeURL
(
url
);
}
@Override
@Deprecated
public
String
encodeRedirectUrl
(
String
url
)
{
return
encodeRedirectURL
(
url
);
}
...
...
@@ -505,11 +506,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
{
...
...
@@ -534,14 +536,15 @@ public class MockHttpServletResponse implements HttpServletResponse {
@Override
public
void
setStatus
(
int
status
)
{
if
(!
this
.
isCommitted
())
{
if
(!
this
.
isCommitted
())
{
this
.
status
=
status
;
}
}
@Override
@Deprecated
public
void
setStatus
(
int
status
,
String
errorMessage
)
{
if
(!
this
.
isCommitted
())
{
if
(!
this
.
isCommitted
())
{
this
.
status
=
status
;
this
.
errorMessage
=
errorMessage
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录