From cc32674b0fb8b5b1165e32a666fb5ffd5ae2a11d Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Wed, 22 May 2024 23:13:50 +0200
Subject: [PATCH] Update tests

---
 tests/reference/coreToOdt_SaveFlat_document.fodt     | 12 ++++++------
 tests/reference/coreToOdt_SaveFull_content.xml       |  2 +-
 tests/reference/coreToOdt_SaveFull_styles.xml        |  8 ++++----
 tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm |  2 +-
 .../reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json  |  6 +++---
 .../mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt     | 12 ++++++------
 tests/test_dialogs/test_dlg_preferences.py           |  4 ++--
 tests/test_tools/test_tools_manussettings.py         |  2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/reference/coreToOdt_SaveFlat_document.fodt b/tests/reference/coreToOdt_SaveFlat_document.fodt
index ceafb01c..cee2d9b5 100644
--- a/tests/reference/coreToOdt_SaveFlat_document.fodt
+++ b/tests/reference/coreToOdt_SaveFlat_document.fodt
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2024-05-22T17:02:41</meta:creation-date>
+    <meta:creation-date>2024-05-22T23:05:27</meta:creation-date>
     <meta:generator>novelWriter/2.5a4</meta:generator>
     <meta:initial-creator>Jane Smith</meta:initial-creator>
     <meta:editing-cycles>1234</meta:editing-cycles>
     <meta:editing-duration>P42DT12H34M56S</meta:editing-duration>
     <dc:title>Test Project</dc:title>
-    <dc:date>2024-05-22T17:02:41</dc:date>
+    <dc:date>2024-05-22T23:05:27</dc:date>
     <dc:creator>Jane Smith</dc:creator>
   </office:meta>
   <office:font-face-decls>
-    <style:font-face style:name="Liberation Serif" style:font-pitch="variable" style:font-weight="normal" />
+    <style:font-face style:name="Liberation Serif" style:font-pitch="variable" />
   </office:font-face-decls>
   <office:styles>
     <style:default-style style:family="paragraph">
       <style:paragraph-properties style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page" />
-      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-size="12pt" fo:language="nb" fo:country="NO" />
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-style="normal" fo:font-size="12pt" fo:language="nb" fo:country="NO" />
     </style:default-style>
     <style:style style:name="Standard" style:family="paragraph" style:class="text">
-      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-size="12pt" />
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-style="normal" fo:font-size="12pt" />
     </style:style>
     <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">
       <style:paragraph-properties fo:margin-top="0.247cm" fo:margin-bottom="0.212cm" fo:keep-with-next="always" />
-      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-size="14pt" />
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-style="normal" fo:font-size="14pt" />
     </style:style>
     <style:style style:name="Header_20_and_20_Footer" style:display-name="Header and Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra" />
     <style:style style:name="Text_20_body" style:family="paragraph" style:display-name="Text body" style:parent-style-name="Standard" style:class="text">
diff --git a/tests/reference/coreToOdt_SaveFull_content.xml b/tests/reference/coreToOdt_SaveFull_content.xml
index cbd651d2..0654b0f3 100644
--- a/tests/reference/coreToOdt_SaveFull_content.xml
+++ b/tests/reference/coreToOdt_SaveFull_content.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document-content xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.3">
   <office:font-face-decls>
-    <style:font-face style:name="Liberation Serif" style:font-pitch="variable" style:font-weight="normal" />
+    <style:font-face style:name="Liberation Serif" style:font-pitch="variable" />
   </office:font-face-decls>
   <office:automatic-styles>
     <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Heading_20_2">
diff --git a/tests/reference/coreToOdt_SaveFull_styles.xml b/tests/reference/coreToOdt_SaveFull_styles.xml
index ef297c8f..809732e0 100644
--- a/tests/reference/coreToOdt_SaveFull_styles.xml
+++ b/tests/reference/coreToOdt_SaveFull_styles.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document-styles xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.3">
   <office:font-face-decls>
-    <style:font-face style:name="Liberation Serif" style:font-pitch="variable" style:font-weight="normal" />
+    <style:font-face style:name="Liberation Serif" style:font-pitch="variable" />
   </office:font-face-decls>
   <office:styles>
     <style:default-style style:family="paragraph">
       <style:paragraph-properties style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page" />
-      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-size="12pt" fo:language="en" fo:country="GB" />
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-style="normal" fo:font-size="12pt" fo:language="en" fo:country="GB" />
     </style:default-style>
     <style:style style:name="Standard" style:family="paragraph" style:class="text">
-      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-size="12pt" />
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-style="normal" fo:font-size="12pt" />
     </style:style>
     <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">
       <style:paragraph-properties fo:margin-top="0.247cm" fo:margin-bottom="0.212cm" fo:keep-with-next="always" />
-      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-size="14pt" />
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="Liberation Serif" fo:font-weight="normal" fo:font-style="normal" fo:font-size="14pt" />
     </style:style>
     <style:style style:name="Header_20_and_20_Footer" style:display-name="Header and Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra" />
     <style:style style:name="Text_20_body" style:family="paragraph" style:display-name="Text body" style:parent-style-name="Standard" style:class="text">
diff --git a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
index 0cc348c2..e3e8da37 100644
--- a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
+++ b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
@@ -5,7 +5,7 @@
 <title>Lorem Ipsum</title>
 </head>
 <style>
-body {font-family: 'Arial'; font-size: 12pt; font-weight: 400; font-stretch: normal; font-style: normal;}
+body {font-family: 'Arial'; font-size: 12pt; font-weight: 400; font-style: normal;}
 p {text-align: justify; line-height: 150%; margin-top: 0.00em; margin-bottom: 0.76em;}
 h1 {color: rgb(66, 113, 174); page-break-after: avoid; margin-top: 1.30em; margin-bottom: 0.65em;}
 h2 {color: rgb(66, 113, 174); page-break-after: avoid; margin-top: 1.09em; margin-bottom: 0.65em;}
diff --git a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
index dc3848c2..55d17a0e 100644
--- a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
+++ b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
@@ -2,12 +2,12 @@
   "meta": {
     "projectName": "Lorem Ipsum",
     "novelAuthor": "lipsum.com",
-    "buildTime": 1716389899,
-    "buildTimeStr": "2024-05-22 16:58:19"
+    "buildTime": 1716412100,
+    "buildTimeStr": "2024-05-22 23:08:20"
   },
   "text": {
     "css": [
-      "body {font-family: 'Arial'; font-size: 12pt; font-weight: 400; font-stretch: normal; font-style: normal;}",
+      "body {font-family: 'Arial'; font-size: 12pt; font-weight: 400; font-style: normal;}",
       "p {text-align: justify; line-height: 150%; margin-top: 0.00em; margin-bottom: 0.76em;}",
       "h1 {color: rgb(66, 113, 174); page-break-after: avoid; margin-top: 1.30em; margin-bottom: 0.65em;}",
       "h2 {color: rgb(66, 113, 174); page-break-after: avoid; margin-top: 1.09em; margin-bottom: 0.65em;}",
diff --git a/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt b/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
index 3d56619d..313f609d 100644
--- a/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
+++ b/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2024-05-22T17:05:07</meta:creation-date>
+    <meta:creation-date>2024-05-22T23:05:26</meta:creation-date>
     <meta:generator>novelWriter/2.5a4</meta:generator>
     <meta:initial-creator>lipsum.com</meta:initial-creator>
     <meta:editing-cycles>45</meta:editing-cycles>
     <meta:editing-duration>P0DT0H36M8S</meta:editing-duration>
     <dc:title>Lorem Ipsum</dc:title>
-    <dc:date>2024-05-22T17:05:07</dc:date>
+    <dc:date>2024-05-22T23:05:26</dc:date>
     <dc:creator>lipsum.com</dc:creator>
   </office:meta>
   <office:font-face-decls>
-    <style:font-face style:name="Arial" style:font-pitch="variable" style:font-weight="normal" />
+    <style:font-face style:name="Arial" style:font-pitch="variable" />
   </office:font-face-decls>
   <office:styles>
     <style:default-style style:family="paragraph">
       <style:paragraph-properties style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page" />
-      <style:text-properties style:font-name="Arial" fo:font-family="Arial" fo:font-weight="normal" fo:font-size="12pt" fo:language="en" fo:country="GB" />
+      <style:text-properties style:font-name="Arial" fo:font-family="Arial" fo:font-weight="normal" fo:font-style="normal" fo:font-size="12pt" fo:language="en" fo:country="GB" />
     </style:default-style>
     <style:style style:name="Standard" style:family="paragraph" style:class="text">
-      <style:text-properties style:font-name="Arial" fo:font-family="Arial" fo:font-weight="normal" fo:font-size="12pt" />
+      <style:text-properties style:font-name="Arial" fo:font-family="Arial" fo:font-weight="normal" fo:font-style="normal" fo:font-size="12pt" />
     </style:style>
     <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">
       <style:paragraph-properties fo:margin-top="0.322cm" fo:margin-bottom="0.276cm" fo:keep-with-next="always" />
-      <style:text-properties style:font-name="Arial" fo:font-family="Arial" fo:font-weight="normal" fo:font-size="14pt" />
+      <style:text-properties style:font-name="Arial" fo:font-family="Arial" fo:font-weight="normal" fo:font-style="normal" fo:font-size="14pt" />
     </style:style>
     <style:style style:name="Header_20_and_20_Footer" style:display-name="Header and Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra" />
     <style:style style:name="Text_20_body" style:family="paragraph" style:display-name="Text body" style:parent-style-name="Standard" style:class="text">
diff --git a/tests/test_dialogs/test_dlg_preferences.py b/tests/test_dialogs/test_dlg_preferences.py
index 70e950de..467800ad 100644
--- a/tests/test_dialogs/test_dlg_preferences.py
+++ b/tests/test_dialogs/test_dlg_preferences.py
@@ -173,7 +173,7 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, tstPaths):
     prefs.guiLocale.setCurrentIndex(prefs.guiLocale.findData("en_US"))
     prefs.guiTheme.setCurrentIndex(prefs.guiTheme.findData("default_dark"))
     with monkeypatch.context() as mp:
-        mp.setattr(QFontDialog, "getFont", lambda *a: (QFont(), True))
+        mp.setattr(QFontDialog, "getFont", lambda *a, **k: (QFont(), True))
         prefs.guiFontButton.click()
     prefs.hideVScroll.setChecked(True)
     prefs.hideHScroll.setChecked(True)
@@ -187,7 +187,7 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, tstPaths):
     # Document Style
     prefs.guiSyntax.setCurrentIndex(prefs.guiSyntax.findData("default_dark"))
     with monkeypatch.context() as mp:
-        mp.setattr(QFontDialog, "getFont", lambda *a: (QFont(), True))
+        mp.setattr(QFontDialog, "getFont", lambda *a, **k: (QFont(), True))
         prefs.textFontButton.click()
     prefs.emphLabels.setChecked(False)
     prefs.showFullPath.setChecked(False)
diff --git a/tests/test_tools/test_tools_manussettings.py b/tests/test_tools/test_tools_manussettings.py
index e9bfb8e7..cb538499 100644
--- a/tests/test_tools/test_tools_manussettings.py
+++ b/tests/test_tools/test_tools_manussettings.py
@@ -640,7 +640,7 @@ def testBuildSettings_Format(monkeypatch, qtbot, nwGUI):
         font = QFont()
         font.setFamily("Times")
         font.setPointSize(10)
-        mp.setattr(QFontDialog, "getFont", lambda *a: (font, True))
+        mp.setattr(QFontDialog, "getFont", lambda *a, **k: (font, True))
 
         fmtTab.btnTextFont.click()
         assert fmtTab._textFont == font