check display revision + add tests

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/history/AnnotationLine.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2023, Ric Harris <[email protected]>.
  */
 package org.opengrok.indexer.history;
@@ -120,6 +120,9 @@ public boolean equals(Object obj) {
         if (!Objects.equals(getRevision(), other.getRevision())) {
             return false;
         }
+        if (!Objects.equals(getDisplayRevision(), other.getDisplayRevision())) {
+            return false;
+        }
 
         return true;
     }

opengrok-indexer/src/test/java/org/opengrok/indexer/history/AnnotationLineTest.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2023, Ric Harris <[email protected]>.
  */
 package org.opengrok.indexer.history;
@@ -62,6 +62,20 @@ void testEqualsNegative3() {
         assertNotEquals(annotationLine1, annotationLine2);
     }
 
+    @Test
+    void testEqualsPositiveDisplayRevision() {
+        AnnotationLine annotationLine1 = new AnnotationLine("1.0000", "bar", true, "1.0");
+        AnnotationLine annotationLine2 = new AnnotationLine("1.0000", "bar", true, "1.0");
+        assertEquals(annotationLine1, annotationLine2);
+    }
+
+    @Test
+    void testEqualsNegativeDisplayRevision() {
+        AnnotationLine annotationLine1 = new AnnotationLine("1.0000", "bar", true, "1.0");
+        AnnotationLine annotationLine2 = new AnnotationLine("1.0000", "bar", true, "1.1");
+        assertNotEquals(annotationLine1, annotationLine2);
+    }
+
     /**
      * This is useful for various equals tests in {@link AnnotationDataTest}.
      */