Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
9aaed2bc
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,发现更多精彩内容 >>
提交
9aaed2bc
编写于
3月 07, 2017
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
2f85cbf0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
7 deletion
+6
-7
spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
...ork/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+5
-3
spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
...ingframework/web/client/RestTemplateIntegrationTests.java
+0
-1
spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
...ava/org/springframework/web/client/RestTemplateTests.java
+1
-3
未找到文件。
spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
浏览文件 @
9aaed2bc
...
...
@@ -259,7 +259,8 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
}
else
{
Assert
.
isTrue
(
uriComponents
.
getPath
().
startsWith
(
this
.
contextPath
),
()
->
uriComponents
.
getPath
()
+
" should start with contextPath "
+
this
.
contextPath
);
()
->
"\""
+
uriComponents
.
getPath
()
+
"\" should start with context path \""
+
this
.
contextPath
+
"\""
);
request
.
setContextPath
(
this
.
contextPath
);
}
}
...
...
@@ -273,7 +274,8 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
while
(
tokens
.
hasMoreTokens
())
{
String
cookieName
=
tokens
.
nextToken
().
trim
();
Assert
.
isTrue
(
tokens
.
hasMoreTokens
(),
()
->
"Expected value for cookie name '"
+
cookieName
+
"'. Full cookie was "
+
cookieHeaderValue
);
()
->
"Expected value for cookie name '"
+
cookieName
+
"': full cookie header was ["
+
cookieHeaderValue
+
"]"
);
String
cookieValue
=
tokens
.
nextToken
().
trim
();
processCookie
(
request
,
cookies
,
new
Cookie
(
cookieName
,
cookieValue
));
}
...
...
@@ -384,7 +386,7 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
private
Locale
parseLocale
(
String
locale
)
{
Matcher
matcher
=
LOCALE_PATTERN
.
matcher
(
locale
);
Assert
.
isTrue
(
matcher
.
matches
(),
()
->
"Invalid locale
"
+
locale
);
Assert
.
isTrue
(
matcher
.
matches
(),
()
->
"Invalid locale
value ["
+
locale
+
"]"
);
String
language
=
matcher
.
group
(
1
);
String
country
=
matcher
.
group
(
2
);
if
(
country
==
null
)
{
...
...
spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
浏览文件 @
9aaed2bc
...
...
@@ -72,7 +72,6 @@ public class RestTemplateIntegrationTests extends AbstractMockWebServerTestCase
public
ClientHttpRequestFactory
clientHttpRequestFactory
;
@Parameters
@SuppressWarnings
(
"deprecation"
)
public
static
Iterable
<?
extends
ClientHttpRequestFactory
>
data
()
{
return
Arrays
.
asList
(
new
SimpleClientHttpRequestFactory
(),
...
...
spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
浏览文件 @
9aaed2bc
...
...
@@ -146,7 +146,7 @@ public class RestTemplateTests {
verify
(
response
).
close
();
}
@Test
// SPR-15201
@Test
// SPR-15201
public
void
uriTemplateWithTrailingSlash
()
throws
Exception
{
String
url
=
"http://example.com/spring/"
;
given
(
requestFactory
.
createRequest
(
new
URI
(
url
),
HttpMethod
.
GET
)).
willReturn
(
request
);
...
...
@@ -280,7 +280,6 @@ public class RestTemplateTests {
@Test
public
void
getForObjectWithCustomUriTemplateHandler
()
throws
Exception
{
DefaultUriBuilderFactory
uriTemplateHandler
=
new
DefaultUriBuilderFactory
();
template
.
setUriTemplateHandler
(
uriTemplateHandler
);
...
...
@@ -306,7 +305,6 @@ public class RestTemplateTests {
verify
(
response
).
close
();
}
@Test
public
void
headForHeaders
()
throws
Exception
{
given
(
requestFactory
.
createRequest
(
new
URI
(
"http://example.com"
),
HttpMethod
.
HEAD
)).
willReturn
(
request
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录