diff --git a/tests/reference/gui/0_nwProject.nwx b/tests/reference/gui/0_nwProject.nwx index d1a794e7..9ed7722a 100644 --- a/tests/reference/gui/0_nwProject.nwx +++ b/tests/reference/gui/0_nwProject.nwx @@ -1,5 +1,5 @@ - + New Project @@ -37,7 +37,7 @@ Main - + Novel ROOT @@ -46,13 +46,37 @@ False + Title Page + FILE + NOVEL + New + True + TITLE + 0 + 0 + 0 + 0 + + New Chapter FOLDER NOVEL New False - + + New Chapter + FILE + NOVEL + New + True + CHAPTER + 0 + 0 + 0 + 0 + + New Scene FILE NOVEL @@ -65,16 +89,16 @@ 0 - Characters + Plot ROOT - CHARACTER + PLOT New False - Plot + Characters ROOT - PLOT + CHARACTER New False diff --git a/tests/reference/gui/1_031b4af5197ec.nwd b/tests/reference/gui/1_031b4af5197ec.nwd new file mode 100644 index 00000000..9a330c9c --- /dev/null +++ b/tests/reference/gui/1_031b4af5197ec.nwd @@ -0,0 +1,6 @@ +%%~ 031b4af5197ec:44cb730c42048:PLOT:NOTE:New File +# Main Plot + +@tag: MainPlot + +This is a file detailing the main plot. diff --git a/tests/reference/gui/1_0e17daca5f3e1.nwd b/tests/reference/gui/1_0e17daca5f3e1.nwd index ecfbf8ff..f7723099 100644 --- a/tests/reference/gui/1_0e17daca5f3e1.nwd +++ b/tests/reference/gui/1_0e17daca5f3e1.nwd @@ -1,6 +1,23 @@ -%%~ 0e17daca5f3e1:71ee45a3c0db9:PLOT:NOTE:New File -# Main Plot +%%~ 0e17daca5f3e1:31489056e0916:73475cb40a568:NOVEL:SCENE:New Scene +# Novel -@tag: MainPlot +## Chapter + +@pov: Jane +@plot: MainPlot + +### Scene + +% How about a comment? +@pov: Jane +@plot: MainPlot +@location: Home + +#### Some Section + +@char: Jane + +This is a paragraph of dummy text. + +This is another paragraph of much longer dummy text. It is in fact very very dumb dummy text! We can also try replacing “quotes”, even single’s quotes are replaced. We can hyphen-ate, make dashes – and even longer dashes — if we want. Ellipsis? Not a problem either … -This is a file detailing the main plot. diff --git a/tests/reference/gui/1_1a6562590ef19.nwd b/tests/reference/gui/1_1a6562590ef19.nwd index 7c6d19a7..de40e292 100644 --- a/tests/reference/gui/1_1a6562590ef19.nwd +++ b/tests/reference/gui/1_1a6562590ef19.nwd @@ -1,6 +1,6 @@ -%%~ 1a6562590ef19:811786ad1ae74:WORLD:NOTE:New File -# Main Location +%%~ 1a6562590ef19:71ee45a3c0db9:CHARACTER:NOTE:New File +# Jane Doe -@tag: Home +@tag: Jane -This is a file describing Jane’s home. +This is a file about Jane. diff --git a/tests/reference/gui/1_31489056e0916.nwd b/tests/reference/gui/1_31489056e0916.nwd deleted file mode 100644 index 0a238e45..00000000 --- a/tests/reference/gui/1_31489056e0916.nwd +++ /dev/null @@ -1,23 +0,0 @@ -%%~ 31489056e0916:25fc0e7096fc6:73475cb40a568:NOVEL:SCENE:New Scene -# Novel - -## Chapter - -@pov: Jane -@plot: MainPlot - -### Scene - -% How about a comment? -@pov: Jane -@plot: MainPlot -@location: Home - -#### Some Section - -@char: Jane - -This is a paragraph of dummy text. - -This is another paragraph of much longer dummy text. It is in fact very very dumb dummy text! We can also try replacing “quotes”, even single’s quotes are replaced. We can hyphen-ate, make dashes – and even longer dashes — if we want. Ellipsis? Not a problem either … - diff --git a/tests/reference/gui/1_41cfc0d1f2d12.nwd b/tests/reference/gui/1_41cfc0d1f2d12.nwd new file mode 100644 index 00000000..e80cbd1b --- /dev/null +++ b/tests/reference/gui/1_41cfc0d1f2d12.nwd @@ -0,0 +1,6 @@ +%%~ 41cfc0d1f2d12:811786ad1ae74:WORLD:NOTE:New File +# Main Location + +@tag: Home + +This is a file describing Jane’s home. diff --git a/tests/reference/gui/1_98010bd9270f9.nwd b/tests/reference/gui/1_98010bd9270f9.nwd deleted file mode 100644 index 632f53cd..00000000 --- a/tests/reference/gui/1_98010bd9270f9.nwd +++ /dev/null @@ -1,6 +0,0 @@ -%%~ 98010bd9270f9:44cb730c42048:CHARACTER:NOTE:New File -# Jane Doe - -@tag: Jane - -This is a file about Jane. diff --git a/tests/reference/gui/1_nwProject.nwx b/tests/reference/gui/1_nwProject.nwx index e8a705b1..3dad289d 100644 --- a/tests/reference/gui/1_nwProject.nwx +++ b/tests/reference/gui/1_nwProject.nwx @@ -1,17 +1,17 @@ - + New Project - 5 + 4 1 - 11 + 13 True True True - 31489056e0916 + 0e17daca5f3e1 None 86 59 @@ -37,7 +37,7 @@ Main - + Novel ROOT @@ -46,13 +46,37 @@ True + Title Page + FILE + NOVEL + New + True + TITLE + 0 + 0 + 0 + 0 + + New Chapter FOLDER NOVEL New True - + + New Chapter + FILE + NOVEL + New + True + CHAPTER + 0 + 0 + 0 + 0 + + New Scene FILE NOVEL @@ -65,32 +89,13 @@ 465 - Characters - ROOT - CHARACTER - New - True - - - New File - FILE - CHARACTER - New - True - NOTE - 34 - 8 - 1 - 51 - - Plot ROOT PLOT New True - + New File FILE PLOT @@ -102,6 +107,25 @@ 1 69 + + Characters + ROOT + CHARACTER + New + True + + + New File + FILE + CHARACTER + New + True + NOTE + 34 + 8 + 1 + 51 + World ROOT @@ -109,7 +133,7 @@ New True - + New File FILE WORLD @@ -121,7 +145,7 @@ 1 68 - + Trash TRASH TRASH diff --git a/tests/reference/gui/2_nwProject.nwx b/tests/reference/gui/2_nwProject.nwx index 0815f9ad..dbeecf74 100644 --- a/tests/reference/gui/2_nwProject.nwx +++ b/tests/reference/gui/2_nwProject.nwx @@ -1,11 +1,11 @@ - + Project Name Project Title Jane Doe John Doh - 2 + 1 1 1 @@ -41,7 +41,7 @@ Main - + Novel ROOT @@ -50,13 +50,37 @@ False + Title Page + FILE + NOVEL + New + True + TITLE + 0 + 0 + 0 + 0 + + New Chapter FOLDER NOVEL New False - + + New Chapter + FILE + NOVEL + New + True + CHAPTER + 0 + 0 + 0 + 0 + + New Scene FILE NOVEL @@ -69,16 +93,16 @@ 0 - Characters + Plot ROOT - CHARACTER + PLOT New False - Plot + Characters ROOT - PLOT + CHARACTER New False diff --git a/tests/reference/gui/3_nwProject.nwx b/tests/reference/gui/3_nwProject.nwx index 8eeb4dca..92369f44 100644 --- a/tests/reference/gui/3_nwProject.nwx +++ b/tests/reference/gui/3_nwProject.nwx @@ -1,5 +1,5 @@ - + New Project @@ -11,7 +11,7 @@ True False True - 31489056e0916 + 0e17daca5f3e1 None 59 59 @@ -37,7 +37,7 @@ Main - + Novel ROOT @@ -46,13 +46,37 @@ False + Title Page + FILE + NOVEL + New + True + TITLE + 0 + 0 + 0 + 0 + + New Chapter FOLDER NOVEL New False - + + New Chapter + FILE + NOVEL + New + True + CHAPTER + 0 + 0 + 0 + 0 + + Just a Page FILE NOVEL @@ -65,16 +89,16 @@ 0 - Characters + Plot ROOT - CHARACTER + PLOT New False - Plot + Characters ROOT - PLOT + CHARACTER New False diff --git a/tests/test_gui.py b/tests/test_gui.py index d8e6628b..e282504a 100644 --- a/tests/test_gui.py +++ b/tests/test_gui.py @@ -55,8 +55,8 @@ def testMainWindows(qtbot, nwTempGUI, nwRef, nwTemp): qtbot.wait(stepDelay) # Check that we loaded the data - assert len(nwGUI.theProject.projTree) == 6 - assert len(nwGUI.theProject.projTree._treeOrder) == 6 + assert len(nwGUI.theProject.projTree) == 8 + assert len(nwGUI.theProject.projTree._treeOrder) == 8 assert len(nwGUI.theProject.projTree._treeRoots) == 4 assert nwGUI.theProject.projTree.trashRoot() is None assert nwGUI.theProject.projPath == nwTempGUI @@ -71,6 +71,8 @@ def testMainWindows(qtbot, nwTempGUI, nwRef, nwTemp): assert nwGUI.treeView._getTreeItem("73475cb40a568") is not None assert nwGUI.treeView._getTreeItem("25fc0e7096fc6") is not None assert nwGUI.treeView._getTreeItem("31489056e0916") is not None + assert nwGUI.treeView._getTreeItem("98010bd9270f9") is not None + assert nwGUI.treeView._getTreeItem("0e17daca5f3e1") is not None assert nwGUI.treeView._getTreeItem("44cb730c42048") is not None assert nwGUI.treeView._getTreeItem("71ee45a3c0db9") is not None assert nwGUI.treeView._getTreeItem("811786ad1ae74") is not None @@ -81,7 +83,7 @@ def testMainWindows(qtbot, nwTempGUI, nwRef, nwTemp): # Add a Character File nwGUI.setFocus(1) nwGUI.treeView.clearSelection() - nwGUI.treeView._getTreeItem("44cb730c42048").setSelected(True) + nwGUI.treeView._getTreeItem("71ee45a3c0db9").setSelected(True) nwGUI.treeView.newTreeItem(nwItemType.FILE, None) assert nwGUI.openSelectedItem() @@ -102,7 +104,7 @@ def testMainWindows(qtbot, nwTempGUI, nwRef, nwTemp): # Add a Plot File nwGUI.setFocus(1) nwGUI.treeView.clearSelection() - nwGUI.treeView._getTreeItem("71ee45a3c0db9").setSelected(True) + nwGUI.treeView._getTreeItem("44cb730c42048").setSelected(True) nwGUI.treeView.newTreeItem(nwItemType.FILE, None) assert nwGUI.openSelectedItem() @@ -150,8 +152,8 @@ def testMainWindows(qtbot, nwTempGUI, nwRef, nwTemp): nwGUI.setFocus(1) nwGUI.treeView.clearSelection() nwGUI.treeView._getTreeItem("73475cb40a568").setExpanded(True) - nwGUI.treeView._getTreeItem("25fc0e7096fc6").setExpanded(True) - nwGUI.treeView._getTreeItem("31489056e0916").setSelected(True) + nwGUI.treeView._getTreeItem("31489056e0916").setExpanded(True) + nwGUI.treeView._getTreeItem("0e17daca5f3e1").setSelected(True) assert nwGUI.openSelectedItem() # Type something into the document @@ -233,8 +235,8 @@ def testMainWindows(qtbot, nwTempGUI, nwRef, nwTemp): # Open and view the edited document nwGUI.setFocus(3) - assert nwGUI.openDocument("31489056e0916") - assert nwGUI.viewDocument("31489056e0916") + assert nwGUI.openDocument("0e17daca5f3e1") + assert nwGUI.viewDocument("0e17daca5f3e1") qtbot.wait(stepDelay) assert nwGUI.saveProject() assert nwGUI.closeDocViewer() @@ -243,23 +245,24 @@ def testMainWindows(qtbot, nwTempGUI, nwRef, nwTemp): # Check a Quick Create and Delete assert nwGUI.treeView.newTreeItem(nwItemType.FILE, None) newHandle = nwGUI.treeView.getSelectedHandle() - assert nwGUI.theProject.projTree["031b4af5197ec"] is not None + assert nwGUI.theProject.projTree["2858dcd1057d3"] is not None assert nwGUI.treeView.deleteItem() assert nwGUI.treeView.setSelectedHandle(newHandle) assert nwGUI.treeView.deleteItem() + assert nwGUI.theProject.projTree["2fca346db6561"] is not None # Trash assert nwGUI.saveProject() # Check the files refFile = path.join(nwTempGUI, "nwProject.nwx") assert cmpFiles(refFile, path.join(nwRef, "gui", "1_nwProject.nwx"), [2, 6, 7, 8]) - refFile = path.join(nwTempGUI, "content", "0e17daca5f3e1.nwd") - assert cmpFiles(refFile, path.join(nwRef, "gui", "1_0e17daca5f3e1.nwd")) - refFile = path.join(nwTempGUI, "content", "98010bd9270f9.nwd") - assert cmpFiles(refFile, path.join(nwRef, "gui", "1_98010bd9270f9.nwd")) - refFile = path.join(nwTempGUI, "content", "31489056e0916.nwd") - assert cmpFiles(refFile, path.join(nwRef, "gui", "1_31489056e0916.nwd")) + refFile = path.join(nwTempGUI, "content", "031b4af5197ec.nwd") + assert cmpFiles(refFile, path.join(nwRef, "gui", "1_031b4af5197ec.nwd")) refFile = path.join(nwTempGUI, "content", "1a6562590ef19.nwd") assert cmpFiles(refFile, path.join(nwRef, "gui", "1_1a6562590ef19.nwd")) + refFile = path.join(nwTempGUI, "content", "0e17daca5f3e1.nwd") + assert cmpFiles(refFile, path.join(nwRef, "gui", "1_0e17daca5f3e1.nwd")) + refFile = path.join(nwTempGUI, "content", "41cfc0d1f2d12.nwd") + assert cmpFiles(refFile, path.join(nwRef, "gui", "1_41cfc0d1f2d12.nwd")) nwGUI.closeMain() # qtbot.stopForInteraction() @@ -364,9 +367,9 @@ def testItemEditor(qtbot, nwTempGUI, nwRef, nwTemp): # Create new, save, open project nwGUI.theProject.projTree.setSeed(42) assert nwGUI.newProject({"projPath": nwTempGUI}, True) - assert nwGUI.openDocument("31489056e0916") + assert nwGUI.openDocument("0e17daca5f3e1") - itemEdit = GuiItemEditor(nwGUI, nwGUI.theProject, "31489056e0916") + itemEdit = GuiItemEditor(nwGUI, nwGUI.theProject, "0e17daca5f3e1") qtbot.addWidget(itemEdit) assert itemEdit.editName.text() == "New Scene" @@ -383,7 +386,7 @@ def testItemEditor(qtbot, nwTempGUI, nwRef, nwTemp): assert not itemEdit.editExport.isChecked() itemEdit._doSave() - itemEdit = GuiItemEditor(nwGUI, nwGUI.theProject, "31489056e0916") + itemEdit = GuiItemEditor(nwGUI, nwGUI.theProject, "0e17daca5f3e1") qtbot.addWidget(itemEdit) assert itemEdit.editName.text() == "Just a Page" assert itemEdit.editStatus.currentData() == "Note" @@ -391,7 +394,7 @@ def testItemEditor(qtbot, nwTempGUI, nwRef, nwTemp): itemEdit._doClose() # Check that the header is updated - nwGUI.docEditor.updateDocInfo("31489056e0916") + nwGUI.docEditor.updateDocInfo("0e17daca5f3e1") assert nwGUI.docEditor.docHeader.theTitle.text() == "Novel › New Chapter › Just a Page" assert not nwGUI.docEditor.setCursorLine("where?") assert nwGUI.docEditor.setCursorLine(2)