From 3c21a39ceebc8b418485b97811363bc30f25ac03 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 26 Sep 2020 13:49:08 +0200 Subject: [PATCH] Extended build tool test --- nw/gui/build.py | 4 +- tests/reference/build/3H_LoremIpsum.json | 71 +++++++++++ tests/reference/build/3M_LoremIpsum.json | 150 +++++++++++++++++++++++ tests/test_dialogs.py | 49 +++++++- 4 files changed, 269 insertions(+), 5 deletions(-) create mode 100644 tests/reference/build/3H_LoremIpsum.json create mode 100644 tests/reference/build/3M_LoremIpsum.json diff --git a/nw/gui/build.py b/nw/gui/build.py index ad2c3248..52b32ddb 100644 --- a/nw/gui/build.py +++ b/nw/gui/build.py @@ -468,7 +468,7 @@ class GuiBuildNovel(QDialog): self.buildProgress.setMaximum(len(self.theProject.projTree)) self.buildProgress.setValue(0) - tStart = time() + tStart = int(time()) self.htmlText = [] self.htmlStyle = [] @@ -511,7 +511,7 @@ class GuiBuildNovel(QDialog): # Update progress bar, also for skipped items self.buildProgress.setValue(nItt+1) - tEnd = time() + tEnd = int(time()) logger.debug("Built project in %.3f ms" % (1000*(tEnd-tStart))) self.htmlStyle = makeHtml.getStyleSheet() self.buildTime = tEnd diff --git a/tests/reference/build/3H_LoremIpsum.json b/tests/reference/build/3H_LoremIpsum.json new file mode 100644 index 00000000..98c6aecc --- /dev/null +++ b/tests/reference/build/3H_LoremIpsum.json @@ -0,0 +1,71 @@ +{ + "meta": { + "workingTitle": "Lorem Ipsum", + "novelTitle": "Lorem Ipsum", + "authors": [ + "lipsum.com" + ], + "buildTime": 1601120680 + }, + "text": { + "css": [ + "p {text-align: justify;}", + "h1, h2 {color: rgb(66, 113, 174);}", + "h3, h4 {color: rgb(50, 50, 50);}", + "h1, h2, h3, h4 {page-break-after: avoid;}", + "a {color: rgb(66, 113, 174);}", + ".title {font-size: 2.5em;}", + ".tags {color: rgb(245, 135, 31); font-weight: bold;}", + ".break {text-align: left;}", + ".sep {text-align: center; margin-top: 1em; margin-bottom: 1em;}", + ".skip {margin-top: 1em; margin-bottom: 1em;}", + ".synopsis {font-style: italic;}", + ".comment {font-style: italic; color: rgb(100, 100, 100);}" + ], + "html": [ + [ + "

Lorem Ipsum

" + ], + [ + "" + ], + [ + "

Prologue

", + "

Synopsis: Explanation from the lipsum.com website.

" + ], + [ + "

Act One

" + ], + [ + "

Chapter One: Chapter One

", + "
Point of View: Bod
Plot: Main
Locations: Europe

Synopsis: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.

" + ], + [ + "

Scene 1: Scene One

", + "
Point of View: Bod
Plot: Main
Locations: Europe

Synopsis: Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.

", + "

Section: Scene One, Section Two

" + ], + [ + "

Scene 2: Scene Two

", + "
Point of View: Bod
Plot: Main
Locations: Europe

Synopsis: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci.

", + "

Section: Scene Two, Section Two

" + ], + [ + "

Chapter Two: Chapter Two

", + "
Point of View: Bod
Plot: Main
Locations: Europe

Synopsis: Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.

" + ], + [ + "

Scene 3: Scene Three

", + "
Point of View: Bod
Plot: Main
Locations: Europe

Synopsis: Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.

" + ], + [ + "

Scene 4: Scene Four

", + "
Point of View: Bod
Plot: Main
Locations: Europe

Synopsis: Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.

" + ], + [ + "

Scene 5: Scene Five

", + "
Point of View: Bod
Plot: Main
Locations: Europe

Synopsis: Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

" + ] + ] + } +} \ No newline at end of file diff --git a/tests/reference/build/3M_LoremIpsum.json b/tests/reference/build/3M_LoremIpsum.json new file mode 100644 index 00000000..9c357d54 --- /dev/null +++ b/tests/reference/build/3M_LoremIpsum.json @@ -0,0 +1,150 @@ +{ + "meta": { + "workingTitle": "Lorem Ipsum", + "novelTitle": "Lorem Ipsum", + "authors": [ + "lipsum.com" + ], + "buildTime": 1601120788 + }, + "text": { + "nwd": [ + [ + "# Lorem Ipsum", + "", + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "## Prologue", + "", + "% Synopsis:Explanation from the lipsum.com website.", + "", + "", + "" + ], + [ + "# Act One", + "", + "", + "" + ], + [ + "## Chapter One", + "", + "@pov: Bod", + "@plot: Main", + "@location: Europe", + "", + "% Synopsis: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.", + "", + "", + "" + ], + [ + "### Scene One", + "", + "@pov: Bod", + "@plot: Main", + "@location: Europe", + "", + "% Synopsis: Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.", + "", + "", + "", + "#### Scene One, Section Two", + "", + "", + "", + "" + ], + [ + "### Scene Two", + "", + "@pov: Bod", + "@plot: Main", + "@location: Europe", + "", + "% Synopsis: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. ", + "", + "", + "", + "", + "#### Scene Two, Section Two", + "", + "", + "", + "", + "" + ], + [ + "## Chapter Two", + "", + "@pov: Bod", + "@plot: Main", + "@location: Europe", + "", + "% Synopsis: Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.", + "", + "", + "" + ], + [ + "### Scene Three", + "", + "@pov: Bod", + "@plot: Main", + "@location: Europe", + "", + "% Synopsis: Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.", + "", + "", + "", + "", + "", + "" + ], + [ + "### Scene Four", + "", + "@pov: Bod", + "@plot: Main", + "@location: Europe", + "", + "% Synopsis: Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.", + "", + "", + "", + "", + "", + "", + "", + "" + ], + [ + "### Scene Five", + "", + "@pov: Bod", + "@plot: Main", + "@location: Europe", + "", + "% Synopsis: Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.", + "", + "", + "", + "", + "", + "", + "" + ] + ] + } +} \ No newline at end of file diff --git a/tests/test_dialogs.py b/tests/test_dialogs.py index 55ba5bf1..f39700de 100644 --- a/tests/test_dialogs.py +++ b/tests/test_dialogs.py @@ -440,23 +440,66 @@ def testBuildTool(qtbot, nwTempBuild, nwLipsum, nwRef, nwTemp): qtbot.mouseClick(nwBuild.buildNovel, Qt.LeftButton) + # Save files that can be compared assert nwBuild._saveDocument(nwBuild.FMT_NWD) - assert nwBuild._saveDocument(nwBuild.FMT_HTM) - projFile = path.join(nwLipsum, "Lorem Ipsum.nwd") testFile = path.join(nwTempBuild, "3_LoremIpsum.nwd") refFile = path.join(nwRef, "build", "3_LoremIpsum.nwd") copyfile(projFile, testFile) assert cmpFiles(testFile, refFile) + assert nwBuild._saveDocument(nwBuild.FMT_HTM) projFile = path.join(nwLipsum, "Lorem Ipsum.htm") testFile = path.join(nwTempBuild, "3_LoremIpsum.htm") refFile = path.join(nwRef, "build", "3_LoremIpsum.htm") copyfile(projFile, testFile) assert cmpFiles(testFile, refFile) - # qtbot.stopForInteraction() + # Check the JSON files too at this stage + assert nwBuild._saveDocument(nwBuild.FMT_JSON_H) + projFile = path.join(nwLipsum, "Lorem Ipsum.json") + testFile = path.join(nwTempBuild, "3H_LoremIpsum.json") + refFile = path.join(nwRef, "build", "3H_LoremIpsum.json") + copyfile(projFile, testFile) + assert cmpFiles(testFile, refFile, [8]) + + assert nwBuild._saveDocument(nwBuild.FMT_JSON_M) + projFile = path.join(nwLipsum, "Lorem Ipsum.json") + testFile = path.join(nwTempBuild, "3M_LoremIpsum.json") + refFile = path.join(nwRef, "build", "3M_LoremIpsum.json") + copyfile(projFile, testFile) + assert cmpFiles(testFile, refFile, [8]) + + # Save other file types handled by Qt + # We assume the export itself by the Qt library works, so we just + # check that novelWriter successfully writes the files. + assert nwBuild._saveDocument(nwBuild.FMT_ODT) + assert nwBuild._saveDocument(nwBuild.FMT_PDF) + assert nwBuild._saveDocument(nwBuild.FMT_MD) + assert nwBuild._saveDocument(nwBuild.FMT_TXT) + assert path.isfile(path.join(nwLipsum, "Lorem Ipsum.odt")) + assert path.isfile(path.join(nwLipsum, "Lorem Ipsum.pdf")) + assert path.isfile(path.join(nwLipsum, "Lorem Ipsum.md")) + assert path.isfile(path.join(nwLipsum, "Lorem Ipsum.txt")) + + # Close the build tool + htmlText = nwBuild.htmlText + htmlStyle = nwBuild.htmlStyle + nwdText = nwBuild.nwdText + buildTime = nwBuild.buildTime nwBuild._doClose() + + # Re-open build dialog from cahce + nwBuild = GuiBuildNovel(nwGUI, nwGUI.theProject) + + assert nwBuild.htmlText == htmlText + assert nwBuild.htmlStyle == htmlStyle + assert nwBuild.nwdText == nwdText + assert nwBuild.buildTime == buildTime + + nwBuild._doClose() + + # qtbot.stopForInteraction() nwGUI.closeMain() @pytest.mark.gui