Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
bdd85808
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,发现更多精彩内容 >>
提交
bdd85808
编写于
1月 31, 2013
作者:
C
Christoph Kutzinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Regression test and changelog for [JENKINS-16573]
上级
38d8cdd7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
51 addition
and
4 deletion
+51
-4
changelog.html
changelog.html
+3
-0
maven-plugin/src/main/java/hudson/maven/MojoInfo.java
maven-plugin/src/main/java/hudson/maven/MojoInfo.java
+5
-2
maven-plugin/src/main/java/hudson/maven/reporters/TestMojo.java
...plugin/src/main/java/hudson/maven/reporters/TestMojo.java
+7
-2
maven-plugin/src/test/java/hudson/maven/reporters/TestMojoTest.java
...in/src/test/java/hudson/maven/reporters/TestMojoTest.java
+36
-0
未找到文件。
changelog.html
浏览文件 @
bdd85808
...
...
@@ -58,6 +58,9 @@ Upcoming changes</a>
<li
class=
'major bug'
>
Reverted change in 1.500 causing serious regression in HTTPS reverse proxy setups.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-16368"
>
issue 16368
</a>
)
<li
class=
'major bug'
>
Getting test results from custom test mojos failed build.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-16573"
>
issue 16573
</a>
)
<li
class=
bug
>
Bogus “Build Record Root Directory” inadequately diagnosed.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-16457"
>
issue 16457
</a>
)
...
...
maven-plugin/src/main/java/hudson/maven/MojoInfo.java
浏览文件 @
bdd85808
...
...
@@ -45,6 +45,8 @@ import java.lang.reflect.InvocationHandler;
import
java.lang.reflect.Proxy
;
import
java.lang.reflect.Method
;
import
javax.annotation.CheckForNull
;
import
hudson.util.InvocationInterceptor
;
import
hudson.util.ReflectionUtils
;
import
org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration
;
...
...
@@ -145,13 +147,14 @@ public class MojoInfo {
*
* @return
* The configuration value either specified in POM, or inherited from
* parent POM, or default value if one is specified in mojo.
* parent POM, or default value if one is specified in mojo,
* or null if no such configuration value exists.
*
* @throws ComponentConfigurationException
* Not sure when exactly this is thrown, but it's probably when
* the configuration in POM is syntactically incorrect.
*/
public
<
T
>
T
getConfigurationValue
(
String
configName
,
Class
<
T
>
type
)
throws
ComponentConfigurationException
{
@CheckForNull
public
<
T
>
T
getConfigurationValue
(
String
configName
,
Class
<
T
>
type
)
throws
ComponentConfigurationException
{
PlexusConfiguration
child
=
configuration
.
getChild
(
configName
,
false
);
if
(
child
==
null
)
return
null
;
// no such config
...
...
maven-plugin/src/main/java/hudson/maven/reporters/TestMojo.java
浏览文件 @
bdd85808
...
...
@@ -8,6 +8,8 @@ import java.util.Collection;
import
java.util.Collections
;
import
java.util.Iterator
;
import
javax.annotation.CheckForNull
;
import
org.apache.maven.project.MavenProject
;
import
org.apache.tools.ant.types.FileSet
;
import
org.codehaus.plexus.component.configurator.ComponentConfigurationException
;
...
...
@@ -60,7 +62,10 @@ enum TestMojo {
File
reportsDir
=
mojo
.
getConfigurationValue
(
"jasmineTargetDir"
,
File
.
class
);
String
junitFileName
=
mojo
.
getConfigurationValue
(
"junitXmlReportFileName"
,
String
.
class
);
return
Collections
.
singleton
(
new
File
(
reportsDir
,
junitFileName
));
if
(
reportsDir
!=
null
&&
junitFileName
!=
null
)
{
return
Collections
.
singleton
(
new
File
(
reportsDir
,
junitFileName
));
}
return
null
;
}
},
TOOLKIT_RESOLVER_PLUGIN
(
"org.terracotta.maven.plugins"
,
"toolkit-resolver-plugin"
,
"toolkit-resolve-test"
,
"reportsDirectory"
);
...
...
@@ -98,7 +103,7 @@ enum TestMojo {
return
mojo
.
pluginName
.
version
.
compareTo
(
this
.
minimalRequiredVersion
)
>=
0
;
}
public
Iterable
<
File
>
getReportFiles
(
MavenProject
pom
,
MojoInfo
mojo
)
throws
ComponentConfigurationException
{
@CheckForNull
public
Iterable
<
File
>
getReportFiles
(
MavenProject
pom
,
MojoInfo
mojo
)
throws
ComponentConfigurationException
{
if
(
this
.
reportDirectoryConfigKey
!=
null
)
{
File
reportsDir
=
mojo
.
getConfigurationValue
(
this
.
reportDirectoryConfigKey
,
File
.
class
);
if
(
reportsDir
!=
null
&&
reportsDir
.
exists
())
{
...
...
maven-plugin/src/test/java/hudson/maven/reporters/TestMojoTest.java
0 → 100644
浏览文件 @
bdd85808
package
hudson.maven.reporters
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
hudson.maven.MojoInfo
;
import
hudson.maven.MojoInfoBuilder
;
import
java.io.File
;
import
org.apache.maven.model.Build
;
import
org.apache.maven.project.MavenProject
;
import
org.codehaus.plexus.component.configurator.ComponentConfigurationException
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.Bug
;
public
class
TestMojoTest
{
@Test
@Bug
(
16573
)
public
void
testGetReportFilesThrowsNoException
()
throws
ComponentConfigurationException
{
// no 'reportsDirectory' or so config value set:
MojoInfo
mojoInfo
=
MojoInfoBuilder
.
mojoBuilder
(
"com.some"
,
"testMojo"
,
"test"
).
build
();
MavenProject
pom
=
mock
(
MavenProject
.
class
);
when
(
pom
.
getBasedir
()).
thenReturn
(
new
File
(
"foo"
));
Build
build
=
mock
(
Build
.
class
);
when
(
build
.
getDirectory
()).
thenReturn
(
"bar"
);
when
(
pom
.
getBuild
()).
thenReturn
(
build
);
for
(
TestMojo
testMojo
:
TestMojo
.
values
())
{
testMojo
.
getReportFiles
(
pom
,
mojoInfo
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录