Python: CallGraph tests: remove rest of old annotations

Author: RasmusWL

python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected

@@ -3,11 +3,11 @@ debug_callableNotUnique
 | code/class_advanced.py:18:5:18:18 | Function arg | Qualified function name 'B.arg' is not unique. Please fix. |
 | code/class_advanced.py:23:5:23:25 | Function arg | Qualified function name 'B.arg' is not unique. Please fix. |
 pointsTo_found_typeTracker_notFound
-| code/class_simple.py:28:1:28:15 | ControlFlowNode for Attribute() | A.some_method |
-| code/class_simple.py:30:1:30:21 | ControlFlowNode for Attribute() | A.some_staticmethod |
-| code/class_simple.py:32:1:32:20 | ControlFlowNode for Attribute() | A.some_classmethod |
-| code/class_simple.py:35:1:35:21 | ControlFlowNode for Attribute() | A.some_staticmethod |
-| code/class_simple.py:37:1:37:20 | ControlFlowNode for Attribute() | A.some_classmethod |
+| code/class_simple.py:24:1:24:15 | ControlFlowNode for Attribute() | A.some_method |
+| code/class_simple.py:25:1:25:21 | ControlFlowNode for Attribute() | A.some_staticmethod |
+| code/class_simple.py:26:1:26:20 | ControlFlowNode for Attribute() | A.some_classmethod |
+| code/class_simple.py:28:1:28:21 | ControlFlowNode for Attribute() | A.some_staticmethod |
+| code/class_simple.py:29:1:29:20 | ControlFlowNode for Attribute() | A.some_classmethod |
 | code/runtime_decision.py:18:1:18:6 | ControlFlowNode for func() | rd_bar |
 | code/runtime_decision.py:18:1:18:6 | ControlFlowNode for func() | rd_foo |
 | code/runtime_decision.py:26:1:26:7 | ControlFlowNode for func2() | rd_bar |

python/ql/test/experimental/library-tests/CallGraph/code/class_simple.py

@@ -4,17 +4,14 @@ def __init__(self, arg):
         print('A.__init__', arg)
         self.arg = arg
 
-    # name:A.some_method
     def some_method(self):
         print('A.some_method', self)
 
     @staticmethod
-    # name:A.some_staticmethod
     def some_staticmethod():
         print('A.some_staticmethod')
 
     @classmethod
-    # name:A.some_classmethod
     def some_classmethod(cls):
         print('A.some_classmethod', cls)
 
@@ -24,14 +21,9 @@ def some_classmethod(cls):
 # However, current test setup uses "callable" for naming, and expects things to be Function.
 a = A(42)
 
-# calls:A.some_method
 a.some_method() # $ pt=A.some_method
-# calls:A.some_staticmethod
 a.some_staticmethod() # $ pt=A.some_staticmethod
-# calls:A.some_classmethod
 a.some_classmethod() # $ pt=A.some_classmethod
 
-# calls:A.some_staticmethod
 A.some_staticmethod() # $ pt=A.some_staticmethod
-# calls:A.some_classmethod
 A.some_classmethod() # $ pt=A.some_classmethod