Only a text property of a message affects a baseline

JetBrains · Jul 15, 2024 · ea5f1fa · ea5f1fa
1 parent 505d3e5
commit ea5f1fa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/sarif/src/main/java/com/jetbrains/qodana/sarif/baseline/ResultKey.java b/sarif/src/main/java/com/jetbrains/qodana/sarif/baseline/ResultKey.java
@@ -25,7 +25,7 @@ public boolean equals(Object o) {
         ResultKey key = (ResultKey) o;
         Result oResult = key.result;
 
-        if (!Objects.equals(result.getMessage(), oResult.getMessage()) ||
+        if (!equalsMessage(result.getMessage(), oResult.getMessage()) ||
                 !Objects.equals(result.getRuleId(), oResult.getRuleId()) ||
                 !Objects.equals(result.getLevel(), oResult.getLevel())
         ) {
@@ -49,6 +49,11 @@ public boolean equals(Object o) {
         return true;
     }
 
+    private boolean equalsMessage(Message message, Message oMessage) {
+        if (message == null || oMessage== null) return message == oMessage;
+        return message.getText().equals(oMessage.getText());
+    }
+
     private boolean equalsLocation(Location location, Location oLocation) {
         if (location == null || oLocation == null) return location == oLocation;
 
@@ -100,7 +105,7 @@ private boolean equalsArtifactLocation(ArtifactLocation artifactLocation, Artifa
     public int hashCode() {
         int hash = 1;
         hash = ((hash * 31) + ((result.getRuleId() == null) ? 0 : result.getRuleId().hashCode()));
-        hash = ((hash * 31) + ((result.getMessage() == null) ? 0 : result.getMessage().hashCode()));
+        hash = ((hash * 31) + ((result.getMessage() == null) ? 0 : hashMessage(result.getMessage())));
         hash = ((hash * 31) + ((result.getLevel() == null) ? 0 : result.getLevel().hashCode()));
 
         if (result.getLocations() == null) return hash;
@@ -120,6 +125,11 @@ public int hashCode() {
         return hash;
     }
 
+    private int hashMessage(Message message) {
+        if (message == null) return 0;
+        return message.getText().hashCode();
+    }
+
 
     public int hashPhysicalLocation(PhysicalLocation location) {
         if (location == null) return 0;

diff --git a/sarif/src/test/java/com/jetbrains/qodana/sarif/BaselineTest.java b/sarif/src/test/java/com/jetbrains/qodana/sarif/BaselineTest.java
@@ -276,6 +276,16 @@ public void testDoUseLogicalLocationsIfProblemHasNotPhysical() {
         doTest(report, baseline, 0, 1, 1, INCLUDE_ABSENT);
     }
 
+    @Test
+    public void testMarkdownInMessageDoNotAffectBaseline() {
+        SarifReport report = newReport();
+        SarifReport baseline = newReport();
+        report.getRuns().get(0).getResults().get(0).getMessage().withMarkdown("1");
+        baseline.getRuns().get(0).getResults().get(0).getMessage().withMarkdown("2");
+
+        doTest(report, baseline, 1, 0, 0, INCLUDE_ABSENT);
+    }
+
     private SarifReport newReport() {
         return new SarifReport()
                 .withRuns(