Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
3f2d003b
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
3f2d003b
编写于
10月 08, 2013
作者:
A
Andrew Kiellor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move check into ChoiceParameterDefinition.DescriptorImpl.
上级
d244b6b6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
25 addition
and
20 deletion
+25
-20
core/src/main/java/hudson/model/ChoiceParameterDefinition.java
...src/main/java/hudson/model/ChoiceParameterDefinition.java
+13
-0
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/Jenkins.java
+0
-11
core/src/main/resources/hudson/model/ChoiceParameterDefinition/config.jelly
...urces/hudson/model/ChoiceParameterDefinition/config.jelly
+1
-1
core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java
...test/java/hudson/model/ChoiceParameterDefinitionTest.java
+11
-0
test/src/test/java/jenkins/model/JenkinsTest.java
test/src/test/java/jenkins/model/JenkinsTest.java
+0
-8
未找到文件。
core/src/main/java/hudson/model/ChoiceParameterDefinition.java
浏览文件 @
3f2d003b
package
hudson.model
;
import
hudson.util.FormValidation
;
import
org.kohsuke.stapler.QueryParameter
;
import
org.kohsuke.stapler.StaplerRequest
;
import
org.kohsuke.stapler.DataBoundConstructor
;
import
org.kohsuke.stapler.export.Exported
;
...
...
@@ -96,6 +98,17 @@ public class ChoiceParameterDefinition extends SimpleParameterDefinition {
public
String
getHelpFile
()
{
return
"/help/parameter/choice.html"
;
}
/**
* Checks if parameterised build choices are valid.
*/
public
FormValidation
doCheckChoices
(
@QueryParameter
String
value
)
{
if
(
ChoiceParameterDefinition
.
areValidChoices
(
value
))
{
return
FormValidation
.
ok
();
}
else
{
return
FormValidation
.
error
(
Messages
.
ChoiceParameterDefinition_MissingChoices
());
}
}
}
}
\ No newline at end of file
core/src/main/java/jenkins/model/Jenkins.java
浏览文件 @
3f2d003b
...
...
@@ -3560,17 +3560,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
return
FormValidation
.
error
(
Messages
.
Hudson_ViewAlreadyExists
(
view
));
}
/**
* Checks if parameterised build choices are valid.
*/
public
FormValidation
doCheckChoices
(
@QueryParameter
String
value
)
{
if
(
ChoiceParameterDefinition
.
areValidChoices
(
value
))
{
return
FormValidation
.
ok
();
}
else
{
return
FormValidation
.
error
(
Messages
.
ChoiceParameterDefinition_MissingChoices
());
}
}
/**
* Serves static resources placed along with Jelly view files.
* <p>
...
...
core/src/main/resources/hudson/model/ChoiceParameterDefinition/config.jelly
浏览文件 @
3f2d003b
...
...
@@ -30,7 +30,7 @@ THE SOFTWARE.
<f:textbox name="parameter.name" value="${instance.name}" />
</f:entry>
<f:entry title="${%Choices}" help="/help/parameter/choice-choices.html">
<f:textarea checkUrl="'${rootURL}/checkChoices?value='+encodeURIComponent(this.value)" name="parameter.choices" value="${instance.choicesText}" />
<f:textarea checkUrl="'${rootURL}/
descriptorByName/hudson.model.ChoiceParameterDefinition/
checkChoices?value='+encodeURIComponent(this.value)" name="parameter.choices" value="${instance.choicesText}" />
</f:entry>
<f:entry title="${%Description}" help="/help/parameter/description.html">
<f:textarea name="parameter.description" value="${instance.description}" />
...
...
core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java
浏览文件 @
3f2d003b
package
hudson.model
;
import
hudson.util.FormValidation
;
import
jenkins.model.Jenkins
;
import
org.junit.Test
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
...
...
@@ -14,4 +17,12 @@ public class ChoiceParameterDefinitionTest {
assertTrue
(
ChoiceParameterDefinition
.
areValidChoices
(
"abc\ndef"
));
assertTrue
(
ChoiceParameterDefinition
.
areValidChoices
(
"abc\r\ndef"
));
}
@Test
public
void
testCheckChoices
()
throws
Exception
{
ChoiceParameterDefinition
.
DescriptorImpl
descriptorImpl
=
new
ChoiceParameterDefinition
.
DescriptorImpl
();
assertEquals
(
FormValidation
.
Kind
.
OK
,
descriptorImpl
.
doCheckChoices
(
"abc\ndef"
).
kind
);
assertEquals
(
FormValidation
.
Kind
.
ERROR
,
descriptorImpl
.
doCheckChoices
(
""
).
kind
);
}
}
test/src/test/java/jenkins/model/JenkinsTest.java
浏览文件 @
3f2d003b
...
...
@@ -311,14 +311,6 @@ public class JenkinsTest extends HudsonTestCase {
}
}
@Test
public
void
testCheckChoices
()
throws
Exception
{
Jenkins
jenkins
=
Jenkins
.
getInstance
();
assertEquals
(
FormValidation
.
Kind
.
OK
,
jenkins
.
doCheckChoices
(
"abc\ndef"
).
kind
);
assertEquals
(
FormValidation
.
Kind
.
ERROR
,
jenkins
.
doCheckChoices
(
""
).
kind
);
}
private
String
eval
(
WebClient
wc
)
throws
Exception
{
WebRequestSettings
req
=
new
WebRequestSettings
(
new
URL
(
wc
.
getContextPath
()
+
"eval"
),
HttpMethod
.
POST
);
req
.
setRequestBody
(
"<j:jelly xmlns:j='jelly:core'>${1+2}</j:jelly>"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录