Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
41b3d6ab
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 搜索 >>
提交
41b3d6ab
编写于
3月 27, 2019
作者:
S
Sam Brannen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
URL Cleanup - Fix broken tests
See gh-22676
上级
a7254ce7
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
24 addition
and
22 deletion
+24
-22
spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
...java/org/springframework/oxm/AbstractMarshallerTests.java
+3
-3
spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
...org/springframework/oxm/castor/CastorMarshallerTests.java
+4
-4
spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
.../org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
+3
-3
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
...gframework/http/server/ServletServerHttpRequestTests.java
+2
-1
spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
...art/support/RequestPartServletServerHttpRequestTests.java
+2
-1
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
...g/springframework/web/util/UriComponentsBuilderTests.java
+9
-9
spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
...test/java/org/springframework/web/util/WebUtilsTests.java
+1
-1
未找到文件。
spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
浏览文件 @
41b3d6ab
/*
* Copyright 2002-201
0
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -74,7 +74,7 @@ public abstract class AbstractMarshallerTests {
marshaller
.
marshal
(
flights
,
domResult
);
Document
expected
=
builder
.
newDocument
();
Element
flightsElement
=
expected
.
createElementNS
(
"http://samples.springframework.org/flight"
,
"tns:flights"
);
Attr
namespace
=
expected
.
createAttributeNS
(
"http
s
://www.w3.org/2000/xmlns/"
,
"xmlns:tns"
);
Attr
namespace
=
expected
.
createAttributeNS
(
"http://www.w3.org/2000/xmlns/"
,
"xmlns:tns"
);
namespace
.
setNodeValue
(
"http://samples.springframework.org/flight"
);
flightsElement
.
setAttributeNode
(
namespace
);
expected
.
appendChild
(
flightsElement
);
...
...
@@ -98,7 +98,7 @@ public abstract class AbstractMarshallerTests {
Document
result
=
(
Document
)
domResult
.
getNode
();
Document
expected
=
builder
.
newDocument
();
Element
flightsElement
=
expected
.
createElementNS
(
"http://samples.springframework.org/flight"
,
"tns:flights"
);
Attr
namespace
=
expected
.
createAttributeNS
(
"http
s
://www.w3.org/2000/xmlns/"
,
"xmlns:tns"
);
Attr
namespace
=
expected
.
createAttributeNS
(
"http://www.w3.org/2000/xmlns/"
,
"xmlns:tns"
);
namespace
.
setNodeValue
(
"http://samples.springframework.org/flight"
);
flightsElement
.
setAttributeNode
(
namespace
);
expected
.
appendChild
(
flightsElement
);
...
...
spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
浏览文件 @
41b3d6ab
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -79,7 +79,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
*/
private
static
final
String
XSI_EXPECTED_STRING
=
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+
"<objects><castor-object xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
+
" xmlns:java=\"http
s
://java.sun.com\""
+
" xmlns:java=\"http://java.sun.com\""
+
" xsi:type=\"java:org.springframework.oxm.castor.CastorObject\">"
+
"<name>test</name><value>8</value></castor-object></objects>"
;
...
...
@@ -94,7 +94,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
*/
private
static
final
String
ROOT_WITH_XSI_EXPECTED_STRING
=
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+
"<objects xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
+
" xmlns:java=\"http
s
://java.sun.com\""
+
" xmlns:java=\"http://java.sun.com\""
+
" xsi:type=\"java:java.util.Arrays$ArrayList\">"
+
"<castor-object xsi:type=\"java:org.springframework.oxm.castor.CastorObject\">"
+
"<name>test</name><value>8</value></castor-object></objects>"
;
...
...
@@ -104,7 +104,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
*/
private
static
final
String
ROOT_WITHOUT_XSI_EXPECTED_STRING
=
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+
"<objects><castor-object xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
+
" xmlns:java=\"http
s
://java.sun.com\""
+
" xmlns:java=\"http://java.sun.com\""
+
" xsi:type=\"java:org.springframework.oxm.castor.CastorObject\">"
+
"<name>test</name><value>8</value></castor-object></objects>"
;
...
...
spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
浏览文件 @
41b3d6ab
/*
* Copyright 2002-201
3
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -77,9 +77,9 @@ public class Jaxb2UnmarshallerTests extends AbstractUnmarshallerTests {
given
(
mimeContainer
.
getAttachment
(
"<99bd1592-0521-41a2-9688-a8bfb40192fb@http://springframework.org/spring-ws>"
)).
willReturn
(
dataHandler
);
given
(
mimeContainer
.
getAttachment
(
"696cfb9a-4d2d-402f-bb5c-59fa69e7f0b3@spring-ws.png"
)).
willReturn
(
dataHandler
);
String
content
=
"<binaryObject xmlns='http://springframework.org/spring-ws'>"
+
"<bytes>"
+
"<xop:Include href='cid:6b76528d-7a9c-4def-8e13-095ab89e9bb7@http://springframework.org/spring-ws' xmlns:xop='http
s
://www.w3.org/2004/08/xop/include'/>"
+
"<xop:Include href='cid:6b76528d-7a9c-4def-8e13-095ab89e9bb7@http://springframework.org/spring-ws' xmlns:xop='http://www.w3.org/2004/08/xop/include'/>"
+
"</bytes>"
+
"<dataHandler>"
+
"<xop:Include href='cid:99bd1592-0521-41a2-9688-a8bfb40192fb@http://springframework.org/spring-ws' xmlns:xop='http
s
://www.w3.org/2004/08/xop/include'/>"
+
"<xop:Include href='cid:99bd1592-0521-41a2-9688-a8bfb40192fb@http://springframework.org/spring-ws' xmlns:xop='http://www.w3.org/2004/08/xop/include'/>"
+
"</dataHandler>"
+
"<swaDataHandler>696cfb9a-4d2d-402f-bb5c-59fa69e7f0b3@spring-ws.png</swaDataHandler>"
+
"</binaryObject>"
;
...
...
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
浏览文件 @
41b3d6ab
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -57,6 +57,7 @@ public class ServletServerHttpRequestTests {
@Test
public
void
getURI
()
throws
Exception
{
URI
uri
=
new
URI
(
"https://example.com/path?query"
);
mockRequest
.
setScheme
(
uri
.
getScheme
());
mockRequest
.
setServerName
(
uri
.
getHost
());
mockRequest
.
setServerPort
(
uri
.
getPort
());
mockRequest
.
setRequestURI
(
uri
.
getPath
());
...
...
spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
浏览文件 @
41b3d6ab
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -58,6 +58,7 @@ public class RequestPartServletServerHttpRequestTests {
@Test
public
void
getURI
()
throws
Exception
{
URI
uri
=
new
URI
(
"https://example.com/path?query"
);
mockRequest
.
setScheme
(
"https"
);
mockRequest
.
setServerName
(
uri
.
getHost
());
mockRequest
.
setServerPort
(
uri
.
getPort
());
mockRequest
.
setRequestURI
(
uri
.
getPath
());
...
...
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
浏览文件 @
41b3d6ab
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
9
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.
...
...
@@ -41,8 +41,8 @@ public class UriComponentsBuilderTests {
@Test
public
void
plain
()
throws
URISyntaxException
{
UriComponentsBuilder
builder
=
UriComponentsBuilder
.
newInstance
();
UriComponents
result
=
builder
.
scheme
(
"http"
).
host
(
"example.com"
).
path
(
"foo"
).
queryParam
(
"bar"
).
fragment
(
"baz"
).
build
();
assertEquals
(
"http"
,
result
.
getScheme
());
UriComponents
result
=
builder
.
scheme
(
"http
s
"
).
host
(
"example.com"
).
path
(
"foo"
).
queryParam
(
"bar"
).
fragment
(
"baz"
).
build
();
assertEquals
(
"http
s
"
,
result
.
getScheme
());
assertEquals
(
"example.com"
,
result
.
getHost
());
assertEquals
(
"foo"
,
result
.
getPath
());
assertEquals
(
"bar"
,
result
.
getQuery
());
...
...
@@ -54,18 +54,18 @@ public class UriComponentsBuilderTests {
@Test
public
void
multipleFromSameBuilder
()
throws
URISyntaxException
{
UriComponentsBuilder
builder
=
UriComponentsBuilder
.
newInstance
().
scheme
(
"http"
).
host
(
"example.com"
).
pathSegment
(
"foo"
);
UriComponentsBuilder
builder
=
UriComponentsBuilder
.
newInstance
().
scheme
(
"http
s
"
).
host
(
"example.com"
).
pathSegment
(
"foo"
);
UriComponents
result1
=
builder
.
build
();
builder
=
builder
.
pathSegment
(
"foo2"
).
queryParam
(
"bar"
).
fragment
(
"baz"
);
UriComponents
result2
=
builder
.
build
();
assertEquals
(
"http"
,
result1
.
getScheme
());
assertEquals
(
"http
s
"
,
result1
.
getScheme
());
assertEquals
(
"example.com"
,
result1
.
getHost
());
assertEquals
(
"/foo"
,
result1
.
getPath
());
URI
expected
=
new
URI
(
"https://example.com/foo"
);
assertEquals
(
"Invalid result URI"
,
expected
,
result1
.
toUri
());
assertEquals
(
"http"
,
result2
.
getScheme
());
assertEquals
(
"http
s
"
,
result2
.
getScheme
());
assertEquals
(
"example.com"
,
result2
.
getHost
());
assertEquals
(
"/foo/foo2"
,
result2
.
getPath
());
assertEquals
(
"bar"
,
result2
.
getQuery
());
...
...
@@ -97,7 +97,7 @@ public class UriComponentsBuilderTests {
public
void
fromHierarchicalUri
()
throws
URISyntaxException
{
URI
uri
=
new
URI
(
"https://example.com/foo?bar#baz"
);
UriComponents
result
=
UriComponentsBuilder
.
fromUri
(
uri
).
build
();
assertEquals
(
"http"
,
result
.
getScheme
());
assertEquals
(
"http
s
"
,
result
.
getScheme
());
assertEquals
(
"example.com"
,
result
.
getHost
());
assertEquals
(
"/foo"
,
result
.
getPath
());
assertEquals
(
"bar"
,
result
.
getQuery
());
...
...
@@ -131,7 +131,7 @@ public class UriComponentsBuilderTests {
@Test
public
void
fromUriString
()
{
UriComponents
result
=
UriComponentsBuilder
.
fromUriString
(
"https://www.ietf.org/rfc/rfc3986.txt"
).
build
();
assertEquals
(
"http"
,
result
.
getScheme
());
assertEquals
(
"http
s
"
,
result
.
getScheme
());
assertNull
(
result
.
getUserInfo
());
assertEquals
(
"www.ietf.org"
,
result
.
getHost
());
assertEquals
(-
1
,
result
.
getPort
());
...
...
@@ -143,7 +143,7 @@ public class UriComponentsBuilderTests {
result
=
UriComponentsBuilder
.
fromUriString
(
"https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)"
)
.
build
();
assertEquals
(
"http"
,
result
.
getScheme
());
assertEquals
(
"http
s
"
,
result
.
getScheme
());
assertEquals
(
"arjen:foobar"
,
result
.
getUserInfo
());
assertEquals
(
"java.sun.com"
,
result
.
getHost
());
assertEquals
(
80
,
result
.
getPort
());
...
...
spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
浏览文件 @
41b3d6ab
/*
* Copyright 2002-20
08
the original author or authors.
* Copyright 2002-20
19
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.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录