Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
8738fd7b
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,发现更多精彩内容 >>
提交
8738fd7b
编写于
10月 14, 2009
作者:
A
Arjen Poutsma
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SPR-6177 - HttpHeadersTests fails with non-english locale
上级
74f47493
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
9 deletion
+25
-9
org.springframework.web/src/main/java/org/springframework/http/HttpHeaders.java
...b/src/main/java/org/springframework/http/HttpHeaders.java
+1
-1
org.springframework.web/src/test/java/org/springframework/http/HttpHeadersTests.java
.../test/java/org/springframework/http/HttpHeadersTests.java
+24
-8
未找到文件。
org.springframework.web/src/main/java/org/springframework/http/HttpHeaders.java
浏览文件 @
8738fd7b
...
...
@@ -447,7 +447,7 @@ public class HttpHeaders implements MultiValueMap<String, String> {
}
private
void
setDate
(
String
headerName
,
long
date
)
{
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
DATE_FORMATS
[
0
]);
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
DATE_FORMATS
[
0
]
,
Locale
.
US
);
dateFormat
.
setTimeZone
(
GMT
);
set
(
headerName
,
dateFormat
.
format
(
new
Date
(
date
)));
}
...
...
org.springframework.web/src/test/java/org/springframework/http/HttpHeadersTests.java
浏览文件 @
8738fd7b
...
...
@@ -24,15 +24,14 @@ import java.util.Calendar;
import
java.util.EnumSet
;
import
java.util.GregorianCalendar
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.TimeZone
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Before
;
import
org.junit.Test
;
/**
* @author Arjen Poutsma
*/
/** @author Arjen Poutsma */
public
class
HttpHeadersTests
{
private
HttpHeaders
headers
;
...
...
@@ -126,7 +125,6 @@ public class HttpHeadersTests {
assertEquals
(
"Invalid If-None-Match header"
,
"\"v2.6\", \"v2.7\""
,
headers
.
getFirst
(
"If-None-Match"
));
}
@Test
public
void
date
()
{
Calendar
calendar
=
new
GregorianCalendar
(
2008
,
11
,
18
,
11
,
20
);
...
...
@@ -147,6 +145,23 @@ public class HttpHeadersTests {
headers
.
getDate
();
}
@Test
public
void
dateOtherLocale
()
{
Locale
defaultLocale
=
Locale
.
getDefault
();
try
{
Locale
.
setDefault
(
new
Locale
(
"nl"
,
"nl"
));
Calendar
calendar
=
new
GregorianCalendar
(
2008
,
11
,
18
,
11
,
20
);
calendar
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"CET"
));
long
date
=
calendar
.
getTimeInMillis
();
headers
.
setDate
(
date
);
assertEquals
(
"Invalid Date header"
,
"Thu, 18 Dec 2008 10:20:00 GMT"
,
headers
.
getFirst
(
"date"
));
assertEquals
(
"Invalid Date header"
,
date
,
headers
.
getDate
());
}
finally
{
Locale
.
setDefault
(
defaultLocale
);
}
}
@Test
public
void
lastModified
()
{
Calendar
calendar
=
new
GregorianCalendar
(
2008
,
11
,
18
,
11
,
20
);
...
...
@@ -154,9 +169,10 @@ public class HttpHeadersTests {
long
date
=
calendar
.
getTimeInMillis
();
headers
.
setLastModified
(
date
);
assertEquals
(
"Invalid Last-Modified header"
,
date
,
headers
.
getLastModified
());
assertEquals
(
"Invalid Last-Modified header"
,
"Thu, 18 Dec 2008 10:20:00 GMT"
,
headers
.
getFirst
(
"last-modified"
));
assertEquals
(
"Invalid Last-Modified header"
,
"Thu, 18 Dec 2008 10:20:00 GMT"
,
headers
.
getFirst
(
"last-modified"
));
}
@Test
public
void
expires
()
{
Calendar
calendar
=
new
GregorianCalendar
(
2008
,
11
,
18
,
11
,
20
);
...
...
@@ -174,7 +190,8 @@ public class HttpHeadersTests {
long
date
=
calendar
.
getTimeInMillis
();
headers
.
setIfModifiedSince
(
date
);
assertEquals
(
"Invalid If-Modified-Since header"
,
date
,
headers
.
getIfNotModifiedSince
());
assertEquals
(
"Invalid If-Modified-Since header"
,
"Thu, 18 Dec 2008 10:20:00 GMT"
,
headers
.
getFirst
(
"if-modified-since"
));
assertEquals
(
"Invalid If-Modified-Since header"
,
"Thu, 18 Dec 2008 10:20:00 GMT"
,
headers
.
getFirst
(
"if-modified-since"
));
}
@Test
...
...
@@ -194,5 +211,4 @@ public class HttpHeadersTests {
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录