Update tests

tests/test_core/test_core_document.py

@@ -27,7 +27,7 @@ from dummy import causeOSError
 
 from nw.core import NWProject, NWDoc
 from nw.core.item import NWItem
-from nw.constants import nwItemClass, nwItemLayout
+from nw.enum import nwItemClass, nwItemLayout
 
 @pytest.mark.core
 def testCoreDocument_LoadSave(monkeypatch, dummyGUI, nwMinimal):

tests/test_core/test_core_index.py

@@ -31,7 +31,7 @@ from tools import cmpFiles
 
 from nw.core.project import NWProject
 from nw.core.index import NWIndex, countWords
-from nw.constants import nwItemClass, nwItemLayout
+from nw.enum import nwItemClass, nwItemLayout
 
 @pytest.mark.core
 def testCoreIndex_LoadSave(monkeypatch, nwLipsum, dummyGUI, outDir, refDir):

tests/test_core/test_core_item.py

@@ -26,7 +26,7 @@ from lxml import etree
 
 from nw.core import NWProject
 from nw.core.item import NWItem
-from nw.constants import nwItemClass, nwItemType, nwItemLayout
+from nw.enum import nwItemClass, nwItemType, nwItemLayout
 
 @pytest.mark.core
 def testCoreItem_Setters(dummyGUI):

tests/test_core/test_core_project.py

@@ -31,8 +31,9 @@ from tools import cmpFiles, writeFile, readFile
 from dummy import causeOSError
 
 from nw.core.project import NWProject
-from nw.constants import nwItemClass, nwItemType, nwItemLayout, nwFiles
+from nw.enum import nwItemClass, nwItemType, nwItemLayout
 from nw.common import formatTimeStamp
+from nw.constants import nwFiles
 
 @pytest.mark.core
 def testCoreProject_NewMinimal(fncDir, outDir, refDir, tmpDir, dummyGUI):

tests/test_core/test_core_tree.py

@@ -26,7 +26,8 @@ import pytest
 from lxml import etree
 
 from nw.core.project import NWProject, NWItem, NWTree
-from nw.constants import nwItemClass, nwItemType, nwItemLayout, nwFiles
+from nw.enum import nwItemClass, nwItemType, nwItemLayout
+from nw.constants import nwFiles
 
 @pytest.fixture(scope="function")
 def dummyItems(dummyGUI):

tests/test_gui/test_gui_doceditor.py

@@ -33,7 +33,7 @@ from PyQt5.QtWidgets import QAction, QMessageBox, QDialog
 from nw.gui.itemeditor import GuiItemEditor
 from nw.gui.doceditor import GuiDocEditor
 from nw.gui.projtree import GuiProjectTree
-from nw.constants import nwItemType, nwDocAction, nwWidget
+from nw.enum import nwItemType, nwDocAction, nwWidget
 
 keyDelay = 2
 typeDelay = 1

tests/test_gui/test_gui_docviewer.py

@@ -26,7 +26,7 @@ from PyQt5.QtCore import Qt, QUrl
 from PyQt5.QtGui import QTextCursor
 from PyQt5.QtWidgets import qApp, QAction, QMessageBox
 
-from nw.constants import nwDocAction
+from nw.enum import nwDocAction
 
 keyDelay = 2
 typeDelay = 1

tests/test_gui/test_gui_itemeditor.py

@@ -29,7 +29,7 @@ from tools import cmpFiles, getGuiItem
 from PyQt5.QtWidgets import QAction, QMessageBox
 
 from nw.gui import GuiItemEditor, GuiProjectTree
-from nw.constants import nwItemLayout
+from nw.enum import nwItemLayout
 
 keyDelay = 2
 typeDelay = 1

tests/test_gui/test_gui_mainmenu.py

@@ -28,9 +28,8 @@ from PyQt5.QtGui import QTextCursor, QTextBlock
 from PyQt5.QtWidgets import QAction, QFileDialog, QMessageBox
 
 from nw.gui.doceditor import GuiDocEditor
-from nw.constants import (
+from nw.enum import nwDocAction, nwDocInsert, nwWidget
-    nwUnicode, nwDocAction, nwDocInsert, nwKeyWords, nwWidget
+from nw.constants import nwKeyWords, nwUnicode
-)
 
 keyDelay = 2
 typeDelay = 1

tests/test_gui/test_gui_outline.py

@@ -25,7 +25,7 @@ import pytest
 from PyQt5.QtCore import Qt, QPoint
 from PyQt5.QtWidgets import QAction, QTreeWidgetItem, QMessageBox
 
-from nw.constants import nwOutline
+from nw.enum import nwOutline
 
 keyDelay = 2
 typeDelay = 1

tests/test_gui/test_gui_projtree.py

@@ -30,7 +30,7 @@ from PyQt5.QtWidgets import QAction, QMessageBox
 
 from nw.guimain import GuiMain
 from nw.gui.projtree import GuiProjectTree
-from nw.constants import nwItemType, nwItemClass
+from nw.enum import nwItemType, nwItemClass
 
 @pytest.mark.gui
 def testGuiProjTree_TreeItems(qtbot, caplog, monkeypatch, nwGUI, nwMinimal):

tests/test_gui/test_gui_projwizard.py

@@ -30,7 +30,7 @@ from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QFileDialog, QWizard, QMessageBox
 
 from nw.gui import GuiProjectWizard
-from nw.constants import nwItemClass
+from nw.enum import nwItemClass
 from nw.gui.projwizard import (
     ProjWizardIntroPage, ProjWizardFolderPage, ProjWizardPopulatePage,
     ProjWizardCustomPage, ProjWizardFinalPage