Skip to content

Commit 69344cf

Browse files
committed
Culprits from the headline are listed in alphabetical order so that the list is easier to read.
1 parent ddd190b commit 69344cf

File tree

2 files changed

+7
-10
lines changed
  • src
    • main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel
    • test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel

2 files changed

+7
-10
lines changed

src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildView.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
import hudson.model.Run;
1414
import hudson.model.User;
1515

16-
import java.util.Date;
17-
import java.util.HashSet;
18-
import java.util.List;
19-
import java.util.Set;
16+
import java.util.*;
2017

2118
public class BuildView implements BuildViewModel {
2219

@@ -123,7 +120,7 @@ public BuildViewModel previousBuild() {
123120

124121
@Override
125122
public Set<String> culprits() {
126-
Set<String> culprits = new HashSet<String>();
123+
Set<String> culprits = new TreeSet<String>();
127124

128125
if (build instanceof AbstractBuild<?, ?>) {
129126
AbstractBuild<?, ?> jenkinsBuild = (AbstractBuild<?, ?>) build;

src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViewTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -349,11 +349,11 @@ public void should_tell_who_broke_the_build() throws Exception {
349349
}
350350

351351
@Test
352-
public void should_list_committers_who_broke_the_build() throws Exception {
352+
public void should_list_committers_who_broke_the_build_in_alphabetical_order() throws Exception {
353353
view = a(jobView().of(
354354
a(job().whereTheLast(build().wasBrokenBy("Adam", "Ben")))));
355355

356-
assertThat(view.headline(), is("Failed after Ben and Adam committed their changes"));
356+
assertThat(view.headline(), is("Failed after Adam and Ben committed their changes"));
357357
}
358358

359359
@Test
@@ -380,10 +380,10 @@ public void should_tell_the_number_of_broken_builds_since_the_last_broken_build(
380380
public void should_tell_the_number_of_broken_builds_since_the_last_build_broken_by_multiple_committers() throws Exception {
381381
view = a(jobView().of(
382382
a(job().whereTheLast(build().wasBrokenBy("Adam")).
383-
andThePrevious(build().wasBrokenBy("Ben", "Connor")).
384-
andThePrevious(build().succeededThanksTo("Daniel")))));
383+
andThePrevious(build().wasBrokenBy("Daniel", "Ben", "Connor")).
384+
andThePrevious(build().succeededThanksTo("Errol")))));
385385

386-
assertThat(view.headline(), is("1 build has failed since Ben and Connor committed their changes"));
386+
assertThat(view.headline(), is("1 build has failed since Ben, Connor and Daniel committed their changes"));
387387
}
388388

389389
/*

0 commit comments

Comments
 (0)