Python tests: Move helper predicate into TestUtils.qll

Author: markshannon

python/ql/src/semmle/python/TestUtils.qll

@@ -22,3 +22,11 @@ string remove_prefix_before_substring(string str, string sub) {
 string remove_library_prefix(Location loc) {
   result = remove_prefix_before_substring(loc.toString(), "resources/lib")
 }
+
+/** Returns the location of an AST node in compact form: `basename:line:column` */
+string compact_location(AstNode a) {
+    exists(Location l |
+        l = a.getLocation() |
+        result = l.getFile().getBaseName() + ":" + l.getStartLine() + ":" + l.getStartColumn()
+    )
+}

python/ql/test/library-tests/ControlFlow/successors/Successors.ql

@@ -1,11 +1,5 @@
 import python
-
-string loc(ControlFlowNode f) {
-    exists(Location l |
-        l = f.getLocation() |
-        result = l.getFile().getBaseName() + ":" + l.getStartLine() + ":" + l.getStartColumn()
-    )
-}
+import semmle.python.TestUtils
 
 from ControlFlowNode p, ControlFlowNode s, string what
 where
@@ -20,4 +14,5 @@ or
 // Add fake edges for node that raise out of scope
 p.isExceptionalExit(_) and s = p.getScope().getEntryNode() and what = "exit"
 
-select loc(p), p.getNode().toString(), loc(s), s.getNode().toString(), what
+select compact_location(p.getNode()), p.getNode().toString(),
+       compact_location(s.getNode()), s.getNode().toString(), what

python/ql/test/library-tests/ast/Child.ql

@@ -1,14 +1,7 @@
 import python
-
-
-string loc(AstNode a) {
-    exists(Location l |
-        l = a.getLocation() |
-        result = l.getFile().getBaseName() + ":" + l.getStartLine() + ":" + l.getStartColumn()
-    )
-}
+import semmle.python.TestUtils
 
 from AstNode p, AstNode c
 where p.getAChildNode() = c
-select loc(p), p.toString(), loc(c), c.toString()
+select compact_location(p), p.toString(), compact_location(c), c.toString()
 

python/ql/test/library-tests/exprs/compare/Test.ql

@@ -1,13 +1,8 @@
 
 import python
+import semmle.python.TestUtils
 
-string loc(AstNode f) {
-    exists(Location l |
-        l = f.getLocation() |
-        result = l.getFile().getBaseName() + ":" + l.getStartLine() + ":" + l.getStartColumn()
-    )
-}
 
 from Compare comp, Expr left, Expr right, Cmpop op
 where comp.compares(left, op, right)
-select loc(comp), comp.toString(), left.toString(), op.toString(), right.toString()
+select compact_location(comp), comp.toString(), left.toString(), op.toString(), right.toString()