Fix column count and add clarifying comment

asgerf · asgerf · commit 694f01ab7861 · 2025-02-25T11:57:01.000+01:00
diff --git a/shared/util/codeql/util/test/InlineExpectationsTest.qll b/shared/util/codeql/util/test/InlineExpectationsTest.qll
@@ -790,8 +790,11 @@ module TestPostProcessing {
         queryResults(mainResultSet(), row, column + 1, element)
       |
         getQueryKind() = "path-problem" and
-        n = exactDivide(column - 8, 3)
+        // Skip over `alert, source, sink, message`, counting entities as two columns (7 columns in total).
+        // Then pick the first column from each related location, which each is an `entity, message` pair (3 columns).
+        n = exactDivide(column - 7, 3)
         or
+        // Like above, but only skip over `alert, message` initially (3 columns in total).
         getQueryKind() = "problem" and
         n = exactDivide(column - 3, 3)
       )

Original file line number	Diff line number	Diff line change
`@@ -790,8 +790,11 @@ module TestPostProcessing {`
`790`	`790`	`queryResults(mainResultSet(), row, column + 1, element)`
`791`	`791`	`\|`
`792`	`792`	`getQueryKind() = "path-problem" and`
`793`		`- n = exactDivide(column - 8, 3)`
	`793`	+ // Skip over `alert, source, sink, message`, counting entities as two columns (7 columns in total).
	`794`	+ // Then pick the first column from each related location, which each is an `entity, message` pair (3 columns).
	`795`	`+ n = exactDivide(column - 7, 3)`
`794`	`796`	`or`
	`797`	+ // Like above, but only skip over `alert, message` initially (3 columns in total).
`795`	`798`	`getQueryKind() = "problem" and`
`796`	`799`	`n = exactDivide(column - 3, 3)`
`797`	`800`	`)`