add test for Parameter[any] and Parameter[any-named]

erik-krogh · erik-krogh · commit 2868eb61eab7 · 2022-05-17T12:08:53.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
@@ -85,6 +85,12 @@ isSource
 | test.py:86:49:86:59 | ControlFlowNode for getSource() | test-source |
 | test.py:87:56:87:66 | ControlFlowNode for getSource() | test-source |
 | test.py:101:29:101:31 | ControlFlowNode for arg | test-source |
+| test.py:104:18:104:21 | ControlFlowNode for self | test-source |
+| test.py:104:24:104:29 | ControlFlowNode for param1 | test-source |
+| test.py:104:32:104:37 | ControlFlowNode for param2 | test-source |
+| test.py:107:18:107:21 | ControlFlowNode for self | test-source |
+| test.py:107:24:107:28 | ControlFlowNode for name1 | test-source |
+| test.py:107:31:107:35 | ControlFlowNode for name2 | test-source |
 syntaxErrors
 | Member[foo |
 | Member[foo] .Member[bar] |
diff --git a/python/ql/test/library-tests/frameworks/data/test.py b/python/ql/test/library-tests/frameworks/data/test.py
@@ -100,3 +100,9 @@ def secondAndAfter(self, arg1, arg2, arg3, arg4, arg5):
 class OtherSubClass (ArgPos.MyClass):
     def otherSelfTest(self, arg, named=2, otherName=3): # test that Parameter[0] hits `arg`.
         pass
+
+    def anyParam(self, param1, param2): # Parameter[any] matches all 3. 
+        pass
+
+    def anyNamed(self, name1, name2=2): # Parameter[any-named] matches all 3.
+        pass
diff --git a/python/ql/test/library-tests/frameworks/data/test.ql b/python/ql/test/library-tests/frameworks/data/test.ql
@@ -77,6 +77,8 @@ class Sources extends ModelInput::SourceModelCsv {
         "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[foo].Parameter[named:];test-source", //
         "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[secondAndAfter].Parameter[1..];test-source", //
         "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[otherSelfTest].Parameter[0];test-source", //
+        "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[anyParam].Parameter[any];test-source", //
+        "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[anyNamed].Parameter[any-named];test-source", //
       ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,8 @@ class Sources extends ModelInput::SourceModelCsv {`
`77`	`77`	`"testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[foo].Parameter[named:];test-source", //`
`78`	`78`	`"testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[secondAndAfter].Parameter[1..];test-source", //`
`79`	`79`	`"testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[otherSelfTest].Parameter[0];test-source", //`
	`80`	`+ "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[anyParam].Parameter[any];test-source", //`
	`81`	`+ "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[anyNamed].Parameter[any-named];test-source", //`
`80`	`82`	`]`
`81`	`83`	`}`
`82`	`84`	`}`