Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
五度鱼学Java
jenkins
提交
d0012ea8
J
jenkins
项目概览
五度鱼学Java
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d0012ea8
编写于
5月 12, 2016
作者:
O
Oleg Nenashev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-34755] - Add some tests
上级
d03e68f0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
78 addition
and
2 deletion
+78
-2
core/src/main/java/jenkins/util/SystemProperties.java
core/src/main/java/jenkins/util/SystemProperties.java
+2
-2
test/src/test/java/jenkins/util/SystemPropertiesTest.java
test/src/test/java/jenkins/util/SystemPropertiesTest.java
+76
-0
未找到文件。
core/src/main/java/jenkins/util/SystemProperties.java
浏览文件 @
d0012ea8
...
@@ -92,8 +92,8 @@ public class SystemProperties {
...
@@ -92,8 +92,8 @@ public class SystemProperties {
if
(
value
!=
null
)
{
if
(
value
!=
null
)
{
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (system): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (system): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
return
value
;
}
}
return
value
;
}
}
value
=
tryGetValueFromContext
(
key
);
value
=
tryGetValueFromContext
(
key
);
...
@@ -127,8 +127,8 @@ public class SystemProperties {
...
@@ -127,8 +127,8 @@ public class SystemProperties {
if
(
value
!=
null
)
{
if
(
value
!=
null
)
{
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
if
(
LOGGER
.
isLoggable
(
Level
.
CONFIG
))
{
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (system): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
LOGGER
.
log
(
Level
.
CONFIG
,
"Property (system): {0} => {1}"
,
new
Object
[]
{
key
,
value
});
return
value
;
}
}
return
value
;
}
}
value
=
tryGetValueFromContext
(
key
);
value
=
tryGetValueFromContext
(
key
);
...
...
test/src/test/java/jenkins/util/SystemPropertiesTest.java
0 → 100644
浏览文件 @
d0012ea8
/*
* The MIT License
*
* Copyright (c) 2016 CloudBees, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package
jenkins.util
;
import
javax.servlet.ServletContext
;
import
net.sourceforge.htmlunit.corejs.javascript.RhinoSecurityManager
;
import
static
org
.
hamcrest
.
Matchers
.*;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
org.junit.Before
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.JenkinsRule
;
/**
* Tests of {@link SystemProperties}.
* @author Oleg Nenashev
*/
public
class
SystemPropertiesTest
{
@Rule
public
JenkinsRule
j
=
new
JenkinsRule
();
@Before
public
void
setUp
()
{
SystemProperties
.
initialize
(
j
.
jenkins
.
servletContext
);
}
@Test
public
void
shouldReturnNullIfUndefined
()
throws
Exception
{
assertThat
(
"Properties should be null by default"
,
SystemProperties
.
getString
(
"foo.bar"
),
nullValue
());
}
@Test
public
void
shouldInitializeFromSystemProperty
()
throws
Exception
{
System
.
setProperty
(
"foo.bar"
,
"myVal"
);
assertThat
(
"System property should assign the value"
,
SystemProperties
.
getString
(
"foo.bar"
),
equalTo
(
"myVal"
));
}
@Test
public
void
shouldInitializeFromContext
()
throws
Exception
{
ServletContext
c
=
j
.
jenkins
.
servletContext
;
assertThat
(
"System property should assign the value"
,
SystemProperties
.
getString
(
"install-wizard-path"
),
equalTo
(
"jsbundles/pluginSetupWizard"
));
}
@Test
public
void
shouldUseSystemPropertyAsAHighPriority
()
throws
Exception
{
ServletContext
c
=
j
.
jenkins
.
servletContext
;
System
.
setProperty
(
"install-wizard-path"
,
"myVal2"
);
assertThat
(
"System property should take system property with a high priority"
,
SystemProperties
.
getString
(
"install-wizard-path"
),
equalTo
(
"myVal2"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录