Python: Modernise test/library-tests/PointsTo/calls/*

Author: RasmusWL

python/ql/test/library-tests/PointsTo/calls/Argument.expected

@@ -7,9 +7,9 @@
 | 23 | 0 | ControlFlowNode for c | Function f |
 | 23 | 1 | ControlFlowNode for w | Function f |
 | 23 | 2 | ControlFlowNode for z | Function f |
-| 24 | 0 | ControlFlowNode for c | Function n |
-| 24 | 1 | ControlFlowNode for x | Function n |
-| 25 | 0 | ControlFlowNode for y | Function n |
-| 25 | 1 | ControlFlowNode for z | Function n |
-| 33 | 0 | ControlFlowNode for IntegerLiteral | Function foo |
-| 34 | 0 | ControlFlowNode for IntegerLiteral | Function foo |
+| 24 | 0 | ControlFlowNode for c | Function C.n |
+| 24 | 1 | ControlFlowNode for x | Function C.n |
+| 25 | 0 | ControlFlowNode for y | Function C.n |
+| 25 | 1 | ControlFlowNode for z | Function C.n |
+| 33 | 0 | ControlFlowNode for IntegerLiteral | Function D.foo |
+| 34 | 0 | ControlFlowNode for IntegerLiteral | Function D.foo |

python/ql/test/library-tests/PointsTo/calls/Argument.ql

@@ -1,5 +1,5 @@
 import python
 
-from ControlFlowNode arg, FunctionObject func, int i
+from ControlFlowNode arg, FunctionValue func, int i
 where arg = func.getArgumentForCall(_, i)
 select arg.getLocation().getStartLine(), i, arg.toString(), func.toString()

python/ql/test/library-tests/PointsTo/calls/CallPointsTo.expected

@@ -0,0 +1,10 @@
+| 19 | ControlFlowNode for f() | Function f |
+| 21 | ControlFlowNode for f() | Function f |
+| 22 | ControlFlowNode for C() | class C |
+| 23 | ControlFlowNode for Attribute() | Method(Function f, C()) |
+| 24 | ControlFlowNode for Attribute() | Method(Function C.n, C()) |
+| 25 | ControlFlowNode for Attribute() | Function C.n |
+| 29 | ControlFlowNode for staticmethod() | builtin-class staticmethod |
+| 33 | ControlFlowNode for Attribute() | Function D.foo |
+| 34 | ControlFlowNode for Attribute() | Function D.foo |
+| 34 | ControlFlowNode for D() | class D |

…ary-tests/PointsTo/calls/CallRefersTo.ql …ary-tests/PointsTo/calls/CallPointsTo.qlpython/ql/test/library-tests/PointsTo/calls/CallRefersTo.ql renamed to python/ql/test/library-tests/PointsTo/calls/CallPointsTo.ql python/ql/test/library-tests/PointsTo/calls/CallRefersTo.ql renamed to python/ql/test/library-tests/PointsTo/calls/CallPointsTo.ql

@@ -1,5 +1,5 @@
 import python
 
-from CallNode call, Object func
-where call.getFunction().refersTo(func)
+from CallNode call, Value func
+where call.getFunction().pointsTo(func)
 select call.getLocation().getStartLine(), call.toString(), func.toString()

python/ql/test/library-tests/PointsTo/calls/CallRefersTo.expected

@@ -1,7 +1,7 @@
 | 19 | ControlFlowNode for f() | Function f |
 | 21 | ControlFlowNode for f() | Function f |
 | 23 | ControlFlowNode for Attribute() | Function f |
-| 24 | ControlFlowNode for Attribute() | Function n |
-| 25 | ControlFlowNode for Attribute() | Function n |
-| 33 | ControlFlowNode for Attribute() | Function foo |
-| 34 | ControlFlowNode for Attribute() | Function foo |
+| 24 | ControlFlowNode for Attribute() | Function C.n |
+| 25 | ControlFlowNode for Attribute() | Function C.n |
+| 33 | ControlFlowNode for Attribute() | Function D.foo |
+| 34 | ControlFlowNode for Attribute() | Function D.foo |

python/ql/test/library-tests/PointsTo/calls/GetACall.expected

@@ -1,5 +1,5 @@
 import python
 
-from ControlFlowNode call, FunctionObject func
+from ControlFlowNode call, FunctionValue func
 where call = func.getACall()
 select call.getLocation().getStartLine(), call.toString(), func.toString()