Use hasLocationInfo to match several Location fields at once

smowton · smowton · commit 8d20b9cf52ee · 2022-08-19T19:03:17.000+01:00
diff --git a/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll b/cpp/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -331,15 +331,15 @@ abstract private class Expectation extends FailureLocatable {
 }
 
 private predicate onSameLine(ValidExpectation a, ActualResult b) {
-  exists(File f, int line, Location la, Location lb |
+  exists(string fname, int line, Location la, Location lb |
     // Join order intent:
     // Take the locations of ActualResults,
     // join with locations in the same file / on the same line,
     // then match those against ValidExpectations.
     la = a.getLocation() and
     pragma[only_bind_into](lb) = b.getLocation() and
-    locations_default(pragma[only_bind_into](la), f, line, _, _, _) and
-    locations_default(lb, f, line, _, _, _)
+    pragma[only_bind_into](la).hasLocationInfo(fname, line, _, _, _) and
+    lb.hasLocationInfo(fname, line, _, _, _)
   )
 }
 
diff --git a/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll b/csharp/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -331,15 +331,15 @@ abstract private class Expectation extends FailureLocatable {
 }
 
 private predicate onSameLine(ValidExpectation a, ActualResult b) {
-  exists(File f, int line, Location la, Location lb |
+  exists(string fname, int line, Location la, Location lb |
     // Join order intent:
     // Take the locations of ActualResults,
     // join with locations in the same file / on the same line,
     // then match those against ValidExpectations.
     la = a.getLocation() and
     pragma[only_bind_into](lb) = b.getLocation() and
-    locations_default(pragma[only_bind_into](la), f, line, _, _, _) and
-    locations_default(lb, f, line, _, _, _)
+    pragma[only_bind_into](la).hasLocationInfo(fname, line, _, _, _) and
+    lb.hasLocationInfo(fname, line, _, _, _)
   )
 }
 
diff --git a/go/ql/test/TestUtilities/InlineExpectationsTest.qll b/go/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -331,15 +331,15 @@ abstract private class Expectation extends FailureLocatable {
 }
 
 private predicate onSameLine(ValidExpectation a, ActualResult b) {
-  exists(File f, int line, Location la, Location lb |
+  exists(string fname, int line, Location la, Location lb |
     // Join order intent:
     // Take the locations of ActualResults,
     // join with locations in the same file / on the same line,
     // then match those against ValidExpectations.
     la = a.getLocation() and
     pragma[only_bind_into](lb) = b.getLocation() and
-    locations_default(pragma[only_bind_into](la), f, line, _, _, _) and
-    locations_default(lb, f, line, _, _, _)
+    pragma[only_bind_into](la).hasLocationInfo(fname, line, _, _, _) and
+    lb.hasLocationInfo(fname, line, _, _, _)
   )
 }
 
diff --git a/java/ql/test/TestUtilities/InlineExpectationsTest.qll b/java/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -331,15 +331,15 @@ abstract private class Expectation extends FailureLocatable {
 }
 
 private predicate onSameLine(ValidExpectation a, ActualResult b) {
-  exists(File f, int line, Location la, Location lb |
+  exists(string fname, int line, Location la, Location lb |
     // Join order intent:
     // Take the locations of ActualResults,
     // join with locations in the same file / on the same line,
     // then match those against ValidExpectations.
     la = a.getLocation() and
     pragma[only_bind_into](lb) = b.getLocation() and
-    locations_default(pragma[only_bind_into](la), f, line, _, _, _) and
-    locations_default(lb, f, line, _, _, _)
+    pragma[only_bind_into](la).hasLocationInfo(fname, line, _, _, _) and
+    lb.hasLocationInfo(fname, line, _, _, _)
   )
 }
 
diff --git a/python/ql/test/TestUtilities/InlineExpectationsTest.qll b/python/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -331,15 +331,15 @@ abstract private class Expectation extends FailureLocatable {
 }
 
 private predicate onSameLine(ValidExpectation a, ActualResult b) {
-  exists(File f, int line, Location la, Location lb |
+  exists(string fname, int line, Location la, Location lb |
     // Join order intent:
     // Take the locations of ActualResults,
     // join with locations in the same file / on the same line,
     // then match those against ValidExpectations.
     la = a.getLocation() and
     pragma[only_bind_into](lb) = b.getLocation() and
-    locations_default(pragma[only_bind_into](la), f, line, _, _, _) and
-    locations_default(lb, f, line, _, _, _)
+    pragma[only_bind_into](la).hasLocationInfo(fname, line, _, _, _) and
+    lb.hasLocationInfo(fname, line, _, _, _)
   )
 }
 
diff --git a/ql/ql/test/TestUtilities/InlineExpectationsTest.qll b/ql/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -331,15 +331,15 @@ abstract private class Expectation extends FailureLocatable {
 }
 
 private predicate onSameLine(ValidExpectation a, ActualResult b) {
-  exists(File f, int line, Location la, Location lb |
+  exists(string fname, int line, Location la, Location lb |
     // Join order intent:
     // Take the locations of ActualResults,
     // join with locations in the same file / on the same line,
     // then match those against ValidExpectations.
     la = a.getLocation() and
     pragma[only_bind_into](lb) = b.getLocation() and
-    locations_default(pragma[only_bind_into](la), f, line, _, _, _) and
-    locations_default(lb, f, line, _, _, _)
+    pragma[only_bind_into](la).hasLocationInfo(fname, line, _, _, _) and
+    lb.hasLocationInfo(fname, line, _, _, _)
   )
 }
 
diff --git a/ruby/ql/test/TestUtilities/InlineExpectationsTest.qll b/ruby/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -331,15 +331,15 @@ abstract private class Expectation extends FailureLocatable {
 }
 
 private predicate onSameLine(ValidExpectation a, ActualResult b) {
-  exists(File f, int line, Location la, Location lb |
+  exists(string fname, int line, Location la, Location lb |
     // Join order intent:
     // Take the locations of ActualResults,
     // join with locations in the same file / on the same line,
     // then match those against ValidExpectations.
     la = a.getLocation() and
     pragma[only_bind_into](lb) = b.getLocation() and
-    locations_default(pragma[only_bind_into](la), f, line, _, _, _) and
-    locations_default(lb, f, line, _, _, _)
+    pragma[only_bind_into](la).hasLocationInfo(fname, line, _, _, _) and
+    lb.hasLocationInfo(fname, line, _, _, _)
   )
 }
 
diff --git a/swift/ql/test/TestUtilities/InlineExpectationsTest.qll b/swift/ql/test/TestUtilities/InlineExpectationsTest.qll
@@ -331,15 +331,15 @@ abstract private class Expectation extends FailureLocatable {
 }
 
 private predicate onSameLine(ValidExpectation a, ActualResult b) {
-  exists(File f, int line, Location la, Location lb |
+  exists(string fname, int line, Location la, Location lb |
     // Join order intent:
     // Take the locations of ActualResults,
     // join with locations in the same file / on the same line,
     // then match those against ValidExpectations.
     la = a.getLocation() and
     pragma[only_bind_into](lb) = b.getLocation() and
-    locations_default(pragma[only_bind_into](la), f, line, _, _, _) and
-    locations_default(lb, f, line, _, _, _)
+    pragma[only_bind_into](la).hasLocationInfo(fname, line, _, _, _) and
+    lb.hasLocationInfo(fname, line, _, _, _)
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -331,15 +331,15 @@ abstract private class Expectation extends FailureLocatable {`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`private predicate onSameLine(ValidExpectation a, ActualResult b) {`
`334`		`- exists(File f, int line, Location la, Location lb \|`
	`334`	`+ exists(string fname, int line, Location la, Location lb \|`
`335`	`335`	`// Join order intent:`
`336`	`336`	`// Take the locations of ActualResults,`
`337`	`337`	`// join with locations in the same file / on the same line,`
`338`	`338`	`// then match those against ValidExpectations.`
`339`	`339`	`la = a.getLocation() and`
`340`	`340`	`pragma[only_bind_into](lb) = b.getLocation() and`
`341`		`- locations_default(pragma[only_bind_into](la), f, line, _, _, _) and`
`342`		`- locations_default(lb, f, line, _, _, _)`
	`341`	`+ pragma[only_bind_into](la).hasLocationInfo(fname, line, _, _, _) and`
	`342`	`+ lb.hasLocationInfo(fname, line, _, _, _)`
`343`	`343`	`)`
`344`	`344`	`}`
`345`	`345`