move the "I don't care about parent relation on mocks" hack into the predicate, so the tests dont fail

erik-krogh · erik-krogh · commit 605bfd6e9301 · 2022-12-20T13:55:49.000+01:00
diff --git a/ql/ql/src/codeql_ql/ast/internal/AstNodes.qll b/ql/ql/src/codeql_ql/ast/internal/AstNodes.qll
@@ -238,6 +238,7 @@ class TVarDef = TVarDecl or TAsExpr;
 
 module AstConsistency {
   import ql
+  import codeql_ql.ast.internal.AstNodes as AstNodes
 
   query predicate nonTotalGetParent(AstNode node) {
     exists(toQL(node).getParent()) and
@@ -247,5 +248,8 @@ module AstConsistency {
     not (node instanceof QLDoc and node.getLocation().getFile().getExtension() = "dbscheme") // qldoc in dbschemes are not hooked up
   }
 
-  query predicate nonUniqueParent(AstNode node) { count(node.getParent()) >= 2 }
+  query predicate nonUniqueParent(AstNode node) {
+    count(node.getParent()) >= 2 and
+    not exists(AstNodes::toMock(node)) // we don't care about the mocks, they are nasty by design.
+  }
 }
diff --git a/ql/ql/src/queries/diagnostics/EmptyConsistencies.ql b/ql/ql/src/queries/diagnostics/EmptyConsistencies.ql
@@ -15,7 +15,6 @@ import codeql_ql.ast.internal.Builtins::BuiltinsConsistency as BuiltinsConsisten
 import codeql_ql.ast.internal.Module::ModConsistency as ModConsistency
 import codeql_ql.ast.internal.Variable::VarConsistency as VarConsistency
 import codeql_ql.ast.internal.AstNodes::AstConsistency as AstConsistency
-import codeql_ql.ast.internal.AstNodes as AstNodes
 
 from AstNode node, string msg
 where
@@ -43,9 +42,7 @@ where
     or
     AstConsistency::nonTotalGetParent(node) and msg = "AstConsistency::nonTotalGetParent"
     or
-    AstConsistency::nonUniqueParent(node) and
-    msg = "AstConsistency::nonUniqueParent" and
-    not exists(AstNodes::toMock(node)) // we don't care about the mocks, they are nasty by design.
+    AstConsistency::nonUniqueParent(node) and msg = "AstConsistency::nonUniqueParent"
     or
     TypeConsistency::noResolve(node) and msg = "TypeConsistency::noResolve"
     or

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,7 @@ class TVarDef = TVarDecl or TAsExpr;`
`238`	`238`
`239`	`239`	`module AstConsistency {`
`240`	`240`	`import ql`
	`241`	`+ import codeql_ql.ast.internal.AstNodes as AstNodes`
`241`	`242`
`242`	`243`	`query predicate nonTotalGetParent(AstNode node) {`
`243`	`244`	`exists(toQL(node).getParent()) and`
`@@ -247,5 +248,8 @@ module AstConsistency {`
`247`	`248`	`not (node instanceof QLDoc and node.getLocation().getFile().getExtension() = "dbscheme") // qldoc in dbschemes are not hooked up`
`248`	`249`	`}`
`249`	`250`
`250`		`- query predicate nonUniqueParent(AstNode node) { count(node.getParent()) >= 2 }`
	`251`	`+ query predicate nonUniqueParent(AstNode node) {`
	`252`	`+ count(node.getParent()) >= 2 and`
	`253`	`+ not exists(AstNodes::toMock(node)) // we don't care about the mocks, they are nasty by design.`
	`254`	`+ }`
`251`	`255`	`}`