Rust: Add test cases for summaries as well.

Author: geoffw0

rust/ql/lib/codeql/files/FileSystem.qll

@@ -36,6 +36,13 @@ class Folder = Impl::Folder;
 
 module Folder = Impl::Folder;
 
+/**
+ * Holds if the file identified by `relativePath` should be treated as though it is external
+ * to the target project, even though it is within the source code directory. This is used for
+ * testing.
+ */
+extensible predicate additionalExternalFile(string relativePath);
+
 /** A file. */
 class File extends Container, Impl::File {
   /**
@@ -44,6 +51,8 @@ class File extends Container, Impl::File {
    */
   predicate fromSource() {
     exists(ExtractorStep s | s.getAction() = "Extract" and s.getFile() = this)
+    and
+    not additionalExternalFile(this.getRelativePath())
   }
 
   /**

rust/ql/test/library-tests/dataflow/models/external_file.rs

@@ -0,0 +1,30 @@
+
+pub fn generated_source(i: i64) -> i64 {
+    0
+}
+
+pub fn neutral_generated_source(i: i64) -> i64 {
+    0
+}
+
+pub fn neutral_manual_source(i: i64) -> i64 {
+    0
+}
+
+pub fn generated_sink(i: i64) {}
+
+pub fn neutral_generated_sink(i: i64) {}
+
+pub fn neutral_manual_sink(i: i64) {}
+
+pub fn generated_summary(i: i64) -> i64 {
+    0
+}
+
+pub fn neutral_generated_summary(i: i64) -> i64 {
+    0
+}
+
+pub fn neutral_manual_summary(i: i64) -> i64 {
+    0
+}

rust/ql/test/library-tests/dataflow/models/main.rs

@@ -410,35 +410,24 @@ fn test_trait_model<T: Ord>(x: T) {
     sink(x7);
 }
 
-pub fn generated_source(i: i64) -> i64 {
-    0
-}
-
-pub fn neutral_generated_source(i: i64) -> i64 {
-    0
-}
-
-pub fn neutral_manual_source(i: i64) -> i64 {
-    0
-}
-
-pub fn generated_sink(i: i64) {}
-
-pub fn neutral_generated_sink(i: i64) {}
-
-pub fn neutral_manual_sink(i: i64) {}
+mod external_file;
+use external_file::*;
 
 fn test_neutrals() {
     // neutral models should cause corresponding generated models to be ignored.
-    // Thus, the `neutral_generated_source` and `neutral_generated_sink`, which
-    // have both a generated and a neutral model, should not have flow.
+    // Thus the `neutral_generated_source`, `neutral_generated_sink` and
+    // `neutral_generated_summary`, which have both a generated and a neutral
+    // model, should not have flow.
 
     sink(generated_source(1)); // $ hasValueFlow=1
     sink(neutral_generated_source(2));
     sink(neutral_manual_source(3)); // $ hasValueFlow=3
     generated_sink(source(4)); // $ hasValueFlow=4
     neutral_generated_sink(source(5));
     neutral_manual_sink(source(6)); // $ hasValueFlow=6
+    sink(generated_summary(source(7))); // $ hasValueFlow=7
+    sink(neutral_generated_summary(source(8))); // $ SPURIOUS: hasValueFlow=8
+    sink(neutral_manual_summary(source(9))); // $ hasValueFlow=9
 }
 
 #[tokio::main]