Sort threads in timeline lexicographically

Ideally they'd be sorted by id, but we don't have access to that
anymore. So we have to sort by their name. Which can only be done
lexicographically.

Author: mpkorstanje

cucumber-core/src/main/java/io/cucumber/core/plugin/TimelineFormatter.java

@@ -33,14 +33,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.TreeMap;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Value.construct;
 import static io.cucumber.query.Repository.RepositoryFeature.INCLUDE_GHERKIN_DOCUMENTS;
+import static java.util.Comparator.comparing;
 import static java.util.Locale.ROOT;
 
 /**
@@ -106,35 +104,37 @@ private void write(Envelope event) {
     }
 
     private void writeTimeLineReport() throws IOException {
-        Map<String, TimeLineGroup> timeLineGroups = new HashMap<>();
-        AtomicInteger nextGroupId = new AtomicInteger();
+        Map<String, TimeLineGroup> timeLineGroupsById = new HashMap<>();
         List<TimeLineItem> timeLineItems = query.findAllTestCaseFinished().stream()
                 .map(testCaseFinished -> query.findTestCaseStartedBy(testCaseFinished)
                         .map(testCaseStarted -> createTestData(
                             testCaseFinished, //
                             testCaseStarted, //
-                            createTimeLineGroup(timeLineGroups, nextGroupId) //
+                            createTimeLineGroup(timeLineGroupsById) //
                         )))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .collect(Collectors.toList());
 
+        List<TimeLineGroup> timeLineGroups = timeLineGroupsById.values().stream()
+                .sorted(comparing(TimeLineGroup::getId))
+                .collect(Collectors.toList());
+
         writeTimeLineReport(timeLineGroups, timeLineItems);
     }
 
     private Function<String, TimeLineGroup> createTimeLineGroup(
-            Map<String, TimeLineGroup> timeLineGroups,
-            AtomicInteger nextGroupId
+            Map<String, TimeLineGroup> timeLineGroups
     ) {
 
-        return workerId -> timeLineGroups.computeIfAbsent(workerId, createTimeLineGroup(nextGroupId::incrementAndGet));
+        return workerId -> timeLineGroups.computeIfAbsent(workerId, createTimeLineGroup());
     }
 
-    private Function<String, TimeLineGroup> createTimeLineGroup(Supplier<Integer> nextGroupId) {
+    private Function<String, TimeLineGroup> createTimeLineGroup() {
         return workerId -> {
             TimeLineGroup timeLineGroup = new TimeLineGroup();
             timeLineGroup.setContent(workerId);
-            timeLineGroup.setId(nextGroupId.get());
+            timeLineGroup.setId(workerId);
             return timeLineGroup;
         };
     }
@@ -196,13 +196,13 @@ private String getTagsValue(TestCaseStarted testCaseStarted) {
                 }).orElse("");
     }
 
-    private void writeTimeLineReport(Map<String, TimeLineGroup> timeLineGroups, List<TimeLineItem> timeLineItems)
+    private void writeTimeLineReport(List<TimeLineGroup> timeLineGroups, List<TimeLineItem> timeLineItems)
             throws IOException {
         writeReportJs(timeLineGroups, timeLineItems);
         copyReportFiles();
     }
 
-    private void writeReportJs(Map<String, TimeLineGroup> timeLineGroups, List<TimeLineItem> timeLineItems)
+    private void writeReportJs(List<TimeLineGroup> timeLineGroups, List<TimeLineItem> timeLineItems)
             throws IOException {
         File reportJsFile = new File(reportDir, "report.js");
         try (BufferedWriter reportJs = Files.newBufferedWriter(reportJsFile.toPath(), StandardCharsets.UTF_8)) {
@@ -212,7 +212,7 @@ private void writeReportJs(Map<String, TimeLineGroup> timeLineGroups, List<TimeL
             reportJs.append("\n");
             // Need to sort groups by id, so can guarantee output of order in
             // rendered timeline
-            appendAsJsonToJs(reportJs, "timelineGroups", new TreeMap<>(timeLineGroups).values());
+            appendAsJsonToJs(reportJs, "timelineGroups", timeLineGroups);
             reportJs.append("\n");
             reportJs.append("});");
         }
@@ -254,18 +254,18 @@ private static void copyFile(InputStream source, File dest) throws IOException {
 
     static class TimeLineGroup {
 
-        private long id;
+        private String id;
         private String content;
 
-        public void setId(long id) {
+        public void setId(String id) {
             this.id = id;
         }
 
         public void setContent(String content) {
             this.content = content;
         }
 
-        public long getId() {
+        public String getId() {
             return id;
         }
 
@@ -281,7 +281,7 @@ static class TimeLineItem {
         private String feature;
         private String scenario;
         private long start;
-        private long group;
+        private String group;
         private String content = ""; // Replaced in JS file
         private String tags;
         private long end;
@@ -303,7 +303,7 @@ public void setStart(long start) {
             this.start = start;
         }
 
-        public void setGroup(long group) {
+        public void setGroup(String group) {
             this.group = group;
         }
 
@@ -339,7 +339,7 @@ public long getStart() {
             return start;
         }
 
-        public long getGroup() {
+        public String getGroup() {
             return group;
         }
 

cucumber-core/src/test/java/io/cucumber/core/plugin/TimelineFormatterTest.java

@@ -180,8 +180,8 @@ void shouldWriteItemsCorrectlyToReportJsWhenRunInParallel() throws Throwable {
             final int idx = i;
             assertAll(
                 () -> assertThat(String.format("id on group %s, was not as expected", idx),
-                    actual.getId() > 0,
-                    is(equalTo(true))),
+                    actual.getId(),
+                    is(notNullValue())),
                 () -> assertThat(String.format("content on group %s, was not as expected",
                     idx), actual.getContent(),
                     is(notNullValue())));
@@ -201,7 +201,7 @@ private TimeLineItem[] getExpectedTestData() throws JsonProcessingException {
                 " \"scenario\": \"Scenario 1\",\n" +
                 " \"start\": 0,\n" +
                 " \"end\": 6000,\n" +
-                " \"group\": 1,\n" +
+                " \"group\": \"main\",\n" +
                 " \"content\": \"\",\n" +
                 " \"tags\": \"@taga,\",\n" +
                 " \"className\": \"failed\"\n" +
@@ -211,7 +211,7 @@ private TimeLineItem[] getExpectedTestData() throws JsonProcessingException {
                 " \"scenario\": \"Scenario 2\",\n" +
                 " \"start\": 6000,\n" +
                 " \"end\": 12000,\n" +
-                " \"group\": 1,\n" +
+                " \"group\": \"main\",\n" +
                 " \"content\": \"\",\n" +
                 " \"tags\": \"\",\n" +
                 " \"className\": \"failed\"\n" +
@@ -221,7 +221,7 @@ private TimeLineItem[] getExpectedTestData() throws JsonProcessingException {
                 " \"scenario\": \"Scenario 3\",\n" +
                 " \"start\": 18000,\n" +
                 " \"end\": 24000,\n" +
-                " \"group\": 1,\n" +
+                " \"group\": \"main\",\n" +
                 " \"content\": \"\",\n" +
                 " \"tags\": \"@tagb,@tagc,\",\n" +
                 " \"className\": \"passed\"\n" +
@@ -231,7 +231,7 @@ private TimeLineItem[] getExpectedTestData() throws JsonProcessingException {
                 " \"feature\": \"Pending Feature\",\n" +
                 " \"start\": 12000,\n" +
                 " \"end\": 18000,\n" +
-                " \"group\": 1,\n" +
+                " \"group\": \"main\",\n" +
                 " \"content\": \"\",\n" +
                 " \"tags\": \"\",\n" +
                 " \"className\": \"undefined\"\n" +
@@ -325,7 +325,7 @@ void shouldWriteItemsAndGroupsCorrectlyToReportJs() throws Throwable {
         TimeLineGroup[] expectedGroups = objectMapper.readValue(
             ("[\n" +
                     " {\n" +
-                    " \"id\": 1,\n" +
+                    " \"id\": \"main\",\n" +
                     " \"content\": \"groupName\"\n" +
                     " }\n" +
                     "]")