Extract comparator

Author: mpkorstanje

java/src/main/java/io/cucumber/query/Query.java

@@ -36,7 +36,6 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static io.cucumber.query.LineageReducer.ascending;
 import static java.util.Collections.emptyList;
 import static java.util.Comparator.comparing;
 import static java.util.Comparator.naturalOrder;
@@ -109,31 +108,12 @@ public List<PickleStep> findAllPickleSteps() {
 
     public List<TestCaseStarted> findAllTestCaseStarted() {
         return this.testCaseStartedById.values().stream()
-                .sorted(comparing(TestCaseStarted::getTimestamp, timestampComparator))
+                .sorted(comparing(TestCaseStarted::getTimestamp, new TimestampComparator()))
                 .filter(element -> !findTestCaseFinishedBy(element)
                         .filter(TestCaseFinished::getWillBeRetried)
                         .isPresent())
                 .collect(toList());
     }
-    
-    // TODO: Move to Messages, make comparable?
-    private final Comparator<Timestamp> timestampComparator = (a, b) -> {
-        long x = a.getSeconds();
-        long y = b.getSeconds();
-        int cmp;
-        if (x < y) 
-            return -1;
-        if(y > x) 
-            return 1;
-
-        long x1 = a.getNanos();
-        long y1 = b.getNanos();
-        if (x1 < y1)
-            return -1;
-        if(y1 > x1)
-            return 1;
-        return 0;
-    };
 
     public Map<Optional<Feature>, List<TestCaseStarted>> findAllTestCaseStartedGroupedByFeature() {
         return findAllTestCaseStarted()

java/src/main/java/io/cucumber/query/TimestampComparator.java

@@ -0,0 +1,30 @@
+package io.cucumber.query;
+
+import io.cucumber.messages.types.Timestamp;
+
+import java.util.Comparator;
+
+class TimestampComparator implements Comparator<Timestamp> {
+    @Override
+    public int compare(Timestamp a, Timestamp b) {
+        long sa = a.getSeconds();
+        long sb = b.getSeconds();
+
+        if (sa < sb) {
+            return -1;
+        } else if (sb < sa) {
+            return 1;
+        }
+
+        long na = a.getNanos();
+        long nb = b.getNanos();
+
+        if (na < nb) {
+            return -1;
+        } else if (nb < na) {
+            return 1;
+        }
+
+        return 0;
+    }
+}

java/src/test/java/io/cucumber/query/TimestampComparatorTest.java

@@ -0,0 +1,42 @@
+package io.cucumber.query;
+
+import io.cucumber.messages.types.Timestamp;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TimestampComparatorTest {
+    
+    private final TimestampComparator comparator = new TimestampComparator();
+    
+    @Test
+    void identity(){
+        Timestamp a = new Timestamp(1L, 1L);
+        Timestamp b = new Timestamp(1L, 1L);
+
+        assertThat(comparator.compare(a, b)).isEqualTo(0);
+        assertThat(comparator.compare(b, a)).isEqualTo(0);
+    }
+    
+    @Test
+    void onSeconds(){
+        Timestamp a = new Timestamp(1L, 1L);
+        Timestamp b = new Timestamp(2L, 2L);
+        assertThat(comparator.compare(a, b)).isEqualTo(-1);
+        assertThat(comparator.compare(b, a)).isEqualTo(1);
+    }
+    
+    @Test
+    void onNanoSeconds(){
+        Timestamp a = new Timestamp(1L, 1L);
+        Timestamp b1 = new Timestamp(1L, 0L);
+        Timestamp b2 = new Timestamp(1L, 2L);
+        
+        assertThat(comparator.compare(a, b1)).isEqualTo(1);
+        assertThat(comparator.compare(b1, a)).isEqualTo(-1);
+        
+        assertThat(comparator.compare(a, b2)).isEqualTo(-1);
+        assertThat(comparator.compare(b2, a)).isEqualTo(1);
+        
+    }
+}