Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
a4bd40d3
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,发现更多精彩内容 >>
提交
a4bd40d3
编写于
5月 10, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Try harder to set Jenkins root URL, since some tests rely on it.
上级
6ee5e03a
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
11 addition
and
5 deletion
+11
-5
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
+3
-4
test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
+3
-1
test/src/test/java/org/jvnet/hudson/main/UseRecipesWithJenkinsRuleTest.java
.../org/jvnet/hudson/main/UseRecipesWithJenkinsRuleTest.java
+5
-0
未找到文件。
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
浏览文件 @
a4bd40d3
...
...
@@ -188,6 +188,7 @@ import com.gargoylesoftware.htmlunit.javascript.HtmlUnitContextFactory;
import
com.gargoylesoftware.htmlunit.javascript.host.xml.XMLHttpRequest
;
import
com.gargoylesoftware.htmlunit.xml.XmlPage
;
import
java.net.HttpURLConnection
;
import
jenkins.model.JenkinsLocationConfiguration
;
/**
* Base class for all Jenkins test cases.
...
...
@@ -330,7 +331,8 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
jenkins
.
servletContext
.
setAttribute
(
"app"
,
jenkins
);
jenkins
.
servletContext
.
setAttribute
(
"version"
,
"?"
);
WebAppMain
.
installExpressionFactory
(
new
ServletContextEvent
(
jenkins
.
servletContext
));
Mailer
.
descriptor
().
setHudsonUrl
(
getURL
().
toExternalForm
());
Mailer
.
descriptor
().
setHudsonUrl
(
getURL
().
toExternalForm
());
// for compatibility only
JenkinsLocationConfiguration
.
get
().
setUrl
(
getURL
().
toString
());
// in case we are using older mailer plugin
// set a default JDK to be the one that the harness is using.
jenkins
.
getJDKs
().
add
(
new
JDK
(
"default"
,
System
.
getProperty
(
"java.home"
)));
...
...
@@ -343,9 +345,6 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
// cause all the descriptors to reload.
// ideally we'd like to reset them to properly emulate the behavior, but that's not possible.
DescriptorImpl
desc
=
Mailer
.
descriptor
();
// prevent NPE with eclipse
if
(
desc
!=
null
)
Mailer
.
descriptor
().
setHudsonUrl
(
null
);
for
(
Descriptor
d
:
jenkins
.
getExtensionList
(
Descriptor
.
class
)
)
d
.
load
();
...
...
test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
浏览文件 @
a4bd40d3
...
...
@@ -204,6 +204,7 @@ import java.util.logging.Filter;
import
java.util.logging.Level
;
import
java.util.logging.LogRecord
;
import
java.util.logging.Logger
;
import
jenkins.model.JenkinsLocationConfiguration
;
import
org.acegisecurity.GrantedAuthorityImpl
;
import
static
org
.
hamcrest
.
Matchers
.
hasXPath
;
...
...
@@ -351,7 +352,8 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction {
// ideally we'd like to reset them to properly emulate the behavior, but that's not possible.
Mailer
.
DescriptorImpl
desc
=
Mailer
.
descriptor
();
// prevent NPE with eclipse
if
(
desc
!=
null
)
Mailer
.
descriptor
().
setHudsonUrl
(
null
);
if
(
desc
!=
null
)
Mailer
.
descriptor
().
setHudsonUrl
(
getURL
().
toString
());
JenkinsLocationConfiguration
.
get
().
setUrl
(
getURL
().
toString
());
for
(
Descriptor
d
:
jenkins
.
getExtensionList
(
Descriptor
.
class
)
)
d
.
load
();
}
...
...
test/src/test/java/org/jvnet/hudson/main/UseRecipesWithJenkinsRuleTest.java
浏览文件 @
a4bd40d3
...
...
@@ -22,6 +22,7 @@ import org.jvnet.hudson.test.recipes.WithPluginManager;
import
org.xml.sax.SAXException
;
import
com.gargoylesoftware.htmlunit.html.HtmlPage
;
import
jenkins.model.JenkinsLocationConfiguration
;
public
class
UseRecipesWithJenkinsRuleTest
{
...
...
@@ -55,6 +56,10 @@ public class UseRecipesWithJenkinsRuleTest {
assertEquals
(
MyPluginManager
.
class
,
rule
.
jenkins
.
pluginManager
.
getClass
());
}
@Test
public
void
rightURL
()
throws
Exception
{
assertEquals
(
rule
.
getURL
(),
new
URL
(
JenkinsLocationConfiguration
.
get
().
getUrl
()));
}
private
void
verifyNotError
(
WebClient
wc
)
throws
IOException
,
SAXException
{
HtmlPage
p
=
wc
.
goTo
(
"loginError"
);
URL
url
=
p
.
getWebResponse
().
getUrl
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录