Merge pull request #22592 from hvitved/inline-expectations-relative-restriction

Inline expectations: Ignore results in files outside the source dir

Author: hvitved

actions/ql/test/utils/ActionsInlineExpectationsTestQuery.ql

@@ -10,12 +10,6 @@ import T::TestPostProcessing
 private module Impl implements T::InlineExpectationsTestSig {
   class Location = Locations::Location;
 
-  class ExpectationComment extends Yaml::YamlComment {
-    string getContents() { result = this.getText() }
-  }
-}
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
   string getRelativeUrl(Locations::Location location) {
     exists(int startLine, int startColumn, int endLine, int endColumn |
       location.hasLocationInfo(_, startLine, startColumn, endLine, endColumn)
@@ -25,6 +19,10 @@ private module Input implements T::TestPostProcessing::InputSig<Impl> {
           ":" + endColumn
     )
   }
+
+  class ExpectationComment extends Yaml::YamlComment {
+    string getContents() { result = this.getText() }
+  }
 }
 
-import T::TestPostProcessing::Make<Impl, Input>
+import T::TestPostProcessing::Make<Impl>

cpp/ql/lib/utils/test/InlineExpectationsTestQuery.ql

@@ -6,16 +6,4 @@ private import cpp
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>

cpp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll

@@ -25,4 +25,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = C::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(C::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }

cpp/ql/test/include/iterator.h

@@ -65,7 +65,7 @@ namespace std {
 	};
 
 	template<class Container>
-	constexpr back_insert_iterator<Container> back_inserter(Container& x) { // $ ir-def=*x
+	constexpr back_insert_iterator<Container> back_inserter(Container& x) {
 		return back_insert_iterator<Container>(x);
 	}
 
@@ -89,7 +89,7 @@ namespace std {
 		constexpr front_insert_iterator operator++(int);
 	};
 	template<class Container>
-	constexpr front_insert_iterator<Container> front_inserter(Container& x) { // $ ir-def=*x
+	constexpr front_insert_iterator<Container> front_inserter(Container& x) {
 		return front_insert_iterator<Container>(x);
 	}
 }

csharp/ql/lib/utils/test/InlineExpectationsTestQuery.ql

@@ -6,16 +6,4 @@ private import csharp
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>

csharp/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll

@@ -49,4 +49,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = CS::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(CS::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }

go/ql/lib/utils/test/InlineExpectationsTestQuery.ql

@@ -6,16 +6,4 @@ private import go
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>

go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll

@@ -20,4 +20,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = G::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(G::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }

java/ql/lib/utils/test/InlineExpectationsTestQuery.ql

@@ -6,16 +6,4 @@ private import java
 private import codeql.util.test.InlineExpectationsTest as T
 private import internal.InlineExpectationsTestImpl
 import T::TestPostProcessing
-import T::TestPostProcessing::Make<Impl, Input>
-
-private module Input implements T::TestPostProcessing::InputSig<Impl> {
-  string getRelativeUrl(Location location) {
-    exists(File f, int startline, int startcolumn, int endline, int endcolumn |
-      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
-      f = location.getFile()
-    |
-      result =
-        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
-    )
-  }
-}
+import T::TestPostProcessing::Make<Impl>

java/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll

@@ -35,4 +35,14 @@ module Impl implements InlineExpectationsTestSig {
   }
 
   class Location = J::Location;
+
+  string getRelativeUrl(Location location) {
+    exists(J::File f, int startline, int startcolumn, int endline, int endcolumn |
+      location.hasLocationInfo(_, startline, startcolumn, endline, endcolumn) and
+      f = location.getFile()
+    |
+      result =
+        f.getRelativePath() + ":" + startline + ":" + startcolumn + ":" + endline + ":" + endcolumn
+    )
+  }
 }