Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
d18a27e5
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,发现更多精彩内容 >>
提交
d18a27e5
编写于
7月 24, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:jenkinsci/jenkins
上级
f209a75d
06016ac4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
10 deletion
+34
-10
core/src/main/java/hudson/model/ListView.java
core/src/main/java/hudson/model/ListView.java
+14
-10
core/src/test/java/hudson/model/ListViewTest.java
core/src/test/java/hudson/model/ListViewTest.java
+20
-0
未找到文件。
core/src/main/java/hudson/model/ListView.java
浏览文件 @
d18a27e5
...
@@ -329,16 +329,7 @@ public class ListView extends View implements Saveable {
...
@@ -329,16 +329,7 @@ public class ListView extends View implements Saveable {
}
}
}
}
if
(
req
.
getParameter
(
"useincluderegex"
)
!=
null
)
{
setIncludeRegex
(
req
.
getParameter
(
"useincluderegex"
));
includeRegex
=
Util
.
nullify
(
req
.
getParameter
(
"includeRegex"
));
if
(
includeRegex
==
null
)
includePattern
=
null
;
else
includePattern
=
Pattern
.
compile
(
includeRegex
);
}
else
{
includeRegex
=
null
;
includePattern
=
null
;
}
if
(
columns
==
null
)
{
if
(
columns
==
null
)
{
columns
=
new
DescribableList
<
ListViewColumn
,
Descriptor
<
ListViewColumn
>>(
this
);
columns
=
new
DescribableList
<
ListViewColumn
,
Descriptor
<
ListViewColumn
>>(
this
);
...
@@ -353,6 +344,19 @@ public class ListView extends View implements Saveable {
...
@@ -353,6 +344,19 @@ public class ListView extends View implements Saveable {
String
filter
=
Util
.
fixEmpty
(
req
.
getParameter
(
"statusFilter"
));
String
filter
=
Util
.
fixEmpty
(
req
.
getParameter
(
"statusFilter"
));
statusFilter
=
filter
!=
null
?
"1"
.
equals
(
filter
)
:
null
;
statusFilter
=
filter
!=
null
?
"1"
.
equals
(
filter
)
:
null
;
}
}
public
void
setIncludeRegex
(
String
includeRegex
)
{
if
(
includeRegex
!=
null
)
{
this
.
includeRegex
=
Util
.
nullify
(
includeRegex
);
if
(
this
.
includeRegex
==
null
)
this
.
includePattern
=
null
;
else
this
.
includePattern
=
Pattern
.
compile
(
includeRegex
);
}
else
{
this
.
includeRegex
=
null
;
this
.
includePattern
=
null
;
}
}
@Extension
@Extension
public
static
class
DescriptorImpl
extends
ViewDescriptor
{
public
static
class
DescriptorImpl
extends
ViewDescriptor
{
...
...
core/src/test/java/hudson/model/ListViewTest.java
浏览文件 @
d18a27e5
...
@@ -42,4 +42,24 @@ public class ListViewTest {
...
@@ -42,4 +42,24 @@ public class ListViewTest {
lv
.
add
(
ig
);
lv
.
add
(
ig
);
assertEquals
(
1
,
lv
.
getItems
().
size
());
assertEquals
(
1
,
lv
.
getItems
().
size
());
}
}
@Test
@PrepareForTest
({
ListViewColumn
.
class
,
Items
.
class
})
public
void
includeRegexProgrammatic
()
{
mockStatic
(
Items
.
class
);
mockStatic
(
ListViewColumn
.
class
);
List
<
ListViewColumn
>
columns
=
Collections
.
emptyList
();
when
(
ListViewColumn
.
createDefaultInitialColumnList
()).
thenReturn
(
columns
);
ViewGroup
owner
=
mock
(
ViewGroup
.
class
);
ItemGroup
ig
=
mock
(
ItemGroup
.
class
);
when
(
owner
.
getItemGroup
()).
thenReturn
(
ig
);
ListView
view
=
new
ListView
(
"test"
,
owner
);
view
.
setIncludeRegex
(
".*"
);
TopLevelItem
it
=
Mockito
.
mock
(
TopLevelItem
.
class
);
List
<
TopLevelItem
>
igContent
=
Arrays
.
asList
((
TopLevelItem
)
it
);
when
(
Items
.
getAllItems
(
eq
(
ig
),
eq
(
TopLevelItem
.
class
))).
thenReturn
(
igContent
);
when
(
ig
.
getItems
()).
thenReturn
(
igContent
);
when
(
it
.
getRelativeNameFrom
(
any
(
ItemGroup
.
class
))).
thenReturn
(
"test-item"
);
assertEquals
(
1
,
view
.
getItems
().
size
());
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录