Fix findings equals not considering source position end

se-commons-logging/src/main/java/de/se_rwth/commons/logging/Finding.java

@@ -195,6 +195,7 @@ public boolean equals(Object obj) {
       Finding other = (Finding) obj;
       if (this.msg.equals(other.msg)
           && this.sourcePosition.equals(other.sourcePosition)
+          && this.sourcePositionEnd.equals(other.sourcePositionEnd)
           && this.type == other.type) {
         return true;
       }

se-commons-logging/src/test/java/de/se_rwth/commons/logging/FindingTest.java

@@ -0,0 +1,215 @@
+/* (c) https://github.com/MontiCore/monticore */
+package de.se_rwth.commons.logging;
+
+import de.se_rwth.commons.SourcePosition;
+import de.se_rwth.commons.SourcePositionBuilder;
+import org.junit.Assert;
+import org.junit.Test;
+
+@SuppressWarnings({"SimplifiableAssertion", "EqualsWithItself"})
+public class FindingTest {
+
+  private static SourcePositionBuilder spb() {
+    return new SourcePositionBuilder();
+  }
+
+  @Test
+  public void testShouldEqualItself1() {
+    // Given
+    Finding f = new Finding(Finding.Type.ERROR, "A");
+
+    // When && Then
+    Assert.assertTrue(f.equals(f));
+  }
+
+  @Test
+  public void testShouldEqualItself2() {
+    // Given
+    SourcePosition sp = spb().setLine(0).setColumn(1).setFileName("F").build();
+    Finding f = new Finding(Finding.Type.ERROR, "E", sp);
+
+    // When && Then
+    Assert.assertTrue(f.equals(f));
+  }
+
+  @Test
+  public void testShouldEqualItself3() {
+    // Given
+    SourcePosition sp = spb().setLine(0).setColumn(1).setFileName("F").build();
+    Finding f = new Finding(Finding.Type.WARNING, "E", sp);
+
+    // When && Then
+    Assert.assertTrue(f.equals(f));
+  }
+
+  @Test
+  public void testShouldEqualItself4() {
+    // Given
+    SourcePosition sp = spb().setLine(0).setColumn(1).setFileName("F").build();
+    Finding f = new Finding(Finding.Type.USER_ERROR, "E", sp);
+
+    // When && Then
+    Assert.assertTrue(f.equals(f));
+  }
+
+  @Test
+  public void testShouldEqualItself5() {
+    // Given
+    SourcePosition sp = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition spe = spb().setLine(2).setColumn(3).setFileName("F").build();
+    Finding f = new Finding(Finding.Type.ERROR, "E", sp, spe);
+
+    // When && Then
+    Assert.assertTrue(f.equals(f));
+  }
+
+  @Test
+  public void testShouldEqual1() {
+    // Given
+    Finding f1 = new Finding(Finding.Type.ERROR, "A");
+    Finding f2 = new Finding(Finding.Type.ERROR, "A");
+
+    // When && Then
+    Assert.assertTrue(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldEqual2() {
+    // Given
+    Finding f1 = new Finding(Finding.Type.WARNING, "A");
+    Finding f2 = new Finding(Finding.Type.WARNING, "A");
+
+    // When && Then
+    Assert.assertTrue(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldEqual3() {
+    // Given
+    Finding f1 = new Finding(Finding.Type.USER_ERROR, "A");
+    Finding f2 = new Finding(Finding.Type.USER_ERROR, "A");
+
+    // When && Then
+    Assert.assertTrue(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldEqual4() {
+    // Given
+    SourcePosition sp1 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition sp2 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    Finding f1 = new Finding(Finding.Type.ERROR, "E", sp1);
+    Finding f2 = new Finding(Finding.Type.ERROR, "E", sp2);
+
+    // When && Then
+    Assert.assertTrue(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldEqual5() {
+    // Given
+    SourcePosition sp1 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition spe1 = spb().setLine(2).setColumn(3).setFileName("F").build();
+    SourcePosition sp2 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition spe2 = spb().setLine(2).setColumn(3).setFileName("F").build();
+    Finding f1 = new Finding(Finding.Type.ERROR, "E", sp1, spe1);
+    Finding f2 = new Finding(Finding.Type.ERROR, "E", sp2, spe2);
+
+    // When && Then
+    Assert.assertTrue(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldNotEqual1() {
+    // Given
+    Finding f1 = new Finding(Finding.Type.ERROR, "A");
+    Finding f2 = new Finding(Finding.Type.ERROR, "B");
+
+    // When && Then
+    Assert.assertFalse(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldNotEqual2() {
+    // Given
+    Finding f1 = new Finding(Finding.Type.ERROR, "A");
+    Finding f2 = new Finding(Finding.Type.WARNING, "A");
+
+    // When && Then
+    Assert.assertFalse(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldNotEqual3() {
+    // Given
+    Finding f1 = new Finding(Finding.Type.ERROR, "A");
+    Finding f2 = new Finding(Finding.Type.WARNING, "B");
+
+    // When && Then
+    Assert.assertFalse(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldNotEqual4() {
+    // Given
+    SourcePosition sp1 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition sp2 = spb().setLine(0).setColumn(1).setFileName("!F").build();
+    Finding f1 = new Finding(Finding.Type.ERROR, "E", sp1);
+    Finding f2 = new Finding(Finding.Type.ERROR, "E", sp2);
+
+    // When && Then
+    Assert.assertFalse(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldNotEqual5() {
+    // Given
+    SourcePosition sp1 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition sp2 = spb().setLine(2).setColumn(1).setFileName("F").build();
+    Finding f1 = new Finding(Finding.Type.ERROR, "E", sp1);
+    Finding f2 = new Finding(Finding.Type.ERROR, "E", sp2);
+
+    // When && Then
+    Assert.assertFalse(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldNotEqual6() {
+    // Given
+    SourcePosition sp1 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition sp2 = spb().setLine(0).setColumn(2).setFileName("F").build();
+    Finding f1 = new Finding(Finding.Type.ERROR, "E", sp1);
+    Finding f2 = new Finding(Finding.Type.ERROR, "E", sp2);
+
+    // When && Then
+    Assert.assertFalse(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldEqual7() {
+    // Given
+    SourcePosition sp1 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition spe1 = spb().setLine(2).setColumn(3).setFileName("F").build();
+    SourcePosition sp2 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition spe2 = spb().setLine(4).setColumn(3).setFileName("F").build();
+    Finding f1 = new Finding(Finding.Type.ERROR, "E", sp1, spe1);
+    Finding f2 = new Finding(Finding.Type.ERROR, "E", sp2, spe2);
+
+    // When && Then
+    Assert.assertFalse(f1.equals(f2));
+  }
+
+  @Test
+  public void testShouldEqual8() {
+    // Given
+    SourcePosition sp1 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition spe1 = spb().setLine(2).setColumn(3).setFileName("F").build();
+    SourcePosition sp2 = spb().setLine(0).setColumn(1).setFileName("F").build();
+    SourcePosition spe2 = spb().setLine(2).setColumn(5).setFileName("F").build();
+    Finding f1 = new Finding(Finding.Type.ERROR, "E", sp1, spe1);
+    Finding f2 = new Finding(Finding.Type.ERROR, "E", sp2, spe2);
+
+    // When && Then
+    Assert.assertFalse(f1.equals(f2));
+  }
+}