Clean up top level window access and add coverage to shared data class

tests/test_dialogs/test_dlg_about.py

@@ -24,10 +24,9 @@ import pytest
 
 from pathlib import Path
 
-from tools import getGuiItem
-
 from PyQt5.QtWidgets import QAction, QMessageBox
 
+from novelwriter import SHARED
 from novelwriter.dialogs.about import GuiAbout
 
 
@@ -37,8 +36,8 @@ def testDlgAbout_NWDialog(qtbot, monkeypatch, nwGUI):
     # NW About
     nwGUI.showAboutNWDialog(showNotes=True)
 
-    qtbot.waitUntil(lambda: getGuiItem("GuiAbout") is not None, timeout=1000)
-    msgAbout = getGuiItem("GuiAbout")
+    qtbot.waitUntil(lambda: SHARED.findTopLevelWidget(GuiAbout) is not None, timeout=1000)
+    msgAbout = SHARED.findTopLevelWidget(GuiAbout)
     assert isinstance(msgAbout, GuiAbout)
 
     assert msgAbout.pageAbout.document().characterCount() > 100

tests/test_dialogs/test_dlg_preferences.py

@@ -22,8 +22,6 @@ from __future__ import annotations
 
 import pytest
 
-from tools import getGuiItem
-
 from PyQt5.QtGui import QFontDatabase, QKeyEvent
 from PyQt5.QtCore import QEvent, Qt
 from PyQt5.QtWidgets import QAction, QDialogButtonBox, QFileDialog, QFontDialog
@@ -44,8 +42,8 @@ def testDlgPreferences_Main(qtbot, monkeypatch, nwGUI, tstPaths):
 
     # Load GUI with standard values
     nwGUI.mainMenu.aPreferences.activate(QAction.ActionEvent.Trigger)
-    qtbot.waitUntil(lambda: getGuiItem("GuiPreferences") is not None, timeout=1000)
-    prefs = getGuiItem("GuiPreferences")
+    qtbot.waitUntil(lambda: SHARED.findTopLevelWidget(GuiPreferences) is not None, timeout=1000)
+    prefs = SHARED.findTopLevelWidget(GuiPreferences)
     assert isinstance(prefs, GuiPreferences)
     prefs.show()
 

tests/test_dialogs/test_dlg_projectsettings.py

@@ -22,7 +22,7 @@ from __future__ import annotations
 
 import pytest
 
-from tools import C, getGuiItem, buildTestProject
+from tools import C, buildTestProject
 
 from PyQt5.QtGui import QColor
 from PyQt5.QtCore import Qt
@@ -47,7 +47,7 @@ def testDlgProjSettings_Dialog(qtbot, monkeypatch, nwGUI):
 
     # Check that we cannot open when there is no project
     nwGUI.mainMenu.aProjectSettings.activate(QAction.Trigger)
-    assert getGuiItem("GuiProjectSettings") is None
+    assert SHARED.findTopLevelWidget(GuiProjectSettings) is None
 
     # Pretend we have a project
     SHARED.project._valid = True
@@ -55,9 +55,11 @@ def testDlgProjSettings_Dialog(qtbot, monkeypatch, nwGUI):
 
     # Get the dialog object
     nwGUI.mainMenu.aProjectSettings.activate(QAction.Trigger)
-    qtbot.waitUntil(lambda: getGuiItem("GuiProjectSettings") is not None, timeout=1000)
+    qtbot.waitUntil(
+        lambda: SHARED.findTopLevelWidget(GuiProjectSettings) is not None, timeout=1000
+    )
 
-    projSettings = getGuiItem("GuiProjectSettings")
+    projSettings = SHARED.findTopLevelWidget(GuiProjectSettings)
     assert isinstance(projSettings, GuiProjectSettings)
     projSettings.show()
     qtbot.addWidget(projSettings)

tests/test_dialogs/test_dlg_wordlist.py

@@ -25,7 +25,7 @@ import pytest
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QDialog, QAction
 
-from tools import buildTestProject, getGuiItem
+from tools import buildTestProject
 
 from novelwriter import SHARED
 from novelwriter.core.spellcheck import UserDictionary
@@ -47,9 +47,9 @@ def testDlgWordList_Dialog(qtbot, monkeypatch, nwGUI, projPath):
 
     # Load the dialog
     nwGUI.mainMenu.aEditWordList.activate(QAction.Trigger)
-    qtbot.waitUntil(lambda: getGuiItem("GuiWordList") is not None, timeout=1000)
+    qtbot.waitUntil(lambda: SHARED.findTopLevelWidget(GuiWordList) is not None, timeout=1000)
 
-    wList = getGuiItem("GuiWordList")
+    wList = SHARED.findTopLevelWidget(GuiWordList)
     assert isinstance(wList, GuiWordList)
     wList.show()