Move tools source files to their own folder

tests/test_tools/test_tools_build.py

@@ -29,14 +29,14 @@ from tools import cmpFiles, getGuiItem
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QAction, QMessageBox, QFileDialog
 
-from nw.gui import GuiBuildNovel
+from nw.tools import GuiBuildNovel
 
 keyDelay = 2
 typeDelay = 1
 stepDelay = 20
 
 @pytest.mark.gui
-def testGuiBuild_Tool(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir):
+def testToolBuild_Main(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir):
     """Test the build tool.
     """
     # Block message box
@@ -251,4 +251,4 @@ def testGuiBuild_Tool(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir):
 
     # qtbot.stopForInteraction()
 
-# END Test testGuiBuild_Tool
+# END Test testToolBuild_Main

tests/test_tools/test_tools_projwizard.py

@@ -29,11 +29,10 @@ from tools import getGuiItem
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QFileDialog, QWizard, QMessageBox
 
-from nw.gui import GuiProjectWizard
 from nw.enum import nwItemClass
-from nw.gui.projwizard import (
-    ProjWizardIntroPage, ProjWizardFolderPage, ProjWizardPopulatePage,
-    ProjWizardCustomPage, ProjWizardFinalPage
+from nw.tools.projwizard import (
+    GuiProjectWizard, ProjWizardIntroPage, ProjWizardFolderPage,
+    ProjWizardPopulatePage, ProjWizardCustomPage, ProjWizardFinalPage
 )
 
 keyDelay = 2
@@ -41,7 +40,7 @@ typeDelay = 1
 stepDelay = 20
 
 @pytest.mark.gui
-def testGuiProjectWizard_Main(qtbot, monkeypatch, nwGUI, nwMinimal):
+def testToolProjectWizard_Main(qtbot, monkeypatch, nwGUI, nwMinimal):
     """Test the new project wizard.
     """
     # Block message box
@@ -227,4 +226,4 @@ def testGuiProjectWizard_Main(qtbot, monkeypatch, nwGUI, nwMinimal):
 
     # qtbot.stopForInteraction()
 
-# END Test testGuiProjectWizard_Main
+# END Test testToolProjectWizard_Main

tests/test_tools/test_tools_writingstats.py

@@ -30,7 +30,7 @@ from dummy import causeOSError
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QAction, QFileDialog, QMessageBox
 
-from nw.gui import GuiWritingStats
+from nw.tools import GuiWritingStats
 from nw.constants import nwFiles
 
 keyDelay = 2
@@ -38,7 +38,7 @@ typeDelay = 1
 stepDelay = 20
 
 @pytest.mark.gui
-def testGuiWritingStats_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj):
+def testToolWritingStats_Main(qtbot, monkeypatch, nwGUI, fncDir, fncProj):
     """Test the full writing stats tool.
     """
     # Block message box
@@ -428,4 +428,4 @@ def testGuiWritingStats_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj):
     assert nwGUI.closeProject()
     qtbot.wait(stepDelay)
 
-# END Test testGuiWritingStats_Dialog
+# END Test testToolWritingStats_Main