Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
56670ebe
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,发现更多精彩内容 >>
提交
56670ebe
编写于
11月 14, 2019
作者:
J
Johnny Lim
提交者:
Stephane Nicoll
11月 14, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polish CorsAbstractHandlerMappingTests
See gh-23995
上级
8df3afd0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
30 deletion
+24
-30
spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java
.../web/servlet/handler/CorsAbstractHandlerMappingTests.java
+24
-30
未找到文件。
spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java
浏览文件 @
56670ebe
...
@@ -71,11 +71,10 @@ class CorsAbstractHandlerMappingTests {
...
@@ -71,11 +71,10 @@ class CorsAbstractHandlerMappingTests {
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
HandlerExecutionChain
chain
=
handlerMapping
.
getHandler
(
this
.
request
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
this
.
request
);
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
).
isNotNull
();
boolean
condition
=
chain
.
getHandler
()
instanceof
SimpleHandler
;
assertThat
(
chain
.
getHandler
()).
isInstanceOf
(
SimpleHandler
.
class
);
assertThat
(
condition
).
isTrue
();
}
}
@Test
@Test
...
@@ -84,11 +83,10 @@ class CorsAbstractHandlerMappingTests {
...
@@ -84,11 +83,10 @@ class CorsAbstractHandlerMappingTests {
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
HandlerExecutionChain
chain
=
handlerMapping
.
getHandler
(
this
.
request
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
this
.
request
);
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
).
isNotNull
();
boolean
condition
=
chain
.
getHandler
()
instanceof
SimpleHandler
;
assertThat
(
chain
.
getHandler
()).
isInstanceOf
(
SimpleHandler
.
class
);
assertThat
(
condition
).
isTrue
();
}
}
@Test
@Test
...
@@ -97,12 +95,11 @@ class CorsAbstractHandlerMappingTests {
...
@@ -97,12 +95,11 @@ class CorsAbstractHandlerMappingTests {
this
.
request
.
setRequestURI
(
"/cors"
);
this
.
request
.
setRequestURI
(
"/cors"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
HandlerExecutionChain
chain
=
handlerMapping
.
getHandler
(
this
.
request
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
this
.
request
);
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
).
isNotNull
();
boolean
condition
=
chain
.
getHandler
()
instanceof
CorsAwareHandler
;
assertThat
(
chain
.
getHandler
()).
isInstanceOf
(
CorsAwareHandler
.
class
);
assertThat
(
condition
).
isTrue
();
assertThat
(
getRequiredCorsConfiguration
(
chain
,
false
).
getAllowedOrigins
()).
containsExactly
(
"*"
);
assertThat
(
getRequiredCorsConfiguration
(
chain
,
false
).
getAllowedOrigins
()).
isEqualTo
(
Collections
.
singletonList
(
"*"
));
}
}
@Test
// see gh-23843
@Test
// see gh-23843
...
@@ -111,12 +108,11 @@ class CorsAbstractHandlerMappingTests {
...
@@ -111,12 +108,11 @@ class CorsAbstractHandlerMappingTests {
this
.
request
.
setRequestURI
(
"/chain"
);
this
.
request
.
setRequestURI
(
"/chain"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
HandlerExecutionChain
chain
=
handlerMapping
.
getHandler
(
this
.
request
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
this
.
request
);
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
).
isNotNull
();
boolean
condition
=
chain
.
getHandler
()
instanceof
CorsAwareHandler
;
assertThat
(
chain
.
getHandler
()).
isInstanceOf
(
CorsAwareHandler
.
class
);
assertThat
(
condition
).
isTrue
();
assertThat
(
getRequiredCorsConfiguration
(
chain
,
false
).
getAllowedOrigins
()).
containsExactly
(
"*"
);
assertThat
(
getRequiredCorsConfiguration
(
chain
,
false
).
getAllowedOrigins
()).
isEqualTo
(
Collections
.
singletonList
(
"*"
));
}
}
@Test
@Test
...
@@ -125,12 +121,12 @@ class CorsAbstractHandlerMappingTests {
...
@@ -125,12 +121,12 @@ class CorsAbstractHandlerMappingTests {
this
.
request
.
setRequestURI
(
"/cors"
);
this
.
request
.
setRequestURI
(
"/cors"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
HandlerExecutionChain
chain
=
handlerMapping
.
getHandler
(
this
.
request
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
this
.
request
);
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
.
getHandler
()).
isNotNull
();
assertThat
(
chain
.
getHandler
()).
isNotNull
();
assertThat
(
chain
.
getHandler
().
getClass
().
getSimpleName
()).
isEqualTo
(
"PreFlightHandler"
);
assertThat
(
chain
.
getHandler
().
getClass
().
getSimpleName
()).
isEqualTo
(
"PreFlightHandler"
);
assertThat
(
getRequiredCorsConfiguration
(
chain
,
true
).
getAllowedOrigins
()).
isEqualTo
(
Collections
.
singletonList
(
"*"
)
);
assertThat
(
getRequiredCorsConfiguration
(
chain
,
true
).
getAllowedOrigins
()).
containsExactly
(
"*"
);
}
}
@Test
@Test
...
@@ -142,12 +138,11 @@ class CorsAbstractHandlerMappingTests {
...
@@ -142,12 +138,11 @@ class CorsAbstractHandlerMappingTests {
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
HandlerExecutionChain
chain
=
handlerMapping
.
getHandler
(
this
.
request
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
this
.
request
);
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
).
isNotNull
();
boolean
condition
=
chain
.
getHandler
()
instanceof
SimpleHandler
;
assertThat
(
chain
.
getHandler
()).
isInstanceOf
(
SimpleHandler
.
class
);
assertThat
(
condition
).
isTrue
();
assertThat
(
getRequiredCorsConfiguration
(
chain
,
false
).
getAllowedOrigins
()).
containsExactly
(
"*"
);
assertThat
(
getRequiredCorsConfiguration
(
chain
,
false
).
getAllowedOrigins
()).
isEqualTo
(
Collections
.
singletonList
(
"*"
));
}
}
@Test
@Test
...
@@ -159,12 +154,12 @@ class CorsAbstractHandlerMappingTests {
...
@@ -159,12 +154,12 @@ class CorsAbstractHandlerMappingTests {
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
HandlerExecutionChain
chain
=
handlerMapping
.
getHandler
(
this
.
request
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
this
.
request
);
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
.
getHandler
()).
isNotNull
();
assertThat
(
chain
.
getHandler
()).
isNotNull
();
assertThat
(
chain
.
getHandler
().
getClass
().
getSimpleName
()).
isEqualTo
(
"PreFlightHandler"
);
assertThat
(
chain
.
getHandler
().
getClass
().
getSimpleName
()).
isEqualTo
(
"PreFlightHandler"
);
assertThat
(
getRequiredCorsConfiguration
(
chain
,
true
).
getAllowedOrigins
()).
isEqualTo
(
Collections
.
singletonList
(
"*"
)
);
assertThat
(
getRequiredCorsConfiguration
(
chain
,
true
).
getAllowedOrigins
()).
containsExactly
(
"*"
);
}
}
@Test
@Test
...
@@ -174,15 +169,14 @@ class CorsAbstractHandlerMappingTests {
...
@@ -174,15 +169,14 @@ class CorsAbstractHandlerMappingTests {
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
HandlerExecutionChain
chain
=
handlerMapping
.
getHandler
(
this
.
request
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
this
.
request
);
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
).
isNotNull
();
boolean
condition
=
chain
.
getHandler
()
instanceof
SimpleHandler
;
assertThat
(
chain
.
getHandler
()).
isInstanceOf
(
SimpleHandler
.
class
);
assertThat
(
condition
).
isTrue
();
CorsConfiguration
config
=
getRequiredCorsConfiguration
(
chain
,
false
);
CorsConfiguration
config
=
getRequiredCorsConfiguration
(
chain
,
false
);
assertThat
(
config
).
isNotNull
();
assertThat
(
config
).
isNotNull
();
assertThat
(
config
.
getAllowedOrigins
()).
isEqualTo
(
Collections
.
singletonList
(
"*"
)
);
assertThat
(
config
.
getAllowedOrigins
()).
containsExactly
(
"*"
);
assertThat
(
config
.
getAllowCredentials
()).
is
EqualTo
(
true
);
assertThat
(
config
.
getAllowCredentials
()).
is
True
(
);
}
}
@Test
@Test
...
@@ -192,15 +186,15 @@ class CorsAbstractHandlerMappingTests {
...
@@ -192,15 +186,15 @@ class CorsAbstractHandlerMappingTests {
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
setRequestURI
(
"/foo"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ORIGIN
,
"https://domain2.com"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
this
.
request
.
addHeader
(
HttpHeaders
.
ACCESS_CONTROL_REQUEST_METHOD
,
"GET"
);
HandlerExecutionChain
chain
=
handlerMapping
.
getHandler
(
this
.
request
);
HandlerExecutionChain
chain
=
this
.
handlerMapping
.
getHandler
(
this
.
request
);
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
).
isNotNull
();
assertThat
(
chain
.
getHandler
()).
isNotNull
();
assertThat
(
chain
.
getHandler
()).
isNotNull
();
assertThat
(
chain
.
getHandler
().
getClass
().
getSimpleName
()).
isEqualTo
(
"PreFlightHandler"
);
assertThat
(
chain
.
getHandler
().
getClass
().
getSimpleName
()).
isEqualTo
(
"PreFlightHandler"
);
CorsConfiguration
config
=
getRequiredCorsConfiguration
(
chain
,
true
);
CorsConfiguration
config
=
getRequiredCorsConfiguration
(
chain
,
true
);
assertThat
(
config
).
isNotNull
();
assertThat
(
config
).
isNotNull
();
assertThat
(
config
.
getAllowedOrigins
()).
isEqualTo
(
Collections
.
singletonList
(
"*"
)
);
assertThat
(
config
.
getAllowedOrigins
()).
containsExactly
(
"*"
);
assertThat
(
config
.
getAllowCredentials
()).
is
EqualTo
(
true
);
assertThat
(
config
.
getAllowCredentials
()).
is
True
(
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录