Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
2781b876
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,发现更多精彩内容 >>
提交
2781b876
编写于
9月 24, 2009
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
PropertyPlaceholderConfigurer supports "${myKey:myDefaultValue}" defaulting syntax
上级
0f43d6c5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
11 deletion
+10
-11
org.springframework.context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
...t/support/PropertyResourceConfigurerIntegrationTests.java
+10
-11
未找到文件。
org.springframework.context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
浏览文件 @
2781b876
/*
* Copyright 2002-200
8
the original author or authors.
* Copyright 2002-200
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.
...
...
@@ -16,15 +16,16 @@
package
org.springframework.context.support
;
import
static
org
.
junit
.
Assert
.*;
import
java.io.FileNotFoundException
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Before
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
org.springframework.beans.MutablePropertyValues
;
import
org.springframework.beans.TestBean
;
import
org.springframework.beans.factory.BeanCreationException
;
import
org.springframework.beans.factory.BeanDefinitionStoreException
;
import
org.springframework.beans.factory.BeanInitializationException
;
import
org.springframework.beans.factory.config.PropertyPlaceholderConfigurer
;
...
...
@@ -40,9 +41,8 @@ import org.springframework.util.StringUtils;
* that contains ${..} tokens in its 'location' property requires being tested through an ApplicationContext
* as opposed to using only a BeanFactory during testing.
*
* @see org.springframework.beans.factory.config.PropertyResourceConfigurerTests;
*
* @author Chris Beams
* @see org.springframework.beans.factory.config.PropertyResourceConfigurerTests
*/
public
class
PropertyResourceConfigurerIntegrationTests
{
...
...
@@ -102,8 +102,8 @@ public class PropertyResourceConfigurerIntegrationTests {
/* the above hack doesn't work since the exception message is created without
the leading / stripped so the test fails. Changed 17/11/04. DD */
//assertTrue(ex.getMessage().indexOf(userDir + "/test/" + userDir) != -1);
assertTrue
(
ex
.
getMessage
().
indexOf
(
userDir
+
"/test/"
+
userDir
)
!=
-
1
||
ex
.
getMessage
().
indexOf
(
userDir
+
"/test//"
+
userDir
)
!=
-
1
);
assertTrue
(
ex
.
getMessage
().
contains
(
userDir
+
"/test/"
+
userDir
)
||
ex
.
getMessage
().
contains
(
userDir
+
"/test//"
+
userDir
)
);
}
}
...
...
@@ -118,12 +118,11 @@ public class PropertyResourceConfigurerIntegrationTests {
ac
.
registerSingleton
(
"configurer"
,
PropertyPlaceholderConfigurer
.
class
,
pvs
);
try
{
ac
.
refresh
();
fail
(
"Should have thrown Bean
DefinitionStore
Exception"
);
fail
(
"Should have thrown Bean
Creation
Exception"
);
}
catch
(
Bean
Initializ
ationException
ex
)
{
catch
(
Bean
Cre
ationException
ex
)
{
// expected
assertTrue
(
ex
.
getCause
()
instanceof
FileNotFoundException
);
assertTrue
(
ex
.
getMessage
().
indexOf
(
"myprop"
)
!=
-
1
);
assertTrue
(
ex
.
getMessage
().
contains
(
"myprop"
));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录