diff --git a/core/src/main/java/hudson/model/ResultTrend.java b/core/src/main/java/hudson/model/ResultTrend.java index 7361b9c15f..cd454ea517 100644 --- a/core/src/main/java/hudson/model/ResultTrend.java +++ b/core/src/main/java/hudson/model/ResultTrend.java @@ -61,7 +61,7 @@ public enum ResultTrend { STILL_FAILING(Messages._ResultTrend_StillFailing()), /** * Previous build (if there is one) was {@link Result#SUCCESS} or {@link Result#UNSTABLE} - * and current build is {@link Result#UNSTABLE}. + * and current build is {@link Result#FAILURE}. */ FAILURE(Messages._ResultTrend_Failure()), /** diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index f659a888c9..79a92d8dc2 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -1616,59 +1616,77 @@ public abstract class Run ,RunT extends Run0) - return new Summary(false, Messages.Run_Summary_TestFailures(trN.getFailCount())); - } else { - if(trN.getFailCount()!= 0) { - if(trP.getFailCount()==0) - return new Summary(true, Messages.Run_Summary_TestsStartedToFail(trN.getFailCount())); - if(trP.getFailCount() < trN.getFailCount()) - return new Summary(true, Messages.Run_Summary_MoreTestsFailing(trN.getFailCount()-trP.getFailCount(), trN.getFailCount())); - if(trP.getFailCount() > trN.getFailCount()) - return new Summary(false, Messages.Run_Summary_LessTestsFailing(trP.getFailCount()-trN.getFailCount(), trN.getFailCount())); - - return new Summary(false, Messages.Run_Summary_TestsStillFailing(trN.getFailCount())); - } + /** + * @param worseOverride override the 'worse' parameter to this value. + * May be null in which case 'worse' is calculated based on the number of failed tests. + */ + private Summary determineDetailedUnstableSummary(Boolean worseOverride) { + Run prev = getPreviousBuild(); + + if(((Run)this) instanceof AbstractBuild) { + AbstractTestResultAction trN = ((AbstractBuild)(Run)this).getTestResultAction(); + AbstractTestResultAction trP = prev==null ? null : ((AbstractBuild) prev).getTestResultAction(); + if(trP==null) { + if(trN!=null && trN.getFailCount()>0) + return new Summary(worseOverride != null ? worseOverride : true, + Messages.Run_Summary_TestFailures(trN.getFailCount())); + } else { + if(trN.getFailCount()!= 0) { + if(trP.getFailCount()==0) + return new Summary(worseOverride != null ? worseOverride : true, + Messages.Run_Summary_TestsStartedToFail(trN.getFailCount())); + if(trP.getFailCount() < trN.getFailCount()) + return new Summary(worseOverride != null ? worseOverride : true, + Messages.Run_Summary_MoreTestsFailing(trN.getFailCount()-trP.getFailCount(), trN.getFailCount())); + if(trP.getFailCount() > trN.getFailCount()) + return new Summary(worseOverride != null ? worseOverride : false, + Messages.Run_Summary_LessTestsFailing(trP.getFailCount()-trN.getFailCount(), trN.getFailCount())); + + return new Summary(worseOverride != null ? worseOverride : false, + Messages.Run_Summary_TestsStillFailing(trN.getFailCount())); } } - - return new Summary(false, Messages.Run_Summary_Unstable()); } - - return new Summary(false, Messages.Run_Summary_Unknown()); + + return new Summary(worseOverride != null ? worseOverride : false, + Messages.Run_Summary_Unstable()); } /** diff --git a/core/src/test/java/hudson/model/BuildStatusSummaryTest.java b/core/src/test/java/hudson/model/BuildStatusSummaryTest.java index dddd84f1b5..5973f65fdc 100644 --- a/core/src/test/java/hudson/model/BuildStatusSummaryTest.java +++ b/core/src/test/java/hudson/model/BuildStatusSummaryTest.java @@ -42,7 +42,12 @@ public class BuildStatusSummaryTest { when(this.prevBuild.getResult()).thenReturn(Result.SUCCESS); Summary summary = this.build.getBuildStatusSummary(); + assertFalse(summary.isWorse); + assertEquals(Messages.Run_Summary_Stable(), summary.message); + // same if there is no previous build + when(this.build.getPreviousBuild()).thenReturn(null); + summary = this.build.getBuildStatusSummary(); assertFalse(summary.isWorse); assertEquals(Messages.Run_Summary_Stable(), summary.message); @@ -50,7 +55,6 @@ public class BuildStatusSummaryTest { when(this.prevBuild.getResult()).thenReturn(Result.NOT_BUILT); summary = this.build.getBuildStatusSummary(); - assertFalse(summary.isWorse); assertEquals(Messages.Run_Summary_Stable(), summary.message); @@ -59,7 +63,6 @@ public class BuildStatusSummaryTest { when(this.prevBuild.getResult()).thenReturn(Result.ABORTED); summary = this.build.getBuildStatusSummary(); - assertFalse(summary.isWorse); assertEquals(Messages.Run_Summary_Stable(), summary.message); } @@ -132,6 +135,17 @@ public class BuildStatusSummaryTest { assertTrue(summary.isWorse); //assertEquals(Messages.Run_Summary_Stable(), summary.message); } + + @Test + public void testUnstableAfterFailure() { + when(this.build.getResult()).thenReturn(Result.UNSTABLE); + when(this.prevBuild.getResult()).thenReturn(Result.FAILURE); + + Summary summary = this.build.getBuildStatusSummary(); + + assertFalse(summary.isWorse); + assertEquals(Messages.Run_Summary_Unstable(), summary.message); + } @Test public void testBuildGotAFailingTest() {