Changed the way creating new, and closing projects is done to make it more roubust

tests/reference/gui/0_nwProject.nwx

@@ -0,0 +1,73 @@
+<?xml version='1.0' encoding='utf-8'?>
+<novelWriterXML appVersion="0.1.3" fileVersion="1.0" timeStamp="2019-05-23 23:02:29">
+  <project>
+    <name></name>
+    <title></title>
+  </project>
+  <settings>
+    <spellCheck>False</spellCheck>
+    <lastEdited>None</lastEdited>
+    <lastViewed>None</lastViewed>
+    <status>
+      <entry blue="100" green="100" red="100">New</entry>
+      <entry blue="0" green="50" red="200">Note</entry>
+      <entry blue="0" green="150" red="200">Draft</entry>
+      <entry blue="0" green="200" red="50">Finished</entry>
+    </status>
+    <importance>
+      <entry blue="100" green="100" red="100">New</entry>
+      <entry blue="0" green="50" red="200">Minor</entry>
+      <entry blue="0" green="150" red="200">Major</entry>
+      <entry blue="0" green="200" red="50">Main</entry>
+    </importance>
+  </settings>
+  <content count="6">
+    <item handle="73475cb40a568" order="0" parent="None">
+      <name>Novel</name>
+      <type>ROOT</type>
+      <class>NOVEL</class>
+      <status>New</status>
+      <expanded>False</expanded>
+    </item>
+    <item handle="25fc0e7096fc6" order="0" parent="73475cb40a568">
+      <name>New Chapter</name>
+      <type>FOLDER</type>
+      <class>NOVEL</class>
+      <status>New</status>
+      <expanded>False</expanded>
+    </item>
+    <item handle="31489056e0916" order="0" parent="25fc0e7096fc6">
+      <name>New Scene</name>
+      <type>FILE</type>
+      <class>NOVEL</class>
+      <status>New</status>
+      <expanded>False</expanded>
+      <layout>SCENE</layout>
+      <charCount>0</charCount>
+      <wordCount>0</wordCount>
+      <paraCount>0</paraCount>
+      <cursorPos>0</cursorPos>
+    </item>
+    <item handle="44cb730c42048" order="1" parent="None">
+      <name>Characters</name>
+      <type>ROOT</type>
+      <class>CHARACTER</class>
+      <status>New</status>
+      <expanded>False</expanded>
+    </item>
+    <item handle="71ee45a3c0db9" order="2" parent="None">
+      <name>Plot</name>
+      <type>ROOT</type>
+      <class>PLOT</class>
+      <status>New</status>
+      <expanded>False</expanded>
+    </item>
+    <item handle="811786ad1ae74" order="3" parent="None">
+      <name>World</name>
+      <type>ROOT</type>
+      <class>WORLD</class>
+      <status>New</status>
+      <expanded>False</expanded>
+    </item>
+  </content>
+</novelWriterXML>

tests/test_gui.py

@@ -23,16 +23,50 @@ def testMainWindows(qtbot, nwTempGUI, nwRef):
     qtbot.waitForWindowShown(nwGUI)
     qtbot.wait(stepDelay)
 
-    # Create new, save, open project
+    # Create new, save, close project
     nwGUI.theProject.handleSeed = 42
-    assert nwGUI.theProject.setProjectPath(nwTempGUI)
-    assert nwGUI.newProject()
-    assert nwGUI.theProject.setProjectPath(nwTempGUI)
+    assert nwGUI.newProject(nwTempGUI, True)
     assert nwGUI.saveProject()
+    assert nwGUI.closeProject(True)
+
+    assert len(nwGUI.theProject.projTree) == 0
+    assert len(nwGUI.theProject.treeOrder) == 0
+    assert len(nwGUI.theProject.treeRoots) == 0
+    assert nwGUI.theProject.trashRoot is None
+    assert nwGUI.theProject.projPath is None
+    assert nwGUI.theProject.projMeta is None
+    assert nwGUI.theProject.projCache is None
+    assert nwGUI.theProject.projFile == "nwProject.nwx"
+    assert nwGUI.theProject.projName == ""
+    assert nwGUI.theProject.bookTitle == ""
+    assert len(nwGUI.theProject.bookAuthors) == 0
+    assert nwGUI.theProject.spellCheck == False
+
+    # Check the files
+    projFile = path.join(nwTempGUI,"nwProject.nwx")
+    assert cmpFiles(projFile, path.join(nwRef,"gui","0_nwProject.nwx"), [2])
     qtbot.wait(stepDelay)
+
+    # qtbot.stopForInteraction()
+
+    # Re-open project
     assert nwGUI.openProject(nwTempGUI)
     qtbot.wait(stepDelay)
 
+    # Check that we loaded the data
+    assert len(nwGUI.theProject.projTree) == 6
+    assert len(nwGUI.theProject.treeOrder) == 6
+    assert len(nwGUI.theProject.treeRoots) == 4
+    assert nwGUI.theProject.trashRoot is None
+    assert nwGUI.theProject.projPath == nwTempGUI
+    assert nwGUI.theProject.projMeta == path.join(nwTempGUI,"meta")
+    assert nwGUI.theProject.projCache == path.join(nwTempGUI,"cache")
+    assert nwGUI.theProject.projFile == "nwProject.nwx"
+    assert nwGUI.theProject.projName == ""
+    assert nwGUI.theProject.bookTitle == ""
+    assert len(nwGUI.theProject.bookAuthors) == 0
+    assert nwGUI.theProject.spellCheck == False
+
     # Check that tree items have been created
     assert nwGUI.treeView._getTreeItem("73475cb40a568") is not None
     assert nwGUI.treeView._getTreeItem("25fc0e7096fc6") is not None
@@ -131,9 +165,7 @@ def testProjectEditor(qtbot, nwTempGUI, nwRef):
 
     # Create new, save, open project
     nwGUI.theProject.handleSeed = 42
-    assert nwGUI.theProject.setProjectPath(nwTempGUI)
-    assert nwGUI.newProject()
-    assert nwGUI.theProject.setProjectPath(nwTempGUI)
+    assert nwGUI.newProject(nwTempGUI, True)
 
     projEdit = GuiProjectEditor(nwGUI, nwGUI.theProject)
     qtbot.addWidget(projEdit)
@@ -194,9 +226,7 @@ def testItemEditor(qtbot, nwTempGUI, nwRef):
 
     # Create new, save, open project
     nwGUI.theProject.handleSeed = 42
-    assert nwGUI.theProject.setProjectPath(nwTempGUI)
-    assert nwGUI.newProject()
-    assert nwGUI.theProject.setProjectPath(nwTempGUI)
+    assert nwGUI.newProject(nwTempGUI, True)
 
     itemEdit = GuiItemEditor(nwGUI, nwGUI.theProject, "31489056e0916")
     qtbot.addWidget(itemEdit)