Skip to content

Commit

Permalink
JENKINS-28064
Browse files Browse the repository at this point in the history 
'Replace nr. of failed test cases' option doesn't work
  • Loading branch information
@tomaszbech
tomaszbech committed Apr 23, 2015
1 parent acaec33 commit 7c4d19f
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 33 deletions.
26 changes: 25 additions & 1 deletion pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<!-- which version of Hudson is this plugin built against? -->
<version>1.475</version>
<version>1.610</version>
</parent>

<artifactId>xfpanel</artifactId>
Expand Down Expand Up @@ -65,6 +65,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<powermock.version>1.6.2</powermock.version>
</properties>

<pluginRepositories>
Expand Down Expand Up @@ -117,10 +118,33 @@
<artifactId>claim</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
74 changes: 42 additions & 32 deletions src/main/java/maps/hudson/plugin/xfpanel/XFPanelEntry.java
View file
@@ -1,18 +1,18 @@
package maps.hudson.plugin.xfpanel;

import hudson.Functions;
import hudson.Plugin;
import hudson.model.Result;
import hudson.model.AbstractBuild;
import hudson.model.Action;
import hudson.model.Hudson;
import hudson.model.Job;
import hudson.model.Result;
import hudson.model.Run;
import hudson.model.User;
import hudson.plugins.claim.ClaimBuildAction;
import hudson.plugins.claim.ClaimTestAction;
import hudson.scm.ChangeLogSet.Entry;
import hudson.tasks.junit.CaseResult;
import hudson.tasks.junit.TestResultAction;
import hudson.tasks.junit.CaseResult;
import hudson.tasks.test.AbstractTestResultAction;

import java.text.NumberFormat;
Expand All @@ -23,7 +23,8 @@
import java.util.List;
import java.util.Set;

import maps.hudson.plugin.xfpanel.XFPanelView;
import jenkins.model.Jenkins;
import maps.hudson.plugin.xfpanel.XFPanelView.Blame;

/**
* Represents a job to be shown on the panel
Expand All @@ -32,7 +33,7 @@
*
* @author jrenaut
*/
public final class XFPanelEntry extends XFPanelView {
public final class XFPanelEntry {

private Job<?, ?> job;
private String backgroundColor;
Expand All @@ -42,14 +43,15 @@ public final class XFPanelEntry extends XFPanelView {
private Boolean building = false;
private String completionTimestampString = "";
private Calendar completionTimestamp;
private XFPanelView view;

/**
/**
* C'tor
* @param job the job to be represented
*/
public XFPanelEntry(XFPanelView view, Job<?, ?> job) {
super(view.getDisplayName(), view.getNumColumns());
this.job = job;
this.view = view;
this.job = job;
this.findStatus();
this.setTimes();
}
Expand All @@ -66,7 +68,7 @@ public XFPanelEntry(XFPanelView view, Job<?, ?> job) {
*/
public String getName() {
String label = job.getDisplayName().toUpperCase();
if (getShowDescription() == true && !job.getDescription().isEmpty()) {
if (getView().getShowDescription() == true && !job.getDescription().isEmpty()) {
label += ": " + job.getDescription();
}
return label;
Expand All @@ -84,7 +86,7 @@ public Boolean getQueued() {
*/
public Integer getQueueNumber() {
// placeInQueue==null right after deserialization because it's transient
return placeInQueue==null ? null : placeInQueue.get(this.job.getQueueItem());
return getView().placeInQueue==null ? null : getView().placeInQueue.get(this.job.getQueueItem());
}

public AbstractBuild<?, ?> getLastBuild() {
Expand Down Expand Up @@ -155,7 +157,7 @@ public Boolean getBroken() {
* @return 1 on success
*/
public Boolean getShowResponsibles() {
if (BlameState == Blame.NOTATALL)
if (getView().BlameState == XFPanelView.Blame.NOTATALL)
return false;
return true;
}
Expand Down Expand Up @@ -296,22 +298,22 @@ public String convertCulpritsToString(HashSet<User> input) {

int i=0;
for (; it.hasNext(); i++) {
if (i < getMaxAmmountOfResponsibles()) {
if (i < getView().getMaxAmmountOfResponsibles()) {
output += it.next().getFullName() + ((it.hasNext()) ? ", " : "");
} else {
it.next();
}
}
if (i > getMaxAmmountOfResponsibles()){
output += "... <"+ (i-getMaxAmmountOfResponsibles()) + " more>";
if (i > getView().getMaxAmmountOfResponsibles()){
output += "... <"+ (i-getView().getMaxAmmountOfResponsibles()) + " more>";
}
if (!output.isEmpty())
return output;
return " - ";
}

public String getCulprits() {
if (BlameState == Blame.ONLYFIRSTFAILEDBUILD) {
if (getView().BlameState == Blame.ONLYFIRSTFAILEDBUILD) {
Run<?, ?> run = this.job.getLastStableBuild(); //getLastSuccessfulBuild();
if ( run == null ){ // if there aren't any successful builds
run = this.job.getFirstBuild();
Expand All @@ -322,13 +324,13 @@ public String getCulprits() {
AbstractBuild<?, ?> firstFailedBuild = (AbstractBuild<?, ?>) run;
return convertCulpritsToString( getCulpritFromBuild( firstFailedBuild ) );
}
} else if (BlameState == Blame.ONLYLASTFAILEDBUILD) {
} else if (getView().BlameState == Blame.ONLYLASTFAILEDBUILD) {
Run<?, ?> run = this.job.getLastFailedBuild();
if (run instanceof AbstractBuild<?, ?>) {
AbstractBuild<?, ?> lastFailedBuild = (AbstractBuild<?, ?>) run;
return convertCulpritsToString( getCulpritFromBuild( lastFailedBuild ) );
}
} else if (BlameState == Blame.EVERYINVOLVED) {
} else if (getView().BlameState == Blame.EVERYINVOLVED) {
AbstractBuild<?, ?> build = this.getLastBuild();
HashSet<User> BlameList = new HashSet<User>( build.getCulprits() );
return convertCulpritsToString( BlameList );
Expand Down Expand Up @@ -367,7 +369,7 @@ private ClaimBuildAction getClaimAction() {
*/
public boolean isClaimed() {
boolean result = false;
if (getIsClaimPluginInstalled()) {
if (getView().getIsClaimPluginInstalled()) {
ClaimBuildAction cba = getClaimAction();
if (cba != null) {
result = cba.isClaimed();
Expand Down Expand Up @@ -406,7 +408,8 @@ public String getClaimInfo() {
}

public hudson.tasks.junit.TestResult getClaimedTestCases(){
if (Hudson.getInstance().getPlugin("claim") != null) {
Plugin plugin = Jenkins.getInstance().getPlugin("claim");
if (plugin != null) {
Run<?, ?> lastBuild = job.getLastBuild();
if (lastBuild == null) {
return null;
Expand All @@ -418,9 +421,8 @@ public hudson.tasks.junit.TestResult getClaimedTestCases(){
return null;
}
}
List<Action> claimTestActionList = lastBuild.getActions();
List<TestResultAction> results = lastBuild.getActions(TestResultAction.class);
if ( results == null || claimTestActionList == null || results.size() == 0) {
if ( results == null || results.size() == 0) {
return null;
}
return results.get(0).getResult();
Expand Down Expand Up @@ -486,10 +488,10 @@ public int getNumClaimedTests() {
*/
public String getNumberOfTests(){
final int failedTests = getFailCount();
if (failedTests == 0 && getShowZeroTestCounts() == false) {
if (failedTests == 0 && getView().getShowZeroTestCounts() == false) {
return "";
}
if (getReplaceNumberOfTestCases()) {
if (getView().getReplaceNumberOfTestCases()) {
final int claimedTests = getNumClaimedTests();
if (claimedTests >= 0) {
return Integer.toString(failedTests - claimedTests);
Expand All @@ -510,7 +512,7 @@ public String getDiffColor() {
return "#00FF00";
}
}
return "#" + getBuildFontColor();
return "#" + getView().getBuildFontColor();
}

/**
Expand Down Expand Up @@ -565,24 +567,24 @@ private void findStatus() {
case BLUE_ANIME:
this.building = true;
case BLUE:
this.backgroundColor = getColors().getOkBG();
this.color = colors.getOkFG();
this.backgroundColor = getView().getColors().getOkBG();
this.color = getView().getColors().getOkFG();
this.colorFade = "build-fade-ok.png";
this.broken = false;
break;
case YELLOW_ANIME:
this.building = true;
case YELLOW:
this.backgroundColor = getColors().getFailedBG();
this.color = colors.getFailedFG();
this.backgroundColor = getView().getColors().getFailedBG();
this.color = getView().getColors().getFailedFG();
this.colorFade = "build-fade-fail.png";
this.broken = false;
break;
case RED_ANIME:
this.building = true;
case RED:
this.backgroundColor = getColors().getBrokenBG();
this.color = colors.getBrokenFG();
this.backgroundColor = getView().getColors().getBrokenBG();
this.color = getView().getColors().getBrokenFG();
this.colorFade = "build-fade-broken.png";
this.broken = true;
break;
Expand All @@ -591,10 +593,18 @@ private void findStatus() {
case ABORTED_ANIME:
this.building = true;
default:
this.backgroundColor = getColors().getOtherBG();
this.color = colors.getOtherFG();
this.backgroundColor = getView().getColors().getOtherBG();
this.color = getView().getColors().getOtherFG();
this.colorFade = "build-fade-other.png";
this.broken = true;
}
}

/**
* @return view of this entry
*/
public XFPanelView getView() {
return view;
}

}

0 comments on commit 7c4d19f

Please sign in to comment.