Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
fa7472c0
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,发现更多精彩内容 >>
提交
fa7472c0
编写于
5月 12, 2010
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MockHttpServletResponse supports multiple includes (SPR-7188)
上级
bd1b559d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
46 addition
and
12 deletion
+46
-12
org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
...org/springframework/mock/web/MockHttpServletResponse.java
+21
-4
org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
...a/org/springframework/mock/web/MockRequestDispatcher.java
+2
-2
org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
...org/springframework/mock/web/MockHttpServletResponse.java
+21
-4
org.springframework.web/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
...a/org/springframework/mock/web/MockRequestDispatcher.java
+2
-2
未找到文件。
org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
浏览文件 @
fa7472c0
/*
* Copyright 2002-20
09
the original author or authors.
* Copyright 2002-20
10
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.
...
...
@@ -98,7 +98,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
private
String
forwardedUrl
;
private
String
includedUrl
;
private
final
List
<
String
>
includedUrls
=
new
ArrayList
<
String
>()
;
//---------------------------------------------------------------------
...
...
@@ -443,11 +443,28 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
public
void
setIncludedUrl
(
String
includedUrl
)
{
this
.
includedUrl
=
includedUrl
;
this
.
includedUrls
.
clear
();
if
(
includedUrl
!=
null
)
{
this
.
includedUrls
.
add
(
includedUrl
);
}
}
public
String
getIncludedUrl
()
{
return
this
.
includedUrl
;
int
count
=
this
.
includedUrls
.
size
();
if
(
count
>
1
)
{
throw
new
IllegalStateException
(
"More than 1 URL included - check getIncludedUrls instead: "
+
this
.
includedUrls
);
}
return
(
count
==
1
?
this
.
includedUrls
.
get
(
0
)
:
null
);
}
public
void
addIncludedUrl
(
String
includedUrl
)
{
Assert
.
notNull
(
includedUrl
,
"Included URL must not be null"
);
this
.
includedUrls
.
add
(
includedUrl
);
}
public
List
<
String
>
getIncludedUrls
()
{
return
this
.
includedUrls
;
}
...
...
org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
浏览文件 @
fa7472c0
/*
* Copyright 2002-20
09
the original author or authors.
* Copyright 2002-20
10
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.
...
...
@@ -68,7 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
public
void
include
(
ServletRequest
request
,
ServletResponse
response
)
{
Assert
.
notNull
(
request
,
"Request must not be null"
);
Assert
.
notNull
(
response
,
"Response must not be null"
);
getMockHttpServletResponse
(
response
).
set
IncludedUrl
(
this
.
url
);
getMockHttpServletResponse
(
response
).
add
IncludedUrl
(
this
.
url
);
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
"MockRequestDispatcher: including URL ["
+
this
.
url
+
"]"
);
}
...
...
org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
浏览文件 @
fa7472c0
/*
* Copyright 2002-20
09
the original author or authors.
* Copyright 2002-20
10
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.
...
...
@@ -98,7 +98,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
private
String
forwardedUrl
;
private
String
includedUrl
;
private
final
List
<
String
>
includedUrls
=
new
ArrayList
<
String
>()
;
//---------------------------------------------------------------------
...
...
@@ -443,11 +443,28 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
public
void
setIncludedUrl
(
String
includedUrl
)
{
this
.
includedUrl
=
includedUrl
;
this
.
includedUrls
.
clear
();
if
(
includedUrl
!=
null
)
{
this
.
includedUrls
.
add
(
includedUrl
);
}
}
public
String
getIncludedUrl
()
{
return
this
.
includedUrl
;
int
count
=
this
.
includedUrls
.
size
();
if
(
count
>
1
)
{
throw
new
IllegalStateException
(
"More than 1 URL included - check getIncludedUrls instead: "
+
this
.
includedUrls
);
}
return
(
count
==
1
?
this
.
includedUrls
.
get
(
0
)
:
null
);
}
public
void
addIncludedUrl
(
String
includedUrl
)
{
Assert
.
notNull
(
includedUrl
,
"Included URL must not be null"
);
this
.
includedUrls
.
add
(
includedUrl
);
}
public
List
<
String
>
getIncludedUrls
()
{
return
this
.
includedUrls
;
}
...
...
org.springframework.web/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
浏览文件 @
fa7472c0
/*
* Copyright 2002-20
09
the original author or authors.
* Copyright 2002-20
10
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.
...
...
@@ -68,7 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
public
void
include
(
ServletRequest
request
,
ServletResponse
response
)
{
Assert
.
notNull
(
request
,
"Request must not be null"
);
Assert
.
notNull
(
response
,
"Response must not be null"
);
getMockHttpServletResponse
(
response
).
set
IncludedUrl
(
this
.
url
);
getMockHttpServletResponse
(
response
).
add
IncludedUrl
(
this
.
url
);
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
"MockRequestDispatcher: including URL ["
+
this
.
url
+
"]"
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录