Skip to content

Commit fd4f60d

Browse files
RasmusWLRasmusWL
committed
Python: Adjust variables tests
1 parent ebd97f4 commit fd4f60d

File tree

6 files changed

+63
-63
lines changed

6 files changed

+63
-63
lines changed

‎python/ql/test/library-tests/variables/scopes/free.expected

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
| Local Variable local2 | Function func2 | Function inner1 |
2-
| Local Variable local4 | Function func3 | Function inner2 |
3-
| Local Variable local4 | Function func3 | Function inner_outer |
4-
| Local Variable local5 | Function inner_outer | Function inner2 |
5-
| Local Variable param4 | Function func3 | Function inner2 |
6-
| Local Variable param4 | Function func3 | Function inner_outer |
7-
| Local Variable param5 | Function func3 | Function inner_outer |
8-
| Local Variable param6 | Function func4 | Function meth_inner |
9-
| Local Variable z | Function func6 | Function listcomp |
1+
| Local Variable local2 | test.py:15:1:15:12 | Function func2 | test.py:17:5:17:23 | Function inner1 |
2+
| Local Variable local4 | test.py:22:1:22:26 | Function func3 | test.py:24:5:24:22 | Function inner_outer |
3+
| Local Variable local4 | test.py:22:1:22:26 | Function func3 | test.py:25:9:25:27 | Function inner2 |
4+
| Local Variable local5 | test.py:24:5:24:22 | Function inner_outer | test.py:25:9:25:27 | Function inner2 |
5+
| Local Variable param4 | test.py:22:1:22:26 | Function func3 | test.py:24:5:24:22 | Function inner_outer |
6+
| Local Variable param4 | test.py:22:1:22:26 | Function func3 | test.py:25:9:25:27 | Function inner2 |
7+
| Local Variable param5 | test.py:22:1:22:26 | Function func3 | test.py:24:5:24:22 | Function inner_outer |
8+
| Local Variable param6 | test.py:38:1:38:18 | Function func4 | test.py:40:9:40:29 | Function meth_inner |
9+
| Local Variable z | test.py:47:1:47:16 | Function func6 | test.py:48:12:48:29 | Function listcomp |

‎python/ql/test/library-tests/variables/scopes/free.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ where
55
v.escapes() and
66
inner = v.getAnAccess().getScope() and
77
inner != v.getScope()
8-
select v.toString(), v.getScope().toString(), inner.toString()
8+
select v, v.getScope(), inner

‎python/ql/test/library-tests/variables/scopes/globals.expected

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
| Global Variable C | Module test |
2-
| Global Variable __name__ | Module test |
3-
| Global Variable __package__ | Module test |
4-
| Global Variable base | Module test |
5-
| Global Variable func0 | Module test |
6-
| Global Variable func1 | Module test |
7-
| Global Variable func2 | Module test |
8-
| Global Variable func3 | Module test |
9-
| Global Variable func4 | Module test |
10-
| Global Variable func5 | Module test |
11-
| Global Variable func6 | Module test |
12-
| Global Variable global0 | Module test |
13-
| Global Variable global1 | Module test |
14-
| Global Variable global_local | Module test |
15-
| Global Variable range | Module test |
16-
| Global Variable seq | Module test |
17-
| Global Variable use_in_loop | Module test |
1+
| Global Variable C | test.py:0:0:0:0 | Module test |
2+
| Global Variable __name__ | test.py:0:0:0:0 | Module test |
3+
| Global Variable __package__ | test.py:0:0:0:0 | Module test |
4+
| Global Variable base | test.py:0:0:0:0 | Module test |
5+
| Global Variable func0 | test.py:0:0:0:0 | Module test |
6+
| Global Variable func1 | test.py:0:0:0:0 | Module test |
7+
| Global Variable func2 | test.py:0:0:0:0 | Module test |
8+
| Global Variable func3 | test.py:0:0:0:0 | Module test |
9+
| Global Variable func4 | test.py:0:0:0:0 | Module test |
10+
| Global Variable func5 | test.py:0:0:0:0 | Module test |
11+
| Global Variable func6 | test.py:0:0:0:0 | Module test |
12+
| Global Variable global0 | test.py:0:0:0:0 | Module test |
13+
| Global Variable global1 | test.py:0:0:0:0 | Module test |
14+
| Global Variable global_local | test.py:0:0:0:0 | Module test |
15+
| Global Variable range | test.py:0:0:0:0 | Module test |
16+
| Global Variable seq | test.py:0:0:0:0 | Module test |
17+
| Global Variable use_in_loop | test.py:0:0:0:0 | Module test |

‎python/ql/test/library-tests/variables/scopes/globals.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import python
22

33
from GlobalVariable l
4-
select l.toString(), l.getScope().toString()
4+
select l, l.getScope()

‎python/ql/test/library-tests/variables/scopes/lookup.expected

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
| 6 | ControlFlowNode for param0 | local |
2-
| 6 | ControlFlowNode for param1 | local |
3-
| 12 | ControlFlowNode for global_local | global |
4-
| 13 | ControlFlowNode for global1 | global |
5-
| 13 | ControlFlowNode for local0 | local |
6-
| 13 | ControlFlowNode for local1 | local |
7-
| 18 | ControlFlowNode for local2 | non-local |
8-
| 19 | ControlFlowNode for local3 | local |
9-
| 20 | ControlFlowNode for inner1 | local |
10-
| 26 | ControlFlowNode for local4 | non-local |
11-
| 26 | ControlFlowNode for local5 | non-local |
12-
| 26 | ControlFlowNode for param3 | local |
13-
| 26 | ControlFlowNode for param4 | non-local |
14-
| 28 | ControlFlowNode for inner2 | local |
15-
| 28 | ControlFlowNode for local4 | non-local |
16-
| 28 | ControlFlowNode for param4 | non-local |
17-
| 28 | ControlFlowNode for param5 | non-local |
18-
| 30 | ControlFlowNode for base | global |
19-
| 35 | ControlFlowNode for self | local |
20-
| 36 | ControlFlowNode for mlocal | local |
21-
| 41 | ControlFlowNode for param6 | non-local |
22-
| 42 | ControlFlowNode for Local | local |
23-
| 45 | ControlFlowNode for .0 | local |
24-
| 45 | ControlFlowNode for seq | local |
25-
| 45 | ControlFlowNode for x | local |
26-
| 48 | ControlFlowNode for .0 | local |
27-
| 48 | ControlFlowNode for seq | global |
28-
| 48 | ControlFlowNode for y | local |
29-
| 48 | ControlFlowNode for z | non-local |
30-
| 52 | ControlFlowNode for .0 | local |
31-
| 52 | ControlFlowNode for range | global |
32-
| 52 | ControlFlowNode for v | local |
33-
| 53 | ControlFlowNode for seq | local |
34-
| 54 | ControlFlowNode for v | local |
1+
| test.py:6:12:6:17 | ControlFlowNode for param0 | local |
2+
| test.py:6:21:6:26 | ControlFlowNode for param1 | local |
3+
| test.py:12:5:12:16 | ControlFlowNode for global_local | global |
4+
| test.py:13:15:13:20 | ControlFlowNode for local0 | local |
5+
| test.py:13:24:13:29 | ControlFlowNode for local1 | local |
6+
| test.py:13:33:13:39 | ControlFlowNode for global1 | global |
7+
| test.py:18:18:18:23 | ControlFlowNode for local2 | non-local |
8+
| test.py:19:16:19:21 | ControlFlowNode for local3 | local |
9+
| test.py:20:12:20:17 | ControlFlowNode for inner1 | local |
10+
| test.py:26:20:26:25 | ControlFlowNode for local5 | non-local |
11+
| test.py:26:29:26:34 | ControlFlowNode for local4 | non-local |
12+
| test.py:26:38:26:43 | ControlFlowNode for param3 | local |
13+
| test.py:26:47:26:52 | ControlFlowNode for param4 | non-local |
14+
| test.py:28:16:28:21 | ControlFlowNode for inner2 | local |
15+
| test.py:28:23:28:28 | ControlFlowNode for local4 | non-local |
16+
| test.py:28:32:28:37 | ControlFlowNode for param4 | non-local |
17+
| test.py:28:41:28:46 | ControlFlowNode for param5 | non-local |
18+
| test.py:30:9:30:12 | ControlFlowNode for base | global |
19+
| test.py:35:18:35:21 | ControlFlowNode for self | local |
20+
| test.py:36:16:36:21 | ControlFlowNode for mlocal | local |
21+
| test.py:41:20:41:25 | ControlFlowNode for param6 | non-local |
22+
| test.py:42:12:42:16 | ControlFlowNode for Local | local |
23+
| test.py:45:12:45:27 | ControlFlowNode for .0 | local |
24+
| test.py:45:13:45:13 | ControlFlowNode for x | local |
25+
| test.py:45:24:45:26 | ControlFlowNode for seq | local |
26+
| test.py:48:12:48:29 | ControlFlowNode for .0 | local |
27+
| test.py:48:13:48:13 | ControlFlowNode for y | local |
28+
| test.py:48:15:48:15 | ControlFlowNode for z | non-local |
29+
| test.py:48:26:48:28 | ControlFlowNode for seq | global |
30+
| test.py:52:5:52:25 | ControlFlowNode for .0 | local |
31+
| test.py:52:6:52:6 | ControlFlowNode for v | local |
32+
| test.py:52:17:52:21 | ControlFlowNode for range | global |
33+
| test.py:53:14:53:16 | ControlFlowNode for seq | local |
34+
| test.py:54:9:54:9 | ControlFlowNode for v | local |

‎python/ql/test/library-tests/variables/scopes/lookup.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ where
1515
not n.isNonLocal() and
1616
l = "none"
1717
)
18-
select n.getLocation().getStartLine(), n.toString(), l
18+
select n, l

0 commit comments

Comments
 (0)