Python: Add tests for full Python 3 parameters syntax

RasmusWL · RasmusWL · commit 0cc8d4911211 · 2020-04-27T17:22:56.000+02:00
Currently keyword-only parameters are not handled properly :(
diff --git a/python/ql/test/3/library-tests/functions/Function.getAChildNode.expected b/python/ql/test/3/library-tests/functions/Function.getAChildNode.expected
@@ -0,0 +1,7 @@
+| test.py:4:1:11:2 | Function func | test.py:5:5:5:12 | pos_only |
+| test.py:4:1:11:2 | Function func | test.py:7:5:7:10 | normal |
+| test.py:4:1:11:2 | Function func | test.py:8:6:8:9 | args |
+| test.py:4:1:11:2 | Function func | test.py:10:7:10:12 | kwargs |
+| test.py:4:1:11:2 | Function func | test.py:12:5:12:41 | ExprStmt |
+| test.py:4:1:11:2 | Function func | test.py:13:5:13:15 | ExprStmt |
+| test.py:4:1:11:2 | Function func | test.py:14:5:14:17 | ExprStmt |
diff --git a/python/ql/test/3/library-tests/functions/Function.getAChildNode.ql b/python/ql/test/3/library-tests/functions/Function.getAChildNode.ql
@@ -0,0 +1,4 @@
+import python
+
+from Function f
+select f, f.getAChildNode()
diff --git a/python/ql/test/3/library-tests/functions/Function.getArg.expected b/python/ql/test/3/library-tests/functions/Function.getArg.expected
@@ -0,0 +1,2 @@
+| test.py:4:1:11:2 | Function func | 0 | test.py:5:5:5:12 | Parameter |
+| test.py:4:1:11:2 | Function func | 1 | test.py:7:5:7:10 | Parameter |
diff --git a/python/ql/test/3/library-tests/functions/Function.getArg.ql b/python/ql/test/3/library-tests/functions/Function.getArg.ql
@@ -0,0 +1,4 @@
+import python
+
+from Function f, int i
+select f, i, f.getArg(i)
diff --git a/python/ql/test/3/library-tests/functions/Function.getArgByName.expected b/python/ql/test/3/library-tests/functions/Function.getArgByName.expected
@@ -0,0 +1,2 @@
+| test.py:4:1:11:2 | Function func | normal | test.py:7:5:7:10 | Parameter |
+| test.py:4:1:11:2 | Function func | pos_only | test.py:5:5:5:12 | Parameter |
diff --git a/python/ql/test/3/library-tests/functions/Function.getArgByName.ql b/python/ql/test/3/library-tests/functions/Function.getArgByName.ql
@@ -0,0 +1,4 @@
+import python
+
+from Function f, string name
+select f, name, f.getArgByName(name)
diff --git a/python/ql/test/3/library-tests/functions/FunctionExpr.getASubExpression.expected b/python/ql/test/3/library-tests/functions/FunctionExpr.getASubExpression.expected
@@ -0,0 +1,7 @@
+| test.py:4:1:11:2 | FunctionExpr | test.py:5:15:5:17 | int |
+| test.py:4:1:11:2 | FunctionExpr | test.py:5:21:5:22 | UnaryExpr |
+| test.py:4:1:11:2 | FunctionExpr | test.py:7:13:7:15 | int |
+| test.py:4:1:11:2 | FunctionExpr | test.py:7:19:7:20 | UnaryExpr |
+| test.py:4:1:11:2 | FunctionExpr | test.py:8:12:8:23 | Str |
+| test.py:4:1:11:2 | FunctionExpr | test.py:9:25:9:26 | UnaryExpr |
+| test.py:4:1:11:2 | FunctionExpr | test.py:10:15:10:30 | Str |
diff --git a/python/ql/test/3/library-tests/functions/FunctionExpr.getASubExpression.ql b/python/ql/test/3/library-tests/functions/FunctionExpr.getASubExpression.ql
@@ -0,0 +1,4 @@
+import python
+
+from FunctionExpr fe
+select fe, fe.getASubExpression()
diff --git a/python/ql/test/3/library-tests/functions/FunctionExpr.getArgs.getADefault.expected b/python/ql/test/3/library-tests/functions/FunctionExpr.getArgs.getADefault.expected
@@ -0,0 +1,2 @@
+| test.py:4:1:11:2 | FunctionExpr | Arguments | test.py:5:21:5:22 | UnaryExpr |
+| test.py:4:1:11:2 | FunctionExpr | Arguments | test.py:7:19:7:20 | UnaryExpr |
diff --git a/python/ql/test/3/library-tests/functions/FunctionExpr.getArgs.getADefault.ql b/python/ql/test/3/library-tests/functions/FunctionExpr.getArgs.getADefault.ql
@@ -0,0 +1,4 @@
+import python
+
+from FunctionExpr fe
+select fe, fe.getArgs(), fe.getArgs().getADefault()
diff --git a/python/ql/test/3/library-tests/functions/FunctionExpr.getArgs.getAKwDefault.expected b/python/ql/test/3/library-tests/functions/FunctionExpr.getArgs.getAKwDefault.expected
@@ -0,0 +1 @@
+| test.py:4:1:11:2 | FunctionExpr | Arguments | test.py:9:25:9:26 | UnaryExpr |
diff --git a/python/ql/test/3/library-tests/functions/FunctionExpr.getArgs.getAKwDefault.ql b/python/ql/test/3/library-tests/functions/FunctionExpr.getArgs.getAKwDefault.ql
@@ -0,0 +1,4 @@
+import python
+
+from FunctionExpr fe
+select fe, fe.getArgs(), fe.getArgs().getAKwDefault()
diff --git a/python/ql/test/3/library-tests/functions/test.py b/python/ql/test/3/library-tests/functions/test.py
@@ -0,0 +1,20 @@
+# not importing typing so we don't need to filter by location in Ql tests
+
+
+def func(
+    pos_only: int = -1,
+    /,
+    normal: int = -2,
+    *args: "Tuple[str]",
+    keyword_only: int = -3,
+    **kwargs: "Dict[str, str]",
+):
+    print(pos_only, normal, keyword_only)
+    print(args)
+    print(kwargs)
+
+
+func(1, 2, keyword_only=3)
+func(4, normal=5, keyword_only=6)
+
+func(1, 2, "varargs0", "varargs1", keyword_only=3, kwargs0="0", kwargs1="1")
diff --git a/python/ql/test/3/library-tests/parameters/Annotations.expected b/python/ql/test/3/library-tests/parameters/Annotations.expected
@@ -0,0 +1,4 @@
+| args | test.py:8:12:8:23 | Str |
+| kwargs | test.py:10:15:10:30 | Str |
+| normal | test.py:7:13:7:15 | int |
+| pos_only | test.py:5:15:5:17 | int |
diff --git a/python/ql/test/3/library-tests/parameters/Annotations.ql b/python/ql/test/3/library-tests/parameters/Annotations.ql
@@ -0,0 +1,4 @@
+import python
+
+from Parameter p
+select p.getName(), p.getAnnotation()
diff --git a/python/ql/test/3/library-tests/parameters/Defaults.expected b/python/ql/test/3/library-tests/parameters/Defaults.expected
@@ -0,0 +1,2 @@
+| normal | test.py:7:19:7:20 | UnaryExpr |
+| pos_only | test.py:5:21:5:22 | UnaryExpr |
diff --git a/python/ql/test/3/library-tests/parameters/Defaults.ql b/python/ql/test/3/library-tests/parameters/Defaults.ql
@@ -0,0 +1,4 @@
+import python
+
+from Parameter p
+select p.getName(), p.getDefault()
diff --git a/python/ql/test/3/library-tests/parameters/Special.expected b/python/ql/test/3/library-tests/parameters/Special.expected
@@ -0,0 +1,4 @@
+| args | varargs |
+| kwargs | kwargs |
+| normal | normal |
+| pos_only | normal |
diff --git a/python/ql/test/3/library-tests/parameters/Special.ql b/python/ql/test/3/library-tests/parameters/Special.ql
@@ -0,0 +1,10 @@
+import python
+
+from Parameter p, string type
+where
+    p.isKwargs() and type = "kwargs"
+    or
+    p.isVarargs() and type = "varargs"
+    or
+    not p.isKwargs() and not p.isVarargs() and type = "normal"
+select p.getName(), type
diff --git a/python/ql/test/3/library-tests/parameters/test.py b/python/ql/test/3/library-tests/parameters/test.py
@@ -0,0 +1,20 @@
+# not importing typing so we don't need to filter by location in Ql tests
+
+
+def func(
+    pos_only: int = -1,
+    /,
+    normal: int = -2,
+    *args: "Tuple[str]",
+    keyword_only: int = -3,
+    **kwargs: "Dict[str, str]",
+):
+    print(pos_only, normal, keyword_only)
+    print(args)
+    print(kwargs)
+
+
+func(1, 2, keyword_only=3)
+func(4, normal=5, keyword_only=6)
+
+func(1, 2, "varargs0", "varargs1", keyword_only=3, kwargs0="0", kwargs1="1")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+\| test.py:4:1:11:2 \| Function func \| 0 \| test.py:5:5:5:12 \| Parameter \|`
	`2`	`+\| test.py:4:1:11:2 \| Function func \| 1 \| test.py:7:5:7:10 \| Parameter \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+\| test.py:4:1:11:2 \| Function func \| normal \| test.py:7:5:7:10 \| Parameter \|`
	`2`	`+\| test.py:4:1:11:2 \| Function func \| pos_only \| test.py:5:5:5:12 \| Parameter \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+\| test.py:4:1:11:2 \| FunctionExpr \| Arguments \| test.py:5:21:5:22 \| UnaryExpr \|`
	`2`	`+\| test.py:4:1:11:2 \| FunctionExpr \| Arguments \| test.py:7:19:7:20 \| UnaryExpr \|`