Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
c3af3bec
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
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,发现更多精彩内容 >>
提交
c3af3bec
编写于
12月 20, 2016
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Making tests fail more meaningfully.
上级
f72bcaca
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
11 deletion
+16
-11
core/src/main/java/jenkins/security/ConfidentialStore.java
core/src/main/java/jenkins/security/ConfidentialStore.java
+4
-2
core/src/test/java/hudson/model/TaskActionTest.java
core/src/test/java/hudson/model/TaskActionTest.java
+8
-2
core/src/test/java/jenkins/security/ConfidentialStoreRule.java
...src/test/java/jenkins/security/ConfidentialStoreRule.java
+2
-5
test/src/test/java/hudson/console/ConsoleAnnotatorTest.java
test/src/test/java/hudson/console/ConsoleAnnotatorTest.java
+2
-2
未找到文件。
core/src/main/java/jenkins/security/ConfidentialStore.java
浏览文件 @
c3af3bec
...
...
@@ -61,7 +61,9 @@ public abstract class ConfidentialStore {
* Retrieves the currently active singleton instance of {@link ConfidentialStore}.
*/
public
static
@Nonnull
ConfidentialStore
get
()
{
if
(
TEST
!=
null
)
return
TEST
.
get
();
if
(
TEST
!=
null
)
{
return
TEST
;
}
Jenkins
j
=
Jenkins
.
getInstance
();
if
(
j
==
null
)
{
...
...
@@ -95,7 +97,7 @@ public abstract class ConfidentialStore {
/**
* Testing only. Used for testing {@link ConfidentialKey} without {@link Jenkins}
*/
/*package*/
static
ThreadLocal
<
ConfidentialStore
>
TEST
=
null
;
/*package*/
static
ConfidentialStore
TEST
=
null
;
private
static
final
Logger
LOGGER
=
Logger
.
getLogger
(
ConfidentialStore
.
class
.
getName
());
}
core/src/test/java/hudson/model/TaskActionTest.java
浏览文件 @
c3af3bec
package
hudson.model
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
junit
.
Assert
.
*
;
import
java.io.ByteArrayOutputStream
;
import
hudson.console.AnnotatedLargeText
;
import
hudson.security.ACL
;
import
hudson.security.Permission
;
import
jenkins.security.ConfidentialStoreRule
;
import
org.acegisecurity.Authentication
;
import
static
org
.
hamcrest
.
CoreMatchers
.
startsWith
;
import
org.junit.Rule
;
import
org.junit.Test
;
/**
...
...
@@ -15,6 +18,9 @@ import org.junit.Test;
*/
public
class
TaskActionTest
{
@Rule
public
ConfidentialStoreRule
confidentialStoreRule
=
new
ConfidentialStoreRule
();
private
static
class
MyTaskThread
extends
TaskThread
{
MyTaskThread
(
TaskAction
taskAction
)
{
super
(
taskAction
,
ListenerAndText
.
forMemory
(
taskAction
));
...
...
@@ -63,6 +69,6 @@ public class TaskActionTest {
}
ByteArrayOutputStream
os
=
new
ByteArrayOutputStream
();
annotatedText
.
writeLogTo
(
0
,
os
);
assertT
rue
(
os
.
toString
(
"UTF-8"
).
startsWith
(
"a linkCompleted"
));
assertT
hat
(
os
.
toString
(
"UTF-8"
),
startsWith
(
"a linkCompleted"
));
}
}
core/src/test/java/jenkins/security/ConfidentialStoreRule.java
浏览文件 @
c3af3bec
...
...
@@ -14,16 +14,13 @@ public class ConfidentialStoreRule extends ExternalResource {
@Override
protected
void
before
()
throws
Throwable
{
tmp
.
create
();
ConfidentialStore
.
TEST
.
set
(
new
DefaultConfidentialStore
(
tmp
.
getRoot
()
));
ConfidentialStore
.
TEST
=
new
DefaultConfidentialStore
(
tmp
.
getRoot
(
));
}
@Override
protected
void
after
()
{
ConfidentialStore
.
TEST
.
set
(
null
)
;
ConfidentialStore
.
TEST
=
null
;
tmp
.
delete
();
}
static
{
ConfidentialStore
.
TEST
=
new
ThreadLocal
<
ConfidentialStore
>();
}
}
test/src/test/java/hudson/console/ConsoleAnnotatorTest.java
浏览文件 @
c3af3bec
...
...
@@ -27,6 +27,7 @@ import java.net.URL;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.concurrent.Future
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Rule
;
import
org.junit.Test
;
...
...
@@ -117,8 +118,7 @@ public class ConsoleAnnotatorTest {
// make sure raw console output doesn't include the garbage
TextPage
raw
=
(
TextPage
)
r
.
createWebClient
().
goTo
(
b
.
getUrl
()+
"consoleText"
,
"text/plain"
);
System
.
out
.
println
(
raw
.
getContent
());
assertTrue
(
raw
.
getContent
().
contains
(
"\nabc\ndef\n"
));
assertThat
(
raw
.
getContent
(),
containsString
(
"\nabc\ndef\n"
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录