Absent issues statistics should be hidden unless flag supplied (#22)

* Absent issues should be hidden if flag supplied * Don't mutate sarif in the test
JetBrains · Apr 18, 2024 · 054b0fe · 054b0fe
1 parent 502f58f
commit 054b0fe
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 3 deletions.
diff --git a/baseline-cli/src/main/kotlin/CommandLineResultsPrinter.kt b/baseline-cli/src/main/kotlin/CommandLineResultsPrinter.kt
@@ -11,8 +11,9 @@ class CommandLineResultsPrinter(
         val unchanged = resultsCountByBaselineState[Result.BaselineState.UNCHANGED] ?: 0
         val new = resultsCountByBaselineState[Result.BaselineState.NEW] ?: 0
         val absent = resultsCountByBaselineState[Result.BaselineState.ABSENT] ?: 0
+        val absentLine = if (includeAbsent) ", ABSENT: $absent" else ""
         val groupingMessage =
-            "Grouping problems according to baseline: UNCHANGED: $unchanged, NEW: $new, ABSENT: $absent"
+            "Grouping problems according to baseline: UNCHANGED: $unchanged, NEW: $new$absentLine"
 
         val countedProblems = (
                 results

diff --git a/baseline-cli/src/test/kotlin/BaselineCliTest.kt b/baseline-cli/src/test/kotlin/BaselineCliTest.kt
@@ -135,10 +135,11 @@ class BaselineCliTest {
     @Test
     fun `test include absent false`() {
         // Act
-        assertDoesNotThrow { BaselineCli.process(BaselineOptions(emptySarif, sarif, includeAbsent = false), stdout::append, stderr::append) }
+        assertDoesNotThrow { BaselineCli.process(BaselineOptions(copySarifFromResources("single.sarif.json"), sarif, includeAbsent = false), stdout::append, stderr::append) }
 
         // Assert
-        assertFalse(stdout.contains("ABSENT: 2"))
+        assertFalse(stdout.contains("ABSENT:"))
+        assertTrue(stdout.contains("UNCHANGED: 1"))
         val content = File(emptySarif).readText(charset("UTF-8"))
         assertFalse(content.contains("absent"))
     }

diff --git a/baseline-cli/src/test/resources/single.sarif.json b/baseline-cli/src/test/resources/single.sarif.json
@@ -0,0 +1,70 @@
+{
+  "runs": [
+    {
+      "invocations": [
+        {
+          "exitCode": 0,
+          "executionSuccessful": true
+        }
+      ],
+      "language": "en-US",
+      "results": [
+        {
+          "ruleId": "IgnoreResultOfCall",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Result of 'A.unusedResult()' is ignored",
+            "markdown": "Result of `A.unusedResult()` is ignored"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "test-module/A.java",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 8,
+                  "startColumn": 5,
+                  "charOffset": 163,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "unusedResult"
+                  },
+                  "sourceLanguage": "JAVA"
+                },
+                "contextRegion": {
+                  "startLine": 6,
+                  "startColumn": 1,
+                  "charOffset": 133,
+                  "charLength": 50,
+                  "snippet": {
+                    "text": "    }\n    unusedResult();\n    unusedResult();\n  }\n"
+                  }
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "testBaseline_ SARIF only",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9ac736b5dae7725e30bdcce141bc6b126bb32f7c9ea9af7678910adc32180a55"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High"
+          }
+        }
+      ],
+      "newlineSequences": [
+        "\r\n",
+        "\n"
+      ]
+    }
+  ]
+}