Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
55e601c3
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,发现更多精彩内容 >>
提交
55e601c3
编写于
5月 20, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revise system property replacement tests
See gh-22959
上级
515d627a
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
26 addition
and
16 deletion
+26
-16
spring-core/src/test/java/org/springframework/core/io/ResourceEditorTests.java
...java/org/springframework/core/io/ResourceEditorTests.java
+20
-8
spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
...ork/core/io/support/ResourceArrayPropertyEditorTests.java
+6
-8
未找到文件。
spring-core/src/test/java/org/springframework/core/io/ResourceEditorTests.java
浏览文件 @
55e601c3
/*
* 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.
...
...
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
public
class
ResourceEditorTests
{
@Test
public
void
sunnyDay
()
throws
Exception
{
public
void
sunnyDay
()
{
PropertyEditor
editor
=
new
ResourceEditor
();
editor
.
setAsText
(
"classpath:org/springframework/core/io/ResourceEditorTests.class"
);
Resource
resource
=
(
Resource
)
editor
.
getValue
();
...
...
@@ -43,19 +43,19 @@ public class ResourceEditorTests {
}
@Test
(
expected
=
IllegalArgumentException
.
class
)
public
void
ctorWithNullCtorArgs
()
throws
Exception
{
public
void
ctorWithNullCtorArgs
()
{
new
ResourceEditor
(
null
,
null
);
}
@Test
public
void
setAndGetAsTextWithNull
()
throws
Exception
{
public
void
setAndGetAsTextWithNull
()
{
PropertyEditor
editor
=
new
ResourceEditor
();
editor
.
setAsText
(
null
);
assertEquals
(
""
,
editor
.
getAsText
());
}
@Test
public
void
setAndGetAsTextWithWhitespaceResource
()
throws
Exception
{
public
void
setAndGetAsTextWithWhitespaceResource
()
{
PropertyEditor
editor
=
new
ResourceEditor
();
editor
.
setAsText
(
" "
);
assertEquals
(
""
,
editor
.
getAsText
());
...
...
@@ -63,6 +63,20 @@ public class ResourceEditorTests {
@Test
public
void
testSystemPropertyReplacement
()
{
PropertyEditor
editor
=
new
ResourceEditor
();
System
.
setProperty
(
"test.prop"
,
"foo"
);
try
{
editor
.
setAsText
(
"${test.prop}"
);
Resource
resolved
=
(
Resource
)
editor
.
getValue
();
assertEquals
(
"foo"
,
resolved
.
getFilename
());
}
finally
{
System
.
getProperties
().
remove
(
"test.prop"
);
}
}
@Test
public
void
testSystemPropertyReplacementWithUnresolvablePlaceholder
()
{
PropertyEditor
editor
=
new
ResourceEditor
();
System
.
setProperty
(
"test.prop"
,
"foo"
);
try
{
...
...
@@ -76,13 +90,11 @@ public class ResourceEditorTests {
}
@Test
(
expected
=
IllegalArgumentException
.
class
)
public
void
testStrictSystemPropertyReplacement
()
{
public
void
testStrictSystemPropertyReplacement
WithUnresolvablePlaceholder
()
{
PropertyEditor
editor
=
new
ResourceEditor
(
new
DefaultResourceLoader
(),
new
StandardEnvironment
(),
false
);
System
.
setProperty
(
"test.prop"
,
"foo"
);
try
{
editor
.
setAsText
(
"${test.prop}-${bar}"
);
Resource
resolved
=
(
Resource
)
editor
.
getValue
();
assertEquals
(
"foo-${bar}"
,
resolved
.
getFilename
());
}
finally
{
System
.
getProperties
().
remove
(
"test.prop"
);
...
...
spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
浏览文件 @
55e601c3
/*
* 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.
...
...
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
public
class
ResourceArrayPropertyEditorTests
{
@Test
public
void
testVanillaResource
()
throws
Exception
{
public
void
testVanillaResource
()
{
PropertyEditor
editor
=
new
ResourceArrayPropertyEditor
();
editor
.
setAsText
(
"classpath:org/springframework/core/io/support/ResourceArrayPropertyEditor.class"
);
Resource
[]
resources
=
(
Resource
[])
editor
.
getValue
();
...
...
@@ -41,7 +41,7 @@ public class ResourceArrayPropertyEditorTests {
}
@Test
public
void
testPatternResource
()
throws
Exception
{
public
void
testPatternResource
()
{
// N.B. this will sometimes fail if you use classpath: instead of classpath*:.
// The result depends on the classpath - if test-classes are segregated from classes
// and they come first on the classpath (like in Maven) then it breaks, if classes
...
...
@@ -58,9 +58,9 @@ public class ResourceArrayPropertyEditorTests {
PropertyEditor
editor
=
new
ResourceArrayPropertyEditor
();
System
.
setProperty
(
"test.prop"
,
"foo"
);
try
{
editor
.
setAsText
(
"${test.prop}
-${bar}
"
);
editor
.
setAsText
(
"${test.prop}"
);
Resource
[]
resources
=
(
Resource
[])
editor
.
getValue
();
assertEquals
(
"foo
-${bar}
"
,
resources
[
0
].
getFilename
());
assertEquals
(
"foo"
,
resources
[
0
].
getFilename
());
}
finally
{
System
.
getProperties
().
remove
(
"test.prop"
);
...
...
@@ -68,15 +68,13 @@ public class ResourceArrayPropertyEditorTests {
}
@Test
(
expected
=
IllegalArgumentException
.
class
)
public
void
testStrictSystemPropertyReplacement
()
{
public
void
testStrictSystemPropertyReplacement
WithUnresolvablePlaceholder
()
{
PropertyEditor
editor
=
new
ResourceArrayPropertyEditor
(
new
PathMatchingResourcePatternResolver
(),
new
StandardEnvironment
(),
false
);
System
.
setProperty
(
"test.prop"
,
"foo"
);
try
{
editor
.
setAsText
(
"${test.prop}-${bar}"
);
Resource
[]
resources
=
(
Resource
[])
editor
.
getValue
();
assertEquals
(
"foo-${bar}"
,
resources
[
0
].
getFilename
());
}
finally
{
System
.
getProperties
().
remove
(
"test.prop"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录