add tests for argument syntax

erik-krogh · erik-krogh · commit 35b143a1a5ae · 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
@@ -11,6 +11,12 @@ isSink
 | test.py:10:8:10:22 | ControlFlowNode for Attribute() | test-sink |
 | test.py:11:8:11:30 | ControlFlowNode for Attribute() | test-sink |
 | test.py:12:8:12:34 | ControlFlowNode for Attribute() | test-sink |
+| test.py:16:11:16:13 | ControlFlowNode for one | test-source |
+| test.py:17:19:17:21 | ControlFlowNode for two | test-source |
+| test.py:17:24:17:28 | ControlFlowNode for three | test-source |
+| 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 |
 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
@@ -9,4 +9,11 @@
 mySink(alias()) # NOT OK
 mySink(alias().chain()) # NOT OK
 mySink(alias().chain().chain()) # NOT OK
-mySink(alias().chain().safeThing()) # OK
+mySink(alias().chain().safeThing()) # OK
+
+from testlib import Args
+
+Args.arg0(one, two, three, four, five)
+Args.arg1to3(one, two, three, four, five)
+Args.lastarg(one, two, three, four, five)
+Args.nonFist(first, second)
diff --git a/python/ql/test/library-tests/frameworks/data/test.ql b/python/ql/test/library-tests/frameworks/data/test.ql
@@ -38,7 +38,15 @@ class Types extends ModelInput::TypeModelCsv {
 class Sinks extends ModelInput::SinkModelCsv {
   override predicate row(string row) {
     // package;type;path;kind
-    row = ["testlib;;Member[mySink].Argument[0,sinkName:];test-sink"]
+    row =
+      [
+        "testlib;;Member[mySink].Argument[0,sinkName:];test-sink",
+        // testing argument syntax
+        "testlib;;Member[Args].Member[arg0].Argument[0];test-source", //
+        "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", //
+      ]
   }
 }
 
@@ -52,7 +60,7 @@ class Sources extends ModelInput::SourceModelCsv {
     row =
       [
         "testlib;;Member[getSource].ReturnValue;test-source", //
-        "testlib;Alias;;test-source"
+        "testlib;Alias;;test-source",
       ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,15 @@ class Types extends ModelInput::TypeModelCsv {`
`38`	`38`	`class Sinks extends ModelInput::SinkModelCsv {`
`39`	`39`	`override predicate row(string row) {`
`40`	`40`	`// package;type;path;kind`
`41`		`- row = ["testlib;;Member[mySink].Argument[0,sinkName:];test-sink"]`
	`41`	`+ row =`
	`42`	`+ [`
	`43`	`+ "testlib;;Member[mySink].Argument[0,sinkName:];test-sink",`
	`44`	`+ // testing argument syntax`
	`45`	`+ "testlib;;Member[Args].Member[arg0].Argument[0];test-source", //`
	`46`	`+ "testlib;;Member[Args].Member[arg1to3].Argument[1..3];test-source", //`
	`47`	`+ "testlib;;Member[Args].Member[lastarg].Argument[N-1];test-source", //`
	`48`	`+ "testlib;;Member[Args].Member[nonFist].Argument[1..];test-source", //`
	`49`	`+ ]`
`42`	`50`	`}`
`43`	`51`	`}`
`44`	`52`
`@@ -52,7 +60,7 @@ class Sources extends ModelInput::SourceModelCsv {`
`52`	`60`	`row =`
`53`	`61`	`[`
`54`	`62`	`"testlib;;Member[getSource].ReturnValue;test-source", //`
`55`		`- "testlib;Alias;;test-source"`
	`63`	`+ "testlib;Alias;;test-source",`
`56`	`64`	`]`
`57`	`65`	`}`
`58`	`66`	`}`