Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
c269d27b
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 搜索 >>
提交
c269d27b
编写于
6月 06, 2014
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve no content handling in MockHttpServletRequest
Issue: SPR-11764
上级
9706e5cc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
4 deletion
+29
-4
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
.../org/springframework/mock/web/MockHttpServletRequest.java
+5
-2
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
...springframework/mock/web/MockHttpServletRequestTests.java
+20
-1
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java
...springframework/mock/web/test/MockHttpServletRequest.java
+4
-1
未找到文件。
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
浏览文件 @
c269d27b
/*
* Copyright 2002-201
3
the original author or authors.
* Copyright 2002-201
4
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.
...
...
@@ -104,6 +104,9 @@ public class MockHttpServletRequest implements HttpServletRequest {
private
static
final
String
CHARSET_PREFIX
=
"charset="
;
private
static
final
ServletInputStream
EMPTY_SERVLET_INPUT_STREAM
=
new
DelegatingServletInputStream
(
new
ByteArrayInputStream
(
new
byte
[
0
]));
private
boolean
active
=
true
;
...
...
@@ -375,7 +378,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
return
new
DelegatingServletInputStream
(
new
ByteArrayInputStream
(
this
.
content
));
}
else
{
return
null
;
return
EMPTY_SERVLET_INPUT_STREAM
;
}
}
...
...
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
浏览文件 @
c269d27b
/*
* Copyright 2002-201
3
the original author or authors.
* Copyright 2002-201
4
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.
...
...
@@ -16,6 +16,8 @@
package
org.springframework.mock.web
;
import
java.io.IOException
;
import
java.nio.charset.Charset
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collections
;
...
...
@@ -26,6 +28,7 @@ import java.util.Locale;
import
java.util.Map
;
import
org.junit.Test
;
import
org.springframework.util.StreamUtils
;
import
static
org
.
junit
.
Assert
.*;
...
...
@@ -42,6 +45,22 @@ public class MockHttpServletRequestTests {
private
MockHttpServletRequest
request
=
new
MockHttpServletRequest
();
@Test
public
void
content
()
throws
IOException
{
byte
[]
bytes
=
"body"
.
getBytes
(
Charset
.
defaultCharset
());
request
.
setContent
(
bytes
);
assertEquals
(
bytes
.
length
,
request
.
getContentLength
());
assertNotNull
(
request
.
getInputStream
());
assertEquals
(
"body"
,
StreamUtils
.
copyToString
(
request
.
getInputStream
(),
Charset
.
defaultCharset
()));
}
@Test
public
void
noContent
()
throws
IOException
{
assertEquals
(-
1
,
request
.
getContentLength
());
assertNotNull
(
request
.
getInputStream
());
assertEquals
(-
1
,
request
.
getInputStream
().
read
());
}
@Test
public
void
setContentType
()
{
String
contentType
=
"test/plain"
;
...
...
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java
浏览文件 @
c269d27b
...
...
@@ -107,6 +107,9 @@ public class MockHttpServletRequest implements HttpServletRequest {
private
static
final
String
CHARSET_PREFIX
=
"charset="
;
private
static
final
ServletInputStream
EMPTY_SERVLET_INPUT_STREAM
=
new
DelegatingServletInputStream
(
new
ByteArrayInputStream
(
new
byte
[
0
]));
private
boolean
active
=
true
;
...
...
@@ -378,7 +381,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
return
new
DelegatingServletInputStream
(
new
ByteArrayInputStream
(
this
.
content
));
}
else
{
return
null
;
return
EMPTY_SERVLET_INPUT_STREAM
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录