提交 b03ad296 编写于 作者: K Kohsuke Kawaguchi

Merge pull request #998 from jenkinsci/jenkins-19898

[FIXED JENKINS-19898] test base classes should not be linked to the junit implementation.
......@@ -331,6 +331,7 @@ public class CaseResult extends TestResult implements Comparable<CaseResult> {
else return className.substring(0,idx);
}
@Override
public String getFullName() {
return className+'.'+getName();
}
......
......@@ -227,6 +227,7 @@ public final class ClassResult extends TabulatedResult implements Comparable<Cla
/**
* @since 1.515
*/
@Override
public String getFullName() {
return getParent().getName() + "." + className;
}
......
......@@ -25,7 +25,6 @@ package hudson.tasks.test;
import hudson.Functions;
import hudson.model.*;
import hudson.tasks.junit.CaseResult;
import hudson.util.*;
import hudson.util.ChartUtil.NumberOnlyBuildLabel;
......@@ -202,7 +201,7 @@ public abstract class AbstractTestResultAction<T extends AbstractTestResultActio
*
* @return List of failed tests from associated test result.
*/
public List<CaseResult> getFailedTests() {
public List<? extends TestResult> getFailedTests() {
return Collections.emptyList();
}
......
......@@ -24,8 +24,6 @@
package hudson.tasks.test;
import hudson.model.AbstractBuild;
import hudson.tasks.junit.CaseResult;
import hudson.tasks.junit.TestResult;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;
......@@ -108,8 +106,8 @@ public abstract class AggregatedTestResultAction extends AbstractTestResultActio
}
@Override
public List<CaseResult> getFailedTests() {
List<CaseResult> failedTests = new ArrayList<CaseResult>(failCount);
public List<? extends TestResult> getFailedTests() {
List<TestResult> failedTests = new ArrayList<TestResult>(failCount);
for (ChildReport childReport : getChildReports()) {
if (childReport.result instanceof TestResult) {
failedTests.addAll(((TestResult) childReport.result).getFailedTests());
......
......@@ -310,6 +310,20 @@ public abstract class TestObject extends hudson.tasks.junit.TestObject {
return "";
}
/**
* Gets the full name of this object.
* @since 1.594
*/
public String getFullName() {
StringBuilder sb = new StringBuilder(getName());
if (getParent() != null) {
sb.insert(0, " : ");
sb.insert(0, getParent().getFullName());
}
return sb.toString();
}
/**
* Gets the version of {@link #getName()} that's URL-safe.
*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册