Update tests

novelwriter/core/index.py

@@ -480,16 +480,6 @@ class NWIndex:
     #  Extract Data
     ##
 
-    def novelStructure(self, rootHandle=None, skipExcl=True):
-        """Iterate over all titles in the novel, in the correct order as
-        they appear in the tree view and in the respective document
-        files, but skipping all note files.
-        """
-        novStruct = self._itemIndex.iterNovelStructure(rootHandle=rootHandle, skipExcl=skipExcl)
-        for tHandle, sTitle, hItem in novStruct:
-            yield f"{tHandle}:{sTitle}", tHandle, sTitle, hItem
-        return
-
     def getItemData(self, tHandle):
         """Get the index data for a given item.
         """
@@ -503,6 +493,16 @@ class NWIndex:
             return tItem[sTitle]
         return None
 
+    def novelStructure(self, rootHandle=None, skipExcl=True):
+        """Iterate over all titles in the novel, in the correct order as
+        they appear in the tree view and in the respective document
+        files, but skipping all note files.
+        """
+        novStruct = self._itemIndex.iterNovelStructure(rootHandle=rootHandle, skipExcl=skipExcl)
+        for tHandle, sTitle, hItem in novStruct:
+            yield f"{tHandle}:{sTitle}", tHandle, sTitle, hItem
+        return
+
     def getNovelWordCount(self, skipExcl=True):
         """Count the number of words in the novel project.
         """
@@ -600,13 +600,6 @@ class NWIndex:
 
         return theRefs
 
-    def getNovelData(self, tHandle, sTitle):
-        """Return the novel data of a given handle and title.
-        """
-        if tHandle in self._itemIndex:
-            return self._itemIndex[tHandle][sTitle]
-        return None
-
     def getBackReferenceList(self, tHandle):
         """Build a list of files referring back to our file, specified
         by tHandle.

novelwriter/gui/noveltree.py

@@ -729,7 +729,7 @@ class GuiNovelTree(QTreeWidget):
         logger.debug("Generating meta data tooltip for '%s:%s'", tHandle, sTitle)
 
         pIndex = self.theProject.index
-        novIdx = pIndex.getNovelData(tHandle, sTitle)
+        novIdx = pIndex.getItemHeader(tHandle, sTitle)
         refTags = pIndex.getReferences(tHandle, sTitle)
 
         synopText = novIdx.synopsis

novelwriter/gui/outline.py

@@ -1049,7 +1049,7 @@ class GuiOutlineDetails(QScrollArea):
         """
         pIndex = self.theProject.index
         nwItem = self.theProject.tree[tHandle]
-        novIdx = pIndex.getNovelData(tHandle, sTitle)
+        novIdx = pIndex.getItemHeader(tHandle, sTitle)
         theRefs = pIndex.getReferences(tHandle, sTitle)
         if nwItem is None or novIdx is None:
             return False