add test for the .Call token

erik-krogh · erik-krogh · commit 6c67e51ec3fa · 2022-05-02T12:58:21.000+02:00
diff --git a/python/ql/test/library-tests/frameworks/data/test.ql b/python/ql/test/library-tests/frameworks/data/test.ql
@@ -10,10 +10,10 @@ class Steps extends ModelInput::SummaryModelCsv {
     // package;type;path;input;output;kind
     row =
       [
-        "testlib;;Member[Steps].Member[preserveTaint];Argument[0];ReturnValue;taint",
+        "testlib;;Member[Steps].Member[preserveTaint].Call;Argument[0];ReturnValue;taint",
         "testlib;;Member[Steps].Member[taintIntoCallback];Argument[0];Argument[1..2].Parameter[0];taint",
         "testlib;;Member[Steps].Member[preserveArgZeroAndTwo];Argument[0,2];ReturnValue;taint",
-        "testlib;;Member[Steps].Member[preserveAllButFirstArgument];Argument[1..];ReturnValue;taint",
+        "testlib;;Member[Steps].Member[preserveAllButFirstArgument].Call;Argument[1..];ReturnValue;taint",
       ]
   }
 }
@@ -52,7 +52,6 @@ class Sinks extends ModelInput::SinkModelCsv {
   }
 }
 
-// TODO: Test taint steps (include that the base path may end with ".Call")
 class Sources extends ModelInput::SourceModelCsv {
   // package;type;path;kind
   override predicate row(string row) {

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ class Steps extends ModelInput::SummaryModelCsv {`
`10`	`10`	`// package;type;path;input;output;kind`
`11`	`11`	`row =`
`12`	`12`	`[`
`13`		`- "testlib;;Member[Steps].Member[preserveTaint];Argument[0];ReturnValue;taint",`
	`13`	`+ "testlib;;Member[Steps].Member[preserveTaint].Call;Argument[0];ReturnValue;taint",`
`14`	`14`	`"testlib;;Member[Steps].Member[taintIntoCallback];Argument[0];Argument[1..2].Parameter[0];taint",`
`15`	`15`	`"testlib;;Member[Steps].Member[preserveArgZeroAndTwo];Argument[0,2];ReturnValue;taint",`
`16`		`- "testlib;;Member[Steps].Member[preserveAllButFirstArgument];Argument[1..];ReturnValue;taint",`
	`16`	`+ "testlib;;Member[Steps].Member[preserveAllButFirstArgument].Call;Argument[1..];ReturnValue;taint",`
`17`	`17`	`]`
`18`	`18`	`}`
`19`	`19`	`}`
`@@ -52,7 +52,6 @@ class Sinks extends ModelInput::SinkModelCsv {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`-// TODO: Test taint steps (include that the base path may end with ".Call")`
`56`	`55`	`class Sources extends ModelInput::SourceModelCsv {`
`57`	`56`	`// package;type;path;kind`
`58`	`57`	`override predicate row(string row) {`