Use storage class to return document objects

tests/test_core/test_core_coretools.py

@@ -31,7 +31,6 @@ from tools import C, buildTestProject, cmpFiles, XML_IGNORE
 
 from novelwriter.constants import nwItemClass
 from novelwriter.core.project import NWProject
-from novelwriter.core.document import NWDoc
 from novelwriter.core.coretools import DocMerger, DocSplitter, ProjectBuilder
 
 
@@ -164,7 +163,7 @@ def testCoreTools_DocSplitter(monkeypatch, mockGUI, fncDir, outDir, refDir, mock
 
     docText = "\n\n".join(docData)
     docRaw = docText.splitlines()
-    assert NWDoc(theProject, hSplitDoc).writeDocument(docText) is True
+    assert theProject.storage.getDocument(hSplitDoc).writeDocument(docText) is True
     theProject.tree[hSplitDoc].setStatus(C.sFinished)
     theProject.tree[hSplitDoc].setImport(C.iMain)
 

tests/test_core/test_core_project.py

@@ -38,7 +38,6 @@ from novelwriter.core.tree import NWTree
 from novelwriter.core.index import NWIndex
 from novelwriter.core.project import NWProject
 from novelwriter.core.options import OptionState
-from novelwriter.core.document import NWDoc
 from novelwriter.core.projectxml import ProjectXMLReader, ProjectXMLWriter, XMLReadState
 
 
@@ -125,11 +124,13 @@ def testCoreProject_NewFileFolder(monkeypatch, fncDir, outDir, refDir, mockGUI,
 
     # Write to file, success
     assert theProject.writeNewFile("0000000000011", 2, True) is True
-    assert NWDoc(theProject, "0000000000011").readDocument() == "## Hello\n\n"
+    assert theProject.storage.getDocument("0000000000011").readDocument() == "## Hello\n\n"
 
     # Write to file with additional text, success
     assert theProject.writeNewFile("0000000000012", 1, False, "Hi Jane\n\n") is True
-    assert NWDoc(theProject, "0000000000012").readDocument() == "# Jane\n\nHi Jane\n\n"
+    assert theProject.storage.getDocument("0000000000012").readDocument() == (
+        "# Jane\n\nHi Jane\n\n"
+    )
 
     # Save, close and check
     assert theProject.projChanged is True

tests/test_core/test_core_tokenizer.py

@@ -25,7 +25,6 @@ import pytest
 from tools import C, buildTestProject, readFile
 
 from novelwriter.core.project import NWProject
-from novelwriter.core.document import NWDoc
 from novelwriter.core.tokenizer import Tokenizer
 
 
@@ -156,7 +155,7 @@ def testCoreToken_TextOps(monkeypatch, mockGUI, mockRnd, fncDir):
     )
     docTextR = docText.replace("<A>", "this").replace("<B>", "that")
 
-    nDoc = NWDoc(theProject, C.hSceneDoc)
+    nDoc = theProject.storage.getDocument(C.hSceneDoc)
     assert nDoc.writeDocument(docText)
 
     theProject.data.setAutoReplace({"A": "this", "B": "that"})