add tests for callsite filters

erik-krogh · erik-krogh · commit 8d60336396f9 · 2022-05-02T12:45:21.000+02:00
diff --git a/python/ql/test/library-tests/frameworks/data/test.expected b/python/ql/test/library-tests/frameworks/data/test.expected
@@ -17,6 +17,12 @@ isSink
 | test.py:17:31:17:34 | ControlFlowNode for four | test-source |
 | test.py:18:37:18:40 | ControlFlowNode for five | test-source |
 | test.py:19:21:19:26 | ControlFlowNode for second | test-source |
+| test.py:30:21:30:23 | ControlFlowNode for one | test-source |
+| test.py:32:22:32:24 | ControlFlowNode for one | test-source |
+| test.py:32:27:32:29 | ControlFlowNode for two | test-source |
+| test.py:33:22:33:24 | ControlFlowNode for one | test-source |
+| test.py:33:27:33:29 | ControlFlowNode for two | test-source |
+| test.py:33:32:33:36 | ControlFlowNode for three | test-source |
 isSource
 | test.py:3:5:3:15 | ControlFlowNode for getSource() | test-source |
 | test.py:9:8:9:14 | ControlFlowNode for alias() | test-source |
diff --git a/python/ql/test/library-tests/frameworks/data/test.py b/python/ql/test/library-tests/frameworks/data/test.py
@@ -22,4 +22,12 @@
 
 Callbacks.first(lambda one, two, three, four, five: 0)
 Callbacks.param1to3(lambda one, two, three, four, five: 0)
-Callbacks.nonFirst(lambda first, second: 0)
+Callbacks.nonFirst(lambda first, second: 0)
+
+from testlib import CallFilter
+
+CallFilter.arityOne(one, two) # NO match
+CallFilter.arityOne(one) # Match
+CallFilter.twoOrMore(one) # NO match
+CallFilter.twoOrMore(one, two) # Match
+CallFilter.twoOrMore(one, two, three) # Match
diff --git a/python/ql/test/library-tests/frameworks/data/test.ql b/python/ql/test/library-tests/frameworks/data/test.ql
@@ -46,6 +46,9 @@ class Sinks extends ModelInput::SinkModelCsv {
         "testlib;;Member[Args].Member[arg1to3].Argument[1..3];test-source", //
         "testlib;;Member[Args].Member[lastarg].Argument[N-1];test-source", //
         "testlib;;Member[Args].Member[nonFist].Argument[1..];test-source", //
+        // callsite filter.
+        "testlib;;Member[CallFilter].Member[arityOne].WithArity[1].Argument[0..];test-source", //
+        "testlib;;Member[CallFilter].Member[twoOrMore].WithArity[2..].Argument[0..];test-source", //
       ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ class Sinks extends ModelInput::SinkModelCsv {`
`46`	`46`	`"testlib;;Member[Args].Member[arg1to3].Argument[1..3];test-source", //`
`47`	`47`	`"testlib;;Member[Args].Member[lastarg].Argument[N-1];test-source", //`
`48`	`48`	`"testlib;;Member[Args].Member[nonFist].Argument[1..];test-source", //`
	`49`	`+ // callsite filter.`
	`50`	`+ "testlib;;Member[CallFilter].Member[arityOne].WithArity[1].Argument[0..];test-source", //`
	`51`	`+ "testlib;;Member[CallFilter].Member[twoOrMore].WithArity[2..].Argument[0..];test-source", //`
`49`	`52`	`]`
`50`	`53`	`}`
`51`	`54`	`}`