Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dk131072
spring-framework
提交
caf2af07
S
spring-framework
项目概览
dk131072
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
caf2af07
编写于
10月 17, 2012
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polish MockHttpServletRequestBuilder
上级
c579cd1c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
4 deletion
+18
-4
spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/TestDispatcherServlet.java
...ramework/test/web/mock/servlet/TestDispatcherServlet.java
+2
-0
spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockHttpServletRequestBuilder.java
...b/mock/servlet/request/MockHttpServletRequestBuilder.java
+15
-0
spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/RequestResultMatchers.java
...k/test/web/mock/servlet/result/RequestResultMatchers.java
+1
-4
未找到文件。
spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/TestDispatcherServlet.java
浏览文件 @
caf2af07
...
...
@@ -73,6 +73,8 @@ final class TestDispatcherServlet extends DispatcherServlet {
super
.
service
(
request
,
response
);
// TODO: add CountDownLatch to DeferredResultInterceptor and wait in request().asyncResult(..)
Object
handler
=
getMvcResult
(
request
).
getHandler
();
if
(
asyncManager
.
isConcurrentHandlingStarted
()
&&
!
deferredResultInterceptor
.
wasInvoked
)
{
if
(!
callableInterceptor
.
await
())
{
...
...
spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockHttpServletRequestBuilder.java
浏览文件 @
caf2af07
...
...
@@ -202,6 +202,21 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
return
this
;
}
/**
* Set the request body as a UTF-8 String.
*
* @param content the body content
*/
public
MockHttpServletRequestBuilder
content
(
String
content
)
{
try
{
this
.
content
=
content
.
getBytes
(
"UTF-8"
);
}
catch
(
UnsupportedEncodingException
e
)
{
// should never happen
}
return
this
;
}
/**
* Add the given cookies to the request. Cookies are always added.
*
...
...
spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/RequestResultMatchers.java
浏览文件 @
caf2af07
...
...
@@ -84,9 +84,6 @@ public class RequestResultMatchers {
/**
* Assert the result from asynchronous processing with the given matcher.
* This method can be used when a controller method returns {@link Callable}
* or {@link AsyncTask}. The value matched is the value returned from the
* {@code Callable} or the exception raised.
*/
public
<
T
>
ResultMatcher
asyncResult
(
final
Matcher
<
T
>
matcher
)
{
return
new
ResultMatcher
()
{
...
...
@@ -95,7 +92,7 @@ public class RequestResultMatchers {
HttpServletRequest
request
=
result
.
getRequest
();
WebAsyncManager
asyncManager
=
WebAsyncUtils
.
getAsyncManager
(
request
);
MatcherAssert
.
assertThat
(
"Async started"
,
request
.
isAsyncStarted
(),
equalTo
(
true
));
MatcherAssert
.
assertThat
(
"
Callable
result"
,
(
T
)
asyncManager
.
getConcurrentResult
(),
matcher
);
MatcherAssert
.
assertThat
(
"
Async
result"
,
(
T
)
asyncManager
.
getConcurrentResult
(),
matcher
);
}
};
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录