tests: Fix deprecation warnings

Due to deprecated nodes/links/annotations properties

Author: ales-erjavec

orangecanvas/application/tests/test_mainwindow.py

@@ -103,9 +103,9 @@ def test_create_toolbox(self):
         grid = toolbox.widget(0)
 
         button = grid.findChild(QToolButton)  # type: QToolButton
-        self.assertEqual(len(wf.nodes), 0)
+        self.assertEqual(len(wf.root().nodes()), 0)
         button.click()
-        self.assertEqual(len(wf.nodes), 1)
+        self.assertEqual(len(wf.root().nodes()), 1)
 
     def test_create_category_toolbar(self):
         w = self.w
@@ -245,8 +245,8 @@ def test(predicate):
         node.properties['dummy'] = 0
 
         test(lambda:
-             self.assertEqual(w2.scheme_widget.scheme().nodes[0].properties['dummy'], 0))
-        w2_node = w2.scheme_widget.scheme().nodes[0]
+             self.assertEqual(w2.scheme_widget.scheme().root().nodes()[0].properties['dummy'], 0))
+        w2_node = w2.scheme_widget.scheme().root().nodes()[0]
 
         # test widget change properties
         node.properties['dummy'] = 1
@@ -259,29 +259,29 @@ def test(predicate):
         # test link add
         w.current_document().addLink(link)
         test(lambda:
-             self.assertTrue(w2.scheme_widget.scheme().links))
+             self.assertTrue(w2.scheme_widget.scheme().root().links()))
 
         # test link remove
         w.current_document().removeLink(link)
         test(lambda:
-             self.assertFalse(w2.scheme_widget.scheme().links))
+             self.assertFalse(w2.scheme_widget.scheme().root().links()))
 
         # test widget remove
         w.scheme_widget.removeNode(node)
         w.scheme_widget.removeNode(node2)
         test(lambda:
-             self.assertFalse(w2.scheme_widget.scheme().nodes))
+             self.assertFalse(w2.scheme_widget.scheme().root().nodes()))
 
         # test annotation add
         a = SchemeTextAnnotation((200, 300, 50, 20), "text")
         w.current_document().addAnnotation(a)
         test(lambda:
-             self.assertTrue(w2.scheme_widget.scheme().annotations))
+             self.assertTrue(w2.scheme_widget.scheme().root().annotations()))
 
         # test annotation remove
         w.current_document().removeAnnotation(a)
         test(lambda:
-             self.assertFalse(w2.scheme_widget.scheme().annotations))
+             self.assertFalse(w2.scheme_widget.scheme().root().annotations()))
 
     def test_open_ows_req(self):
         w = self.w

orangecanvas/document/tests/test_schemeedit.py

@@ -67,6 +67,7 @@ def test_schemeedit(self):
         self.assertFalse(w.isModified())
 
         scheme = Scheme()
+        root = scheme.root()
         w.setScheme(scheme)
 
         self.assertIs(w.scheme(), scheme)
@@ -94,15 +95,15 @@ def test_schemeedit(self):
         w.addNode(node)
 
         self.assertSequenceEqual(node_list, [node])
-        self.assertSequenceEqual(scheme.nodes, node_list)
+        self.assertSequenceEqual(root.nodes(), node_list)
 
         self.assertTrue(w.isModified())
 
         stack = w.undoStack()
         stack.undo()
 
         self.assertSequenceEqual(node_list, [])
-        self.assertSequenceEqual(scheme.nodes, node_list)
+        self.assertSequenceEqual(root.nodes(), node_list)
         self.assertTrue(not w.isModified())
 
         stack.redo()
@@ -111,7 +112,7 @@ def test_schemeedit(self):
         w.addNode(node1)
 
         self.assertSequenceEqual(node_list, [node, node1])
-        self.assertSequenceEqual(scheme.nodes, node_list)
+        self.assertSequenceEqual(root.nodes(), node_list)
         self.assertTrue(w.isModified())
 
         link = SchemeLink(node, "value", node1, "value")
@@ -243,14 +244,15 @@ def test_arrow_annotation_action(self):
         w = self.w
         workflow = w.scheme()
         workflow.clear()
+        root = workflow.root()
         view = w.view()
         actions = w.toolbarActions()
         action_by_name(actions, "new-arrow-action").trigger()
         QTest.mousePress(view.viewport(), Qt.LeftButton, pos=QPoint(50, 50))
         mouseMove(view.viewport(), Qt.LeftButton, pos=QPoint(100, 100))
         QTest.mouseRelease(view.viewport(), Qt.LeftButton, pos=QPoint(100, 100))
-        self.assertEqual(len(workflow.annotations), 1)
-        self.assertIsInstance(workflow.annotations[0], SchemeArrowAnnotation)
+        self.assertEqual(len(root.annotations()), 1)
+        self.assertIsInstance(root.annotations()[0], SchemeArrowAnnotation)
 
     def test_arrow_annotation_action_cancel(self):
         w = self.w
@@ -269,7 +271,7 @@ def test_arrow_annotation_action_cancel(self):
         mouseMove(view.viewport(), Qt.LeftButton, pos=QPoint(100, 100))
         QTest.keyClick(view.viewport(), Qt.Key_Escape)
         self.assertFalse(action.isChecked())
-        self.assertEqual(workflow.annotations, [])
+        self.assertEqual(workflow.root().annotations(), [])
 
     def test_text_annotation_action(self):
         w = self.w
@@ -284,8 +286,8 @@ def test_text_annotation_action(self):
         # need to steal focus from the item for it to be commited.
         w.scene().setFocusItem(None)
 
-        self.assertEqual(len(workflow.annotations), 1)
-        self.assertIsInstance(workflow.annotations[0], SchemeTextAnnotation)
+        self.assertEqual(len(workflow.root().annotations()), 1)
+        self.assertIsInstance(workflow.root().annotations()[0], SchemeTextAnnotation)
 
     def test_text_annotation_action_cancel(self):
         w = self.w
@@ -305,7 +307,7 @@ def test_text_annotation_action_cancel(self):
         QTest.keyClick(view.viewport(), Qt.Key_Escape)
         self.assertFalse(action.isChecked())
         w.scene().setFocusItem(None)
-        self.assertEqual(workflow.annotations, [])
+        self.assertEqual(workflow.root().annotations(), [])
 
     def test_path(self):
         w = self.w
@@ -330,16 +332,14 @@ def test_select(self):
         w = self.w
         self.setup_test_workflow(w.scheme())
         w.selectAll()
-        self.assertSequenceEqual(
-            w.selectedNodes(), w.scheme().nodes)
-        self.assertSequenceEqual(
-            w.selectedAnnotations(), w.scheme().annotations)
-        self.assertSequenceEqual(
-            w.selectedLinks(), w.scheme().links)
+        root = w.root()
+        self.assertSequenceEqual(w.selectedNodes(), root.nodes())
+        self.assertSequenceEqual(w.selectedAnnotations(), root.annotations())
+        self.assertSequenceEqual(w.selectedLinks(), root.links())
         w.removeSelected()
-        self.assertEqual(w.scheme().nodes, [])
-        self.assertEqual(w.scheme().annotations, [])
-        self.assertEqual(w.scheme().links, [])
+        self.assertEqual(root.nodes(), [])
+        self.assertEqual(root.annotations(), [])
+        self.assertEqual(root.links(), [])
 
     def test_select_remove_link(self):
         def link_curve(link: SchemeLink) -> QPainterPath:
@@ -348,16 +348,17 @@ def link_curve(link: SchemeLink) -> QPainterPath:
             return item.mapToScene(path)
         w = self.w
         workflow = self.setup_test_workflow(w.scheme())
+        root = workflow.root()
         w.alignToGrid()
         scene, view = w.scene(), w.view()
-        link = workflow.links[0]
+        link = root.links()[0]
         path = link_curve(link)
         p = path.pointAtPercent(0.5)
         QTest.mouseClick(view.viewport(), Qt.LeftButton, pos=view.mapFromScene(p))
         self.assertSequenceEqual(w.selectedLinks(), [link])
         w.removeSelected()
         self.assertSequenceEqual(w.selectedLinks(), [])
-        self.assertTrue(link not in workflow.links)
+        self.assertTrue(link not in root.links())
 
     def test_open_selected(self):
         w = self.w
@@ -368,12 +369,13 @@ def test_open_selected(self):
     def test_insert_node_on_link(self):
         w = self.w
         workflow = self.setup_test_workflow(w.scheme())
+        root = workflow.root()
         neg = SchemeNode(self.reg.widget("negate"))
-        target = workflow.links[0]
+        target = root.links()[0]
         spyrem = QSignalSpy(workflow.link_removed)
         spyadd = QSignalSpy(workflow.link_added)
         w.insertNode(neg, target)
-        self.assertEqual(workflow.nodes[-1], neg)
+        self.assertEqual(root.nodes()[-1], neg)
 
         self.assertSequenceEqual(list(spyrem), [[target, workflow.root()]])
         self.assertEqual(len(spyadd), 2)
@@ -387,33 +389,36 @@ def test_align_to_grid(self):
     def test_activate_node(self):
         w = self.w
         workflow = self.setup_test_workflow()
+        root = workflow.root()
         w.setScheme(workflow)
 
         view, scene = w.view(), w.scene()
-        item = scene.item_for_node(workflow.nodes[0])  # type: QGraphicsWidget
+        item = scene.item_for_node(root.nodes()[0])  # type: QGraphicsWidget
         item.setSelected(True)
         item.setFocus(Qt.OtherFocusReason)
-        self.assertIs(w.focusNode(), workflow.nodes[0])
+        self.assertIs(w.focusNode(), root.nodes()[0])
         item.activated.emit()
 
     def test_duplicate(self):
         w = self.w
         workflow = self.setup_test_workflow()
+        root = workflow.root()
         w.setScheme(workflow)
         w.selectAll()
-        nnodes, nlinks = len(workflow.nodes), len(workflow.links)
+        nnodes, nlinks = len(root.nodes()), len(root.links())
         a = action_by_name(w.actions(), "duplicate-action")
         a.trigger()
-        self.assertEqual(len(workflow.nodes), 2 * nnodes)
-        self.assertEqual(len(workflow.links), 2 * nlinks)
+        self.assertEqual(len(root.nodes()), 2 * nnodes)
+        self.assertEqual(len(root.links()), 2 * nlinks)
 
     def test_copy_paste(self):
         w = self.w
         workflow = self.setup_test_workflow()
+        root = workflow.root()
         w.setRegistry(self.reg)
         w.setScheme(workflow)
         w.selectAll()
-        nnodes, nlinks = len(workflow.nodes), len(workflow.links)
+        nnodes, nlinks = len(root.nodes()), len(root.links())
         ca = action_by_name(w.actions(), "copy-action")
         cp = action_by_name(w.actions(), "paste-action")
         cb = QApplication.clipboard()
@@ -423,8 +428,8 @@ def test_copy_paste(self):
             self.assertTrue(spy.wait())
         self.assertEqual(len(spy), 1)
         cp.trigger()
-        self.assertEqual(len(workflow.nodes), 2 * nnodes)
-        self.assertEqual(len(workflow.links), 2 * nlinks)
+        self.assertEqual(len(root.nodes()), 2 * nnodes)
+        self.assertEqual(len(root.links()), 2 * nlinks)
 
         w1 = SchemeEditWidget()
         w1.setRegistry(self.reg)
@@ -433,34 +438,36 @@ def test_copy_paste(self):
         self.assertTrue(cp.isEnabled())
         cp.trigger()
         wf1 = w1.scheme()
-        self.assertEqual(len(wf1.nodes), nnodes)
-        self.assertEqual(len(wf1.links), nlinks)
+        root1 = wf1.root()
+        self.assertEqual(len(root1.nodes()), nnodes)
+        self.assertEqual(len(root1.links()), nlinks)
 
     def test_redo_remove_preserves_order(self):
         w = self.w
         workflow = self.setup_test_workflow()
+        root = workflow.root()
         w.setRegistry(self.reg)
         w.setScheme(workflow)
         undo = w.undoStack()
-        links = workflow.links
-        nodes = workflow.nodes
-        annotations = workflow.annotations
+        links = root.links()
+        nodes = root.nodes()
+        annotations = root.annotations()
         assert len(links) > 2
         w.removeLink(links[1])
-        self.assertSequenceEqual(links[:1] + links[2:], workflow.links)
+        self.assertSequenceEqual(links[:1] + links[2:], root.links())
         undo.undo()
-        self.assertSequenceEqual(links, workflow.links)
+        self.assertSequenceEqual(links, root.links())
         # find add node that has multiple in/out links
-        node = findf(workflow.nodes, lambda n: n.title == "add")
+        node = findf(root.nodes(), lambda n: n.title == "add")
         w.removeNode(node)
         undo.undo()
-        self.assertSequenceEqual(links, workflow.links)
-        self.assertSequenceEqual(nodes, workflow.nodes)
+        self.assertSequenceEqual(links, root.links())
+        self.assertSequenceEqual(nodes, root.nodes())
 
         w.removeAnnotation(annotations[0])
-        self.assertSequenceEqual(annotations[1:], workflow.annotations)
+        self.assertSequenceEqual(annotations[1:], root.annotations())
         undo.undo()
-        self.assertSequenceEqual(annotations, workflow.annotations)
+        self.assertSequenceEqual(annotations, root.annotations())
 
     def test_create_macro(self):
         w = self.w
@@ -495,9 +502,10 @@ def test_expand_macro(self):
     def test_window_groups(self):
         w = self.w
         workflow = self.setup_test_workflow()
+        nodes = workflow.root().nodes()
         workflow.set_window_group_presets([
-            Scheme.WindowGroup("G1", False, [(workflow.nodes[0], b'\xff\x00')]),
-            Scheme.WindowGroup("G2", True, [(workflow.nodes[0], b'\xff\x00')]),
+            Scheme.WindowGroup("G1", False, [(nodes[0], b'\xff\x00')]),
+            Scheme.WindowGroup("G2", True, [(nodes[0], b'\xff\x00')]),
         ])
         manager = TestingWidgetManager()
         workflow.widget_manager = manager
@@ -536,6 +544,7 @@ def test_drop_event(self):
         w = self.w
         w.setRegistry(self.reg)
         workflow = w.scheme()
+        root = workflow.root()
         desc = self.reg.widget("one")
         viewport = w.view().viewport()
         mime = QMimeData()
@@ -546,12 +555,12 @@ def test_drop_event(self):
 
         self.assertTrue(dragDrop(viewport, mime, QPoint(10, 10)))
 
-        self.assertEqual(len(workflow.nodes), 1)
-        self.assertEqual(workflow.nodes[0].description, desc)
+        self.assertEqual(len(root.nodes()), 1)
+        self.assertEqual(root.nodes()[0].description, desc)
 
         dragEnterLeave(viewport, mime)
 
-        self.assertEqual(len(workflow.nodes), 1)
+        self.assertEqual(len(root.nodes()), 1)
 
     def test_drag_drop(self):
         w = self.w
@@ -601,6 +610,7 @@ def test_plugin_drag_drop(self):
         w.setRegistry(self.reg)
         w.setDropHandlers([handler])
         workflow = w.scheme()
+        root = workflow.root()
         viewport = w.view().viewport()
         # Test empty handler
         mime = QMimeData()
@@ -617,9 +627,9 @@ def test_plugin_drag_drop(self):
         dragDrop(viewport, mime, QPoint(10, 10))
 
         self.assertIsNone(w._userInteractionHandler())
-        self.assertEqual(len(workflow.nodes), 1)
-        self.assertEqual(workflow.nodes[0].description.name, "one")
-        self.assertEqual(workflow.nodes[0].properties, {"a": "from drop"})
+        self.assertEqual(len(root.nodes()), 1)
+        self.assertEqual(root.nodes()[0].description.name, "one")
+        self.assertEqual(root.nodes()[0].properties, {"a": "from drop"})
 
         workflow.clear()
 
@@ -635,9 +645,9 @@ def exec(self, *args):
         with mock.patch.object(QMenu, "exec", exec):
             dragDrop(viewport, mime, QPoint(10, 10))
 
-        self.assertEqual(len(workflow.nodes), 1)
-        self.assertEqual(workflow.nodes[0].description.name, "one")
-        self.assertEqual(workflow.nodes[0].properties, {"a": "from drop"})
+        self.assertEqual(len(root.nodes()), 1)
+        self.assertEqual(root.nodes()[0].description.name, "one")
+        self.assertEqual(root.nodes()[0].properties, {"a": "from drop"})
 
     def test_activate_drop_node(self):
         class NodeFromMimeData(TestNodeFromMimeData):