Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
68f55859
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,发现更多精彩内容 >>
提交
68f55859
编写于
9月 05, 2017
作者:
J
Jesse Glick
提交者:
GitHub
9月 05, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2959 from jglick/lambdas
Using RestartableJenkinsRule.then
上级
5b8ea4fe
810a2153
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
29 addition
and
40 deletion
+29
-40
test/pom.xml
test/pom.xml
+1
-1
test/src/test/java/hudson/cli/CLIActionTest.java
test/src/test/java/hudson/cli/CLIActionTest.java
+2
-0
test/src/test/java/hudson/model/UserRestartTest.java
test/src/test/java/hudson/model/UserRestartTest.java
+26
-39
未找到文件。
test/pom.xml
浏览文件 @
68f55859
...
...
@@ -53,7 +53,7 @@ THE SOFTWARE.
<dependency>
<groupId>
${project.groupId}
</groupId>
<artifactId>
jenkins-test-harness
</artifactId>
<version>
2.2
3
</version>
<version>
2.2
4
</version>
<scope>
test
</scope>
<exclusions>
<exclusion>
...
...
test/src/test/java/hudson/cli/CLIActionTest.java
浏览文件 @
68f55859
...
...
@@ -40,6 +40,7 @@ import org.apache.commons.io.output.TeeOutputStream;
import
org.codehaus.groovy.runtime.Security218
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Ignore
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.junit.rules.TemporaryFolder
;
...
...
@@ -255,6 +256,7 @@ public class CLIActionTest {
// -ssh mode does not pass client locale or encoding
}
@Ignore
(
"TODO JENKINS-46659 seems to be broken"
)
@Issue
(
"JENKINS-41745"
)
@Test
public
void
interleavedStdio
()
throws
Exception
{
...
...
test/src/test/java/hudson/model/UserRestartTest.java
浏览文件 @
68f55859
...
...
@@ -27,10 +27,9 @@ package hudson.model;
import
hudson.tasks.Mailer
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
not
;
import
org.junit.Test
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Rule
;
import
org.junit.
runners.model.Statemen
t
;
import
org.junit.
Tes
t
;
import
org.jvnet.hudson.test.Issue
;
import
org.jvnet.hudson.test.RestartableJenkinsRule
;
...
...
@@ -40,35 +39,27 @@ public class UserRestartTest {
public
RestartableJenkinsRule
rr
=
new
RestartableJenkinsRule
();
@Test
public
void
persistedUsers
()
throws
Exception
{
rr
.
addStep
(
new
Statement
()
{
@Override
public
void
evaluate
()
throws
Throwable
{
rr
.
then
(
r
->
{
User
bob
=
User
.
getById
(
"bob"
,
true
);
bob
.
setFullName
(
"Bob"
);
bob
.
addProperty
(
new
Mailer
.
UserProperty
(
"bob@nowhere.net"
));
}
});
rr
.
addStep
(
new
Statement
()
{
@Override
public
void
evaluate
()
throws
Throwable
{
rr
.
then
(
r
->
{
User
bob
=
User
.
getById
(
"bob"
,
false
);
assertNotNull
(
bob
);
assertEquals
(
"Bob"
,
bob
.
getFullName
());
Mailer
.
UserProperty
email
=
bob
.
getProperty
(
Mailer
.
UserProperty
.
class
);
assertNotNull
(
email
);
assertEquals
(
"bob@nowhere.net"
,
email
.
getAddress
());
}
});
}
@Issue
(
"JENKINS-45892"
)
@Test
public
void
badSerialization
()
{
rr
.
addStep
(
new
Statement
()
{
@Override
public
void
evaluate
()
throws
Throwable
{
rr
.
j
.
jenkins
.
setSecurityRealm
(
rr
.
j
.
createDummySecurityRealm
());
FreeStyleProject
p
=
rr
.
j
.
createFreeStyleProject
(
"p"
);
rr
.
then
(
r
->
{
r
.
jenkins
.
setSecurityRealm
(
r
.
createDummySecurityRealm
());
FreeStyleProject
p
=
r
.
createFreeStyleProject
(
"p"
);
User
u
=
User
.
get
(
"pqhacker"
);
u
.
setFullName
(
"Pat Q. Hacker"
);
u
.
save
();
...
...
@@ -76,15 +67,11 @@ public class UserRestartTest {
String
text
=
p
.
getConfigFile
().
asString
();
assertThat
(
text
,
not
(
containsString
(
"<fullName>Pat Q. Hacker</fullName>"
)));
assertThat
(
text
,
containsString
(
"<id>pqhacker</id>"
));
}
});
rr
.
addStep
(
new
Statement
()
{
@Override
public
void
evaluate
()
throws
Throwable
{
FreeStyleProject
p
=
rr
.
j
.
jenkins
.
getItemByFullName
(
"p"
,
FreeStyleProject
.
class
);
rr
.
then
(
r
->
{
FreeStyleProject
p
=
r
.
jenkins
.
getItemByFullName
(
"p"
,
FreeStyleProject
.
class
);
User
u
=
p
.
getProperty
(
BadProperty
.
class
).
user
;
// do not inline: call User.get second
assertEquals
(
User
.
get
(
"pqhacker"
),
u
);
}
});
}
static
class
BadProperty
extends
JobProperty
<
FreeStyleProject
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录