Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
53610654
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
53610654
编写于
4月 14, 2014
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extracting MatrixAggregatable dependency.
(cherry picked from commit
5d9e4d7b
)
上级
3ca23a11
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
1 addition
and
139 deletion
+1
-139
core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
...src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
+1
-10
core/src/main/java/hudson/tasks/test/MatrixTestResult.java
core/src/main/java/hudson/tasks/test/MatrixTestResult.java
+0
-69
core/src/main/java/hudson/tasks/test/TestResultAggregator.java
...src/main/java/hudson/tasks/test/TestResultAggregator.java
+0
-60
未找到文件。
core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
浏览文件 @
53610654
...
...
@@ -28,9 +28,6 @@ import hudson.AbortException;
import
hudson.Extension
;
import
hudson.FilePath
;
import
hudson.Launcher
;
import
hudson.matrix.MatrixAggregatable
;
import
hudson.matrix.MatrixAggregator
;
import
hudson.matrix.MatrixBuild
;
import
hudson.model.AbstractBuild
;
import
hudson.model.AbstractProject
;
import
hudson.model.Action
;
...
...
@@ -44,7 +41,6 @@ import hudson.tasks.BuildStepMonitor;
import
hudson.tasks.Publisher
;
import
hudson.tasks.Recorder
;
import
hudson.tasks.junit.TestResultAction.Data
;
import
hudson.tasks.test.TestResultAggregator
;
import
hudson.tasks.test.TestResultProjectAction
;
import
hudson.util.DescribableList
;
import
hudson.util.FormValidation
;
...
...
@@ -67,7 +63,7 @@ import java.util.List;
*
* @author Kohsuke Kawaguchi
*/
public
class
JUnitResultArchiver
extends
Recorder
implements
MatrixAggregatable
{
public
class
JUnitResultArchiver
extends
Recorder
{
/**
* {@link FileSet} "includes" string, like "foo/bar/*.xml"
...
...
@@ -213,11 +209,6 @@ public class JUnitResultArchiver extends Recorder implements MatrixAggregatable
return
Collections
.<
Action
>
singleton
(
new
TestResultProjectAction
(
project
));
}
public
MatrixAggregator
createAggregator
(
MatrixBuild
build
,
Launcher
launcher
,
BuildListener
listener
)
{
return
new
TestResultAggregator
(
build
,
launcher
,
listener
);
}
/**
* @return the keepLongStdio
*/
...
...
core/src/main/java/hudson/tasks/test/MatrixTestResult.java
已删除
100644 → 0
浏览文件 @
3ca23a11
/*
* The MIT License
*
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Yahoo!, 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
hudson.tasks.test
;
import
hudson.matrix.Combination
;
import
hudson.matrix.MatrixBuild
;
import
hudson.matrix.MatrixRun
;
import
hudson.model.AbstractBuild
;
import
hudson.model.Action
;
/**
* {@link Action} that aggregates all the test results from {@link MatrixRun}s.
*
* <p>
* This object is attached to {@link MatrixBuild}.
*
* @author Kohsuke Kawaguchi
*/
public
class
MatrixTestResult
extends
AggregatedTestResultAction
{
@Deprecated
public
MatrixTestResult
(
MatrixBuild
owner
)
{
super
(
owner
);
}
/** @since 1.545 */
public
MatrixTestResult
()
{}
/**
* Use the configuration name.
*/
@Override
protected
String
getChildName
(
AbstractTestResultAction
tr
)
{
return
tr
.
owner
.
getProject
().
getName
();
}
@Override
public
AbstractBuild
<?,?>
resolveChild
(
Child
child
)
{
MatrixBuild
b
=
(
MatrixBuild
)
owner
;
return
b
.
getProject
().
getItem
(
Combination
.
fromString
(
child
.
name
)).
getBuildByNumber
(
child
.
build
);
}
@Override
public
String
getTestResultPath
(
TestResult
it
)
{
// Prepend Configuration path
return
it
.
getOwner
().
getParent
().
getShortUrl
()
+
super
.
getTestResultPath
(
it
);
}
}
core/src/main/java/hudson/tasks/test/TestResultAggregator.java
已删除
100644 → 0
浏览文件 @
3ca23a11
/*
* The MIT License
*
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Yahoo!, 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
hudson.tasks.test
;
import
hudson.Launcher
;
import
hudson.matrix.MatrixAggregator
;
import
hudson.matrix.MatrixBuild
;
import
hudson.matrix.MatrixRun
;
import
hudson.model.BuildListener
;
import
java.io.IOException
;
/**
* Aggregates {@link AbstractTestResultAction}s of {@link MatrixRun}s
* into {@link MatrixBuild}.
*
* @author Kohsuke Kawaguchi
*/
public
class
TestResultAggregator
extends
MatrixAggregator
{
private
MatrixTestResult
result
;
public
TestResultAggregator
(
MatrixBuild
build
,
Launcher
launcher
,
BuildListener
listener
)
{
super
(
build
,
launcher
,
listener
);
}
@Override
public
boolean
startBuild
()
throws
InterruptedException
,
IOException
{
result
=
new
MatrixTestResult
();
build
.
addAction
(
result
);
return
true
;
}
@Override
public
boolean
endRun
(
MatrixRun
run
)
throws
InterruptedException
,
IOException
{
AbstractTestResultAction
atr
=
run
.
getAction
(
AbstractTestResultAction
.
class
);
if
(
atr
!=
null
)
result
.
add
(
atr
);
return
true
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录