From 7a3c33fde3871a13ab54602845806f6088511865 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 30 Jan 2021 18:54:30 +0100 Subject: [PATCH] Fix tests --- sample/content/636b6aa9b697b.nwd | 1 + .../guiEditor_Main_Final_031b4af5197ec.nwd | 1 + .../guiEditor_Main_Final_0e17daca5f3e1.nwd | 1 + .../guiEditor_Main_Final_1a6562590ef19.nwd | 1 + .../guiEditor_Main_Final_41cfc0d1f2d12.nwd | 1 + tests/reference/guiMerge_73475cb40a568.nwd | 1 + tests/reference/guiSplit_031b4af5197ec.nwd | 1 + tests/reference/guiSplit_25fc0e7096fc6.nwd | 1 + tests/reference/guiSplit_2858dcd1057d3.nwd | 1 + tests/reference/guiSplit_2fca346db6561.nwd | 1 + tests/reference/guiSplit_31489056e0916.nwd | 1 + tests/reference/guiSplit_41cfc0d1f2d12.nwd | 1 + tests/reference/guiSplit_98010bd9270f9.nwd | 1 + tests/test_core/test_core_document.py | 6 ++++++ tests/test_gui/test_gui_doceditor.py | 14 ++++++++----- tests/test_gui/test_gui_mergesplit.py | 20 +++++++++---------- 16 files changed, 38 insertions(+), 15 deletions(-) diff --git a/sample/content/636b6aa9b697b.nwd b/sample/content/636b6aa9b697b.nwd index be611dce..916d98df 100644 --- a/sample/content/636b6aa9b697b.nwd +++ b/sample/content/636b6aa9b697b.nwd @@ -1,6 +1,7 @@ %%~name: Making a Scene %%~path: e7ded148d6e4a/636b6aa9b697b %%~kind: NOVEL/SCENE +%%~time: 2021-01-30 18:30:48 ### Making a Scene @pov: Jane diff --git a/tests/reference/guiEditor_Main_Final_031b4af5197ec.nwd b/tests/reference/guiEditor_Main_Final_031b4af5197ec.nwd index acb36501..74cf27b3 100644 --- a/tests/reference/guiEditor_Main_Final_031b4af5197ec.nwd +++ b/tests/reference/guiEditor_Main_Final_031b4af5197ec.nwd @@ -1,6 +1,7 @@ %%~name: New File %%~path: 44cb730c42048/031b4af5197ec %%~kind: PLOT/NOTE +%%~time: 2021-01-30 18:49:59 # Main Plot @tag: MainPlot diff --git a/tests/reference/guiEditor_Main_Final_0e17daca5f3e1.nwd b/tests/reference/guiEditor_Main_Final_0e17daca5f3e1.nwd index c77c3cd6..ef7ba417 100644 --- a/tests/reference/guiEditor_Main_Final_0e17daca5f3e1.nwd +++ b/tests/reference/guiEditor_Main_Final_0e17daca5f3e1.nwd @@ -1,6 +1,7 @@ %%~name: New Scene %%~path: 31489056e0916/0e17daca5f3e1 %%~kind: NOVEL/BOOK +%%~time: 2021-01-30 18:51:35 # Novel ## Chapter diff --git a/tests/reference/guiEditor_Main_Final_1a6562590ef19.nwd b/tests/reference/guiEditor_Main_Final_1a6562590ef19.nwd index 9a3ca0a9..7199f069 100644 --- a/tests/reference/guiEditor_Main_Final_1a6562590ef19.nwd +++ b/tests/reference/guiEditor_Main_Final_1a6562590ef19.nwd @@ -1,6 +1,7 @@ %%~name: New File %%~path: 71ee45a3c0db9/1a6562590ef19 %%~kind: CHARACTER/NOTE +%%~time: 2021-01-30 18:51:04 # Jane Doe @tag: Jane diff --git a/tests/reference/guiEditor_Main_Final_41cfc0d1f2d12.nwd b/tests/reference/guiEditor_Main_Final_41cfc0d1f2d12.nwd index 8e8cb037..d67575a5 100644 --- a/tests/reference/guiEditor_Main_Final_41cfc0d1f2d12.nwd +++ b/tests/reference/guiEditor_Main_Final_41cfc0d1f2d12.nwd @@ -1,6 +1,7 @@ %%~name: New File %%~path: 811786ad1ae74/41cfc0d1f2d12 %%~kind: WORLD/NOTE +%%~time: 2021-01-30 18:51:53 # Main Location @tag: Home diff --git a/tests/reference/guiMerge_73475cb40a568.nwd b/tests/reference/guiMerge_73475cb40a568.nwd index 5a903143..38a094d6 100644 --- a/tests/reference/guiMerge_73475cb40a568.nwd +++ b/tests/reference/guiMerge_73475cb40a568.nwd @@ -1,6 +1,7 @@ %%~name: Chapter One %%~path: b3643d0f92e32/73475cb40a568 %%~kind: NOVEL/SCENE +%%~time: 2021-01-30 18:39:07 ## Chapter One @pov: Bod diff --git a/tests/reference/guiSplit_031b4af5197ec.nwd b/tests/reference/guiSplit_031b4af5197ec.nwd index cbaf3205..bd819978 100644 --- a/tests/reference/guiSplit_031b4af5197ec.nwd +++ b/tests/reference/guiSplit_031b4af5197ec.nwd @@ -1,6 +1,7 @@ %%~name: Scene One %%~path: 0e17daca5f3e1/031b4af5197ec %%~kind: NOVEL/SCENE +%%~time: 2021-01-30 18:42:30 ### Scene One @pov: Bod diff --git a/tests/reference/guiSplit_25fc0e7096fc6.nwd b/tests/reference/guiSplit_25fc0e7096fc6.nwd index 3247412b..e6d495ea 100644 --- a/tests/reference/guiSplit_25fc0e7096fc6.nwd +++ b/tests/reference/guiSplit_25fc0e7096fc6.nwd @@ -1,6 +1,7 @@ %%~name: Chapter One %%~path: 811786ad1ae74/25fc0e7096fc6 %%~kind: NOVEL/CHAPTER +%%~time: 2021-01-30 18:40:32 ## Chapter One @pov: Bod diff --git a/tests/reference/guiSplit_2858dcd1057d3.nwd b/tests/reference/guiSplit_2858dcd1057d3.nwd index c1e79bdf..64292037 100644 --- a/tests/reference/guiSplit_2858dcd1057d3.nwd +++ b/tests/reference/guiSplit_2858dcd1057d3.nwd @@ -1,6 +1,7 @@ %%~name: Scene Two %%~path: 0e17daca5f3e1/2858dcd1057d3 %%~kind: NOVEL/SCENE +%%~time: 2021-01-30 18:43:17 ### Scene Two @pov: Bod diff --git a/tests/reference/guiSplit_2fca346db6561.nwd b/tests/reference/guiSplit_2fca346db6561.nwd index c33e7901..f818dc02 100644 --- a/tests/reference/guiSplit_2fca346db6561.nwd +++ b/tests/reference/guiSplit_2fca346db6561.nwd @@ -1,6 +1,7 @@ %%~name: Scene Two, Section Two %%~path: 0e17daca5f3e1/2fca346db6561 %%~kind: NOVEL/SCENE +%%~time: 2021-01-30 18:43:30 #### Scene Two, Section Two Suspendisse potenti. Fusce tempus lorem nec laoreet suscipit. Fusce vulputate nisl ac diam tincidunt, nec malesuada quam pellentesque. Maecenas congue, tellus quis commodo rutrum, magna leo egestas arcu, quis suscipit ex risus id ligula. Suspendisse potenti. Morbi blandit lacus vitae laoreet vulputate. Donec vitae tellus eleifend, lobortis eros eu, tincidunt enim. Nullam et ullamcorper nisi. Vivamus tellus ex, lobortis quis rutrum ut, dapibus sit amet turpis. Phasellus pellentesque metus diam, commodo tristique ante commodo ac. Ut mollis ipsum nec diam blandit sollicitudin. Duis bibendum lacus nec commodo dapibus. Sed condimentum luctus ante, id ultricies urna varius nec. Nam convallis magna nec bibendum ultrices. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed auctor pharetra quam, vitae porta ex bibendum eu. diff --git a/tests/reference/guiSplit_31489056e0916.nwd b/tests/reference/guiSplit_31489056e0916.nwd index e494f6b9..9d770c6c 100644 --- a/tests/reference/guiSplit_31489056e0916.nwd +++ b/tests/reference/guiSplit_31489056e0916.nwd @@ -1,6 +1,7 @@ %%~name: Scene One %%~path: 811786ad1ae74/31489056e0916 %%~kind: NOVEL/SCENE +%%~time: 2021-01-30 18:41:22 ### Scene One @pov: Bod diff --git a/tests/reference/guiSplit_41cfc0d1f2d12.nwd b/tests/reference/guiSplit_41cfc0d1f2d12.nwd index 6f887f44..1c91f150 100644 --- a/tests/reference/guiSplit_41cfc0d1f2d12.nwd +++ b/tests/reference/guiSplit_41cfc0d1f2d12.nwd @@ -1,6 +1,7 @@ %%~name: Scene One, Section Two %%~path: 0e17daca5f3e1/41cfc0d1f2d12 %%~kind: NOVEL/SCENE +%%~time: 2021-01-30 18:43:04 #### Scene One, Section Two Integer vel libero ipsum. Donec varius aliquam libero, sit amet commodo urna hendrerit non. Nullam quis erat mollis nunc viverra volutpat tincidunt in odio. Nam vitae quam sem. Aliquam suscipit nulla non lorem pharetra semper. Ut suscipit erat eu ligula accumsan ultrices. Phasellus nisl tellus, placerat sed laoreet id, consectetur nec dolor. Sed fringilla ipsum id dapibus posuere. Aenean finibus pharetra tincidunt. Ut molestie malesuada nulla, id posuere lorem tincidunt eu. Aliquam tempor eros a est vulputate, scelerisque pulvinar ipsum fermentum. In hac habitasse platea dictumst. diff --git a/tests/reference/guiSplit_98010bd9270f9.nwd b/tests/reference/guiSplit_98010bd9270f9.nwd index 0725f6a5..451a4bb5 100644 --- a/tests/reference/guiSplit_98010bd9270f9.nwd +++ b/tests/reference/guiSplit_98010bd9270f9.nwd @@ -1,6 +1,7 @@ %%~name: Scene Two %%~path: 811786ad1ae74/98010bd9270f9 %%~kind: NOVEL/SCENE +%%~time: 2021-01-30 18:41:48 ### Scene Two @pov: Bod diff --git a/tests/test_core/test_core_document.py b/tests/test_core/test_core_document.py index bbfe658b..a84e6972 100644 --- a/tests/test_core/test_core_document.py +++ b/tests/test_core/test_core_document.py @@ -28,6 +28,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.common import formatTimeStamp @pytest.mark.core def testCoreDocument_LoadSave(monkeypatch, dummyGUI, nwMinimal): @@ -74,6 +75,7 @@ def testCoreDocument_LoadSave(monkeypatch, dummyGUI, nwMinimal): assert theDoc.saveDocument(theText) # Save again to ensure temp file and previous file is handled + monkeypatch.setattr("nw.core.document.time", lambda: 123.4) assert theDoc.saveDocument(theText) # Check file content @@ -83,9 +85,11 @@ def testCoreDocument_LoadSave(monkeypatch, dummyGUI, nwMinimal): "%%~name: New File\n" f"%%~path: a508bb932959c/{xHandle}\n" "%%~kind: NOVEL/SCENE\n" + f"%%~time: {formatTimeStamp(123.4)}\n" "### Test File\n\n" "Text ...\n\n" ) + monkeypatch.undo() # Force no meta data theDoc._theItem = None @@ -147,12 +151,14 @@ def testCoreDocument_Methods(monkeypatch, dummyGUI, nwMinimal): assert theLayout == nwItemLayout.SCENE # Add meta data garbage + monkeypatch.setattr("nw.core.document.time", lambda: 123.4) assert theDoc.saveDocument("%%~ stuff\n### Test File\n\nText ...\n\n") with open(docPath, mode="r", encoding="utf8") as inFile: assert inFile.read() == ( "%%~name: New Scene\n" f"%%~path: a6d311a93600a/{sHandle}\n" "%%~kind: NOVEL/SCENE\n" + f"%%~time: {formatTimeStamp(123.4)}\n" "%%~ stuff\n" "### Test File\n\n" "Text ...\n\n" diff --git a/tests/test_gui/test_gui_doceditor.py b/tests/test_gui/test_gui_doceditor.py index 6d0034c7..94931ce5 100644 --- a/tests/test_gui/test_gui_doceditor.py +++ b/tests/test_gui/test_gui_doceditor.py @@ -28,8 +28,9 @@ from tools import cmpFiles from PyQt5.QtCore import Qt from PyQt5.QtGui import QTextCursor -from PyQt5.QtWidgets import QAction, QMessageBox +from PyQt5.QtWidgets import QAction, QMessageBox, QDialog +from nw.gui.itemeditor import GuiItemEditor from nw.constants import nwItemType, nwDocAction keyDelay = 2 @@ -42,6 +43,9 @@ def testGuiEditor_Main(qtbot, monkeypatch, nwGUI, fncDir, fncProj, refDir, outDi """ # Block message box monkeypatch.setattr(QMessageBox, "question", lambda *args: QMessageBox.Yes) + monkeypatch.setattr(QMessageBox, "information", lambda *args: QMessageBox.Yes) + monkeypatch.setattr(GuiItemEditor, "exec_", lambda *args: None) + monkeypatch.setattr(GuiItemEditor, "result", lambda *args: QDialog.Accepted) # Create new, save, close project nwGUI.theProject.projTree.setSeed(42) @@ -321,25 +325,25 @@ def testGuiEditor_Main(qtbot, monkeypatch, nwGUI, fncDir, fncProj, refDir, outDi testFile = os.path.join(outDir, "guiEditor_Main_Final_031b4af5197ec.nwd") compFile = os.path.join(refDir, "guiEditor_Main_Final_031b4af5197ec.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) projFile = os.path.join(fncProj, "content", "1a6562590ef19.nwd") testFile = os.path.join(outDir, "guiEditor_Main_Final_1a6562590ef19.nwd") compFile = os.path.join(refDir, "guiEditor_Main_Final_1a6562590ef19.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) projFile = os.path.join(fncProj, "content", "0e17daca5f3e1.nwd") testFile = os.path.join(outDir, "guiEditor_Main_Final_0e17daca5f3e1.nwd") compFile = os.path.join(refDir, "guiEditor_Main_Final_0e17daca5f3e1.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) projFile = os.path.join(fncProj, "content", "41cfc0d1f2d12.nwd") testFile = os.path.join(outDir, "guiEditor_Main_Final_41cfc0d1f2d12.nwd") compFile = os.path.join(refDir, "guiEditor_Main_Final_41cfc0d1f2d12.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) # qtbot.stopForInteraction() diff --git a/tests/test_gui/test_gui_mergesplit.py b/tests/test_gui/test_gui_mergesplit.py index b2d0135e..d10c2394 100644 --- a/tests/test_gui/test_gui_mergesplit.py +++ b/tests/test_gui/test_gui_mergesplit.py @@ -66,7 +66,7 @@ def testGuiMergeSplit_Tools(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir) testFile = os.path.join(outDir, "guiMerge_73475cb40a568.nwd") compFile = os.path.join(refDir, "guiMerge_73475cb40a568.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) # Split By Chapter assert nwGUI.treeView.setSelectedHandle("73475cb40a568") @@ -92,7 +92,7 @@ def testGuiMergeSplit_Tools(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir) testFile = os.path.join(outDir, "guiMerge_71ee45a3c0db9.nwd") compFile = os.path.join(refDir, "guiMerge_73475cb40a568.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile, [1, 2, 3]) + assert cmpFiles(testFile, compFile, [1, 2, 3, 4]) # Split By Scene assert nwGUI.treeView.setSelectedHandle("73475cb40a568") @@ -116,19 +116,19 @@ def testGuiMergeSplit_Tools(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir) testFile = os.path.join(outDir, "guiSplit_25fc0e7096fc6.nwd") compFile = os.path.join(refDir, "guiSplit_25fc0e7096fc6.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) projFile = os.path.join(nwLipsum, "content", "31489056e0916.nwd") testFile = os.path.join(outDir, "guiSplit_31489056e0916.nwd") compFile = os.path.join(refDir, "guiSplit_31489056e0916.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) projFile = os.path.join(nwLipsum, "content", "98010bd9270f9.nwd") testFile = os.path.join(outDir, "guiSplit_98010bd9270f9.nwd") compFile = os.path.join(refDir, "guiSplit_98010bd9270f9.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) # Split By Section assert nwGUI.treeView.setSelectedHandle("73475cb40a568") @@ -154,31 +154,31 @@ def testGuiMergeSplit_Tools(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir) testFile = os.path.join(outDir, "guiSplit_1a6562590ef19.nwd") compFile = os.path.join(refDir, "guiSplit_25fc0e7096fc6.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile, [1, 2, 3]) + assert cmpFiles(testFile, compFile, [1, 2, 3, 4]) projFile = os.path.join(nwLipsum, "content", "031b4af5197ec.nwd") testFile = os.path.join(outDir, "guiSplit_031b4af5197ec.nwd") compFile = os.path.join(refDir, "guiSplit_031b4af5197ec.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) projFile = os.path.join(nwLipsum, "content", "41cfc0d1f2d12.nwd") testFile = os.path.join(outDir, "guiSplit_41cfc0d1f2d12.nwd") compFile = os.path.join(refDir, "guiSplit_41cfc0d1f2d12.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) projFile = os.path.join(nwLipsum, "content", "2858dcd1057d3.nwd") testFile = os.path.join(outDir, "guiSplit_2858dcd1057d3.nwd") compFile = os.path.join(refDir, "guiSplit_2858dcd1057d3.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) projFile = os.path.join(nwLipsum, "content", "2fca346db6561.nwd") testFile = os.path.join(outDir, "guiSplit_2fca346db6561.nwd") compFile = os.path.join(refDir, "guiSplit_2fca346db6561.nwd") copyfile(projFile, testFile) - assert cmpFiles(testFile, compFile) + assert cmpFiles(testFile, compFile, [4]) # qtbot.stopForInteraction()