Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
460e5081
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,发现更多精彩内容 >>
提交
460e5081
编写于
1月 15, 2013
作者:
O
Oliver Gondža
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use request protocol for configured Jenkins url
上级
1ecafe8a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
139 addition
and
7 deletion
+139
-7
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/Jenkins.java
+10
-7
core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java
core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java
+129
-0
未找到文件。
core/src/main/java/jenkins/model/Jenkins.java
浏览文件 @
460e5081
...
@@ -1861,17 +1861,20 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
...
@@ -1861,17 +1861,20 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
* @see #getRootUrlFromRequest()
* @see #getRootUrlFromRequest()
*/
*/
public
String
getRootUrl
()
{
public
String
getRootUrl
()
{
// for compatibility. the actual data is stored in Mailer
String
url
=
JenkinsLocationConfiguration
.
get
().
getUrl
();
String
url
=
JenkinsLocationConfiguration
.
get
().
getUrl
();
if
(
url
!=
null
)
{
if
(
url
!=
null
&&
!
url
.
endsWith
(
"/"
))
{
if
(!
url
.
endsWith
(
"/"
))
url
+=
'/'
;
url
+=
'/'
;
return
url
;
}
}
StaplerRequest
req
=
Stapler
.
getCurrentRequest
();
StaplerRequest
req
=
Stapler
.
getCurrentRequest
();
if
(
req
!=
null
)
return
getRootUrlFromRequest
();
if
(
req
==
null
)
return
url
;
return
null
;
if
(
url
==
null
)
return
getRootUrlFromRequest
();
// replace current protocol, if any, with request protocol
return
url
.
replaceFirst
(
"^\\w+(?=://)"
,
req
.
getScheme
());
}
}
/**
/**
...
...
core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java
0 → 100644
浏览文件 @
460e5081
/*
* The MIT License
*
* Copyright (c) 2013 RedHat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package
jenkins.model
;
import
static
org
.
hamcrest
.
CoreMatchers
.
equalTo
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
powermock
.
api
.
mockito
.
PowerMockito
.
mock
;
import
static
org
.
powermock
.
api
.
mockito
.
PowerMockito
.
mockStatic
;
import
static
org
.
powermock
.
api
.
mockito
.
PowerMockito
.
when
;
import
java.net.URL
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.kohsuke.stapler.Stapler
;
import
org.kohsuke.stapler.StaplerRequest
;
import
org.mockito.Mockito
;
import
org.powermock.core.classloader.annotations.PrepareForTest
;
import
org.powermock.modules.junit4.PowerMockRunner
;
@RunWith
(
PowerMockRunner
.
class
)
@PrepareForTest
({
JenkinsLocationConfiguration
.
class
,
Stapler
.
class
})
public
class
JenkinsGetRootUrlTest
{
private
Jenkins
jenkins
;
private
JenkinsLocationConfiguration
config
;
@Before
public
void
setUp
()
{
jenkins
=
mock
(
Jenkins
.
class
,
Mockito
.
CALLS_REAL_METHODS
);
config
=
mock
(
JenkinsLocationConfiguration
.
class
);
mockStatic
(
JenkinsLocationConfiguration
.
class
);
when
(
JenkinsLocationConfiguration
.
get
()).
thenReturn
(
config
);
mockStatic
(
Stapler
.
class
);
}
@Test
public
void
getConfiguredRootUrl
()
{
configured
(
"http://configured.host"
);
rootUrlIs
(
"http://configured.host/"
);
}
@Test
public
void
getAccessedRootUrl
()
{
accessing
(
"https://real.host/jenkins/"
);
rootUrlIs
(
"https://real.host/jenkins/"
);
}
@Test
public
void
preferConfiguredOverAccessed
()
{
configured
(
"http://configured.host/"
);
accessing
(
"http://real.host/"
);
rootUrlIs
(
"http://configured.host/"
);
}
@Test
public
void
inheritProtocolWhenDispatchingRequest
()
{
configured
(
"http://configured.host/"
);
accessing
(
"https://real.host/"
);
rootUrlIs
(
"https://configured.host/"
);
}
private
void
rootUrlIs
(
final
String
expectedRootUrl
)
{
assertThat
(
jenkins
.
getRootUrl
(),
equalTo
(
expectedRootUrl
));
}
private
void
configured
(
final
String
configuredHost
)
{
when
(
config
.
getUrl
()).
thenReturn
(
configuredHost
);
}
private
void
accessing
(
final
String
realUrl
)
{
final
URL
url
=
getUrl
(
realUrl
);
final
StaplerRequest
req
=
mock
(
StaplerRequest
.
class
);
when
(
req
.
getScheme
()).
thenReturn
(
url
.
getProtocol
());
when
(
req
.
getServerName
()).
thenReturn
(
url
.
getHost
());
when
(
req
.
getServerPort
()).
thenReturn
(
url
.
getPort
()
==
-
1
?
80
:
url
.
getPort
());
when
(
req
.
getContextPath
()).
thenReturn
(
url
.
getPath
().
replaceAll
(
"/$"
,
""
));
when
(
Stapler
.
getCurrentRequest
()).
thenReturn
(
req
);
}
private
URL
getUrl
(
final
String
realUrl
)
{
try
{
return
new
URL
(
realUrl
);
}
catch
(
Exception
ex
)
{
throw
new
RuntimeException
(
ex
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录