Remove project content attribute from project class

tests/conftest.py

@@ -64,6 +64,13 @@ def tmpDir():
     return theDir
 
 
+@pytest.fixture(scope="function")
+def tmpPath(tmpDir):
+    """A temporary folder for a single test function.
+    """
+    return Path(tmpDir)
+
+
 @pytest.fixture(scope="session")
 def tstPaths(tmpDir):
     """Returns an object that can provide the various paths needed for

tests/test_core/test_core_document.py

@@ -114,7 +114,7 @@ def testCoreDocument_LoadSave(monkeypatch, mockGUI, fncDir, mockRnd):
 
     # Cause os.replace() to fail while saving
     with monkeypatch.context() as mp:
-        mp.setattr("os.replace", causeOSError)
+        mp.setattr("pathlib.Path.replace", causeOSError)
         assert theDoc.writeDocument(theText) is False
         assert theDoc.getError() == "OSError: Mock OSError"
 
@@ -135,7 +135,7 @@ def testCoreDocument_LoadSave(monkeypatch, mockGUI, fncDir, mockRnd):
 
     # Cause the delete to fail
     with monkeypatch.context() as mp:
-        mp.setattr("os.unlink", causeOSError)
+        mp.setattr("pathlib.Path.unlink", causeOSError)
         theDoc = NWDoc(theProject, xHandle)
         assert theDoc.deleteDocument() is False
         assert theDoc.getError() == "OSError: Mock OSError"

tests/test_core/test_core_project.py

@@ -141,7 +141,7 @@ def testCoreProject_NewFileFolder(monkeypatch, fncDir, outDir, refDir, mockGUI,
 
     # Delete new file, but block access
     with monkeypatch.context() as mp:
-        mp.setattr("os.unlink", causeOSError)
+        mp.setattr("pathlib.Path.unlink", causeOSError)
         assert theProject.removeItem("0000000000011") is False
         assert "0000000000011" in theProject.tree
 
@@ -270,36 +270,6 @@ def testCoreProject_Save(monkeypatch, mockGUI, mockRnd, fncDir, refDir):
 # END Test testCoreProject_Save
 
 
-@pytest.mark.core
-def testCoreProject_Helpers(monkeypatch, fncDir, mockGUI):
-    """Test helper functions for the project folder.
-    """
-    theProject = NWProject(mockGUI)
-
-    # No path
-    assert theProject.ensureFolderStructure() is False
-
-    # Set the correct dir
-    theProject.projPath = fncDir
-
-    # Block user's home folder
-    with monkeypatch.context() as mp:
-        mp.setattr("os.path.expanduser", lambda *a, **k: fncDir)
-        assert theProject.ensureFolderStructure() is False
-
-    # Create a file to block content folder
-    contentDir = os.path.join(fncDir, "content")
-    writeFile(contentDir, "stuff")
-    assert theProject.ensureFolderStructure() is False
-    os.unlink(contentDir)
-
-    # Now, do it right
-    assert theProject.ensureFolderStructure() is True
-    assert os.path.isdir(contentDir)
-
-# END Test testCoreProject_Helpers
-
-
 @pytest.mark.core
 def testCoreProject_AccessItems(mockGUI, fncDir, mockRnd):
     """Test helper functions for the project folder.

tests/test_core/test_core_tree.py

@@ -19,10 +19,11 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import os
 import pytest
 import random
 
+from pathlib import Path
+
 from tools import readFile
 
 from novelwriter.enum import nwItemClass, nwItemType, nwItemLayout
@@ -394,7 +395,7 @@ def testCoreTree_Reorder(mockGUI, mockItems):
 
 
 @pytest.mark.core
-def testCoreTree_ToCFile(monkeypatch, mockGUI, mockItems, tmpDir):
+def testCoreTree_ToCFile(monkeypatch, mockGUI, mockItems, tmpPath):
     """Test writing the ToC.txt file.
     """
     theProject = NWProject(mockGUI)
@@ -411,24 +412,23 @@ def testCoreTree_ToCFile(monkeypatch, mockGUI, mockItems, tmpDir):
         """Return True for items that are files in novelWriter and
         should thus also be files in the project folder structure.
         """
-        dItem = theTree[fileName[8:21]]
+        dItem = theTree[fileName.name[:13]]
         assert dItem is not None
         return dItem.itemType == nwItemType.FILE
 
-    monkeypatch.setattr("os.path.isfile", mockIsFile)
+    monkeypatch.setattr("pathlib.Path.is_file", mockIsFile)
 
-    theProject.projContent = "content"
-    theProject.projPath = None
-    assert not theTree.writeToCFile()
+    theProject._storage._runtimePath = None
+    assert theTree.writeToCFile() is False
 
-    theProject.projPath = tmpDir
-    assert theTree.writeToCFile()
+    theProject._storage._runtimePath = tmpPath
+    assert theTree.writeToCFile() is True
 
-    pathA = os.path.join("content", "c000000000001.nwd")
-    pathB = os.path.join("content", "c000000000002.nwd")
-    pathC = os.path.join("content", "b000000000002.nwd")
+    pathA = str(Path("content") / "c000000000001.nwd")
+    pathB = str(Path("content") / "c000000000002.nwd")
+    pathC = str(Path("content") / "b000000000002.nwd")
 
-    assert readFile(os.path.join(tmpDir, nwFiles.TOC_TXT)) == (
+    assert readFile(tmpPath / nwFiles.TOC_TXT) == (
         "\n"
         "Table of Contents\n"
         "=================\n"

tests/test_gui/test_gui_noveltree.py

@@ -19,10 +19,11 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-import os
 import pytest
 
-from tools import C, buildTestProject, writeFile
+from pathlib import Path
+
+from tools import C, buildTestProject
 
 from PyQt5.QtGui import QFocusEvent
 from PyQt5.QtCore import Qt, QEvent
@@ -46,18 +47,18 @@ def testGuiNovelTree_TreeItems(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
     nwGUI.projView.projTree._getTreeItem(C.hCharRoot).setSelected(True)
     nwGUI.projView.projTree.newTreeItem(nwItemType.FILE)
 
-    writeFile(
-        os.path.join(nwGUI.theProject.projContent, "0000000000010.nwd"),
-        "# Jane Doe\n\n@tag: Jane\n\n"
-    )
-    writeFile(
-        os.path.join(nwGUI.theProject.projContent, "000000000000f.nwd"), (
-            "### Scene One\n\n"
-            "@pov: Jane\n"
-            "@focus: Jane\n\n"
-            "% Synopsis: This is a scene."
-        )
+    contentPath = nwGUI.theProject.storage.contentPath
+    assert isinstance(contentPath, Path)
+
+    (contentPath / "0000000000010.nwd").write_text(
+        "# Jane Doe\n\n@tag: Jane\n\n", encoding="utf-8"
     )
+    (contentPath / "000000000000f.nwd").write_text((
+        "### Scene One\n\n"
+        "@pov: Jane\n"
+        "@focus: Jane\n\n"
+        "% Synopsis: This is a scene."
+    ), encoding="utf-8")
 
     novelView = nwGUI.novelView
     novelTree = novelView.novelTree