Clean up a few things in project classes

tests/test_core/test_core_tree.py

@@ -119,7 +119,7 @@ def testCoreTree_BuildTree(mockGUI, mockItems):
     assert bool(theTree) is False
 
     # Check for archive and trash folders
-    assert theTree.trashRoot() is None
+    assert theTree.trashRoot is None
 
     aHandles = []
     for nwItem in mockItems:
@@ -146,7 +146,7 @@ def testCoreTree_BuildTree(mockGUI, mockItems):
     # ============
 
     # Check that we have the correct archive and trash folders
-    assert theTree.trashRoot() == "a000000000003"
+    assert theTree.trashRoot == "a000000000003"
     assert theTree.findRoot(nwItemClass.ARCHIVE) == "a000000000002"
     assert theTree.isTrash("a000000000003") is True
 
@@ -261,7 +261,7 @@ def testCoreTree_BuildTree(mockGUI, mockItems):
     del theTree["a000000000003"]
     assert len(theTree) == len(mockItems) - 3
     assert "a000000000003" not in theTree
-    assert theTree.trashRoot() is None
+    assert theTree.trashRoot is None
 
 # END Test testCoreTree_BuildTree
 
@@ -365,7 +365,7 @@ def testCoreTree_CheckConsistency(caplog: pytest.LogCaptureFixture, mockGUI, fnc
 
 
 @pytest.mark.core
-def testCoreTree_Methods(mockGUI, mockItems):
+def testCoreTree_Methods(monkeypatch, mockGUI, mockItems):
     """Test various class methods."""
     theProject = NWProject()
     theTree = NWTree(theProject)
@@ -389,11 +389,10 @@ def testCoreTree_Methods(mockGUI, mockItems):
     assert theTree.updateItemData("b000000000001") is True
 
     # Update item data, root is unreachable
-    maxDepth = theTree.MAX_DEPTH
-    theTree.MAX_DEPTH = 0  # type: ignore
-    with pytest.raises(RecursionError):
-        theTree.updateItemData("b000000000001")
-    theTree.MAX_DEPTH = maxDepth
+    with monkeypatch.context() as mp:
+        mp.setattr("novelwriter.core.tree.MAX_DEPTH", 0)
+        with pytest.raises(RecursionError):
+            theTree.updateItemData("b000000000001")
 
     # Check type
     assert theTree.checkType("blabla", nwItemType.FILE) is False
@@ -424,11 +423,10 @@ def testCoreTree_Methods(mockGUI, mockItems):
     ]
 
     # Cause recursion error
-    maxDepth = theTree.MAX_DEPTH
-    theTree.MAX_DEPTH = 0  # type: ignore
-    with pytest.raises(RecursionError):
-        theTree.getItemPath("c000000000001")
-    theTree.MAX_DEPTH = maxDepth
+    with monkeypatch.context() as mp:
+        mp.setattr("novelwriter.core.tree.MAX_DEPTH", 0)
+        with pytest.raises(RecursionError):
+            theTree.getItemPath("c000000000001")
 
     # Break the folder parent handle
     theTree["b000000000001"]._parent = "stuff"  # type: ignore

tests/test_gui/test_gui_guimain.py

@@ -205,7 +205,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd):
     assert len(SHARED.project.tree) == 0
     assert len(SHARED.project.tree._order) == 0
     assert len(SHARED.project.tree._roots) == 0
-    assert SHARED.project.tree.trashRoot() is None
+    assert SHARED.project.tree.trashRoot is None
     assert SHARED.project.data.name == ""
     assert SHARED.project.data.title == ""
     assert SHARED.project.data.author == ""
@@ -225,7 +225,7 @@ def testGuiMain_Editing(qtbot, monkeypatch, nwGUI, projPath, tstPaths, mockRnd):
     assert len(SHARED.project.tree) == 8
     assert len(SHARED.project.tree._order) == 8
     assert len(SHARED.project.tree._roots) == 4
-    assert SHARED.project.tree.trashRoot() is None
+    assert SHARED.project.tree.trashRoot is None
     assert SHARED.project.data.name == "New Project"
     assert SHARED.project.data.title == "New Novel"
     assert SHARED.project.data.author == "Jane Doe"

tests/test_gui/test_gui_projtree.py

@@ -348,7 +348,7 @@ def testGuiProjTree_RequestDeleteItem(qtbot, caplog, monkeypatch, nwGUI, projPat
         C.hChapterDir, C.hChapterDoc, C.hSceneDoc,
         "0000000000010"
     ]
-    trashHandle = SHARED.project.tree.trashRoot()
+    trashHandle = SHARED.project.tree.trashRoot
     assert projTree.getTreeFromHandle(trashHandle) == [
         trashHandle, "0000000000012", "0000000000011"
     ]
@@ -541,7 +541,7 @@ def testGuiProjTree_ContextMenu(qtbot, monkeypatch, nwGUI, projPath, mockRnd):
     projTree.setExpandedFromHandle(None, True)
 
     projTree._addTrashRoot()
-    hTrashRoot = SHARED.project.tree.trashRoot()
+    hTrashRoot = SHARED.project.tree.trashRoot
 
     projTree.setSelectedHandle(C.hCharRoot)
     projTree.newTreeItem(nwItemType.FILE)