From 96741fc08b6849fdd098e12349f212816db6871c Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 25 Apr 2024 22:58:00 +0200 Subject: [PATCH] Fix remaining broken tests --- .../coreIndex_LoadSave_tagsIndex.json | 4 -- ...uildDocBuild_OpenDocument_Lorem_Ipsum.fodt | 14 ++-- tests/test_core/test_core_tohtml.py | 4 +- tests/test_core/test_core_tokenizer.py | 66 ++++++++++--------- 4 files changed, 46 insertions(+), 42 deletions(-) diff --git a/tests/reference/coreIndex_LoadSave_tagsIndex.json b/tests/reference/coreIndex_LoadSave_tagsIndex.json index 5531aac2..4c10214a 100644 --- a/tests/reference/coreIndex_LoadSave_tagsIndex.json +++ b/tests/reference/coreIndex_LoadSave_tagsIndex.json @@ -106,9 +106,5 @@ "T0001": {"level": "H1", "title": "Ancient Europe", "line": 1, "tag": "europe", "cCount": 1770, "wCount": 259, "pCount": 3, "synopsis": ""} } } - }, - "novelWriter.textIndex": { - "comments": {}, - "footnotes": {} } } diff --git a/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt b/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt index 1585963a..3c1eda3a 100644 --- a/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt +++ b/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt @@ -1,13 +1,13 @@ - 2024-03-14T23:42:49 - novelWriter/2.4a2 + 2024-04-25T07:39:02 + novelWriter/2.5a2 lipsum.com 44 P0DT0H33M59S Lorem Ipsum - 2024-03-14T23:42:49 + 2024-04-25T07:39:02 lipsum.com @@ -31,7 +31,7 @@ - + @@ -64,10 +64,14 @@ + + + + - + diff --git a/tests/test_core/test_core_tohtml.py b/tests/test_core/test_core_tohtml.py index 0152607d..b9cee8e3 100644 --- a/tests/test_core/test_core_tohtml.py +++ b/tests/test_core/test_core_tohtml.py @@ -24,8 +24,8 @@ import pytest from tools import readFile -from novelwriter.core.tohtml import ToHtml from novelwriter.core.project import NWProject +from novelwriter.core.tohtml import ToHtml @pytest.mark.core @@ -453,7 +453,7 @@ def testCoreToHtml_SpecialCases(mockGUI): html.doConvert() assert html.result == ( "

" - "Comment: Test > text _<**bold**>_ and more." + "Comment: Test > text <bold> and more." "

\n" ) diff --git a/tests/test_core/test_core_tokenizer.py b/tests/test_core/test_core_tokenizer.py index a98bc569..82fd6814 100644 --- a/tests/test_core/test_core_tokenizer.py +++ b/tests/test_core/test_core_tokenizer.py @@ -870,30 +870,31 @@ def testCoreToken_ExtractFormats(mockGUI): # Plain bold text, fmt = tokens._extractFormats("Text with **bold** in it.") assert text == "Text with bold in it." - assert fmt == [(10, tokens.FMT_B_B), (14, tokens.FMT_B_E)] + assert fmt == [(10, tokens.FMT_B_B, ""), (14, tokens.FMT_B_E, "")] # Plain italics text, fmt = tokens._extractFormats("Text with _italics_ in it.") assert text == "Text with italics in it." - assert fmt == [(10, tokens.FMT_I_B), (17, tokens.FMT_I_E)] + assert fmt == [(10, tokens.FMT_I_B, ""), (17, tokens.FMT_I_E, "")] # Plain strikethrough text, fmt = tokens._extractFormats("Text with ~~strikethrough~~ in it.") assert text == "Text with strikethrough in it." - assert fmt == [(10, tokens.FMT_D_B), (23, tokens.FMT_D_E)] + assert fmt == [(10, tokens.FMT_D_B, ""), (23, tokens.FMT_D_E, "")] # Nested bold/italics text, fmt = tokens._extractFormats("Text with **bold and _italics_** in it.") assert text == "Text with bold and italics in it." assert fmt == [ - (10, tokens.FMT_B_B), (19, tokens.FMT_I_B), (26, tokens.FMT_I_E), (26, tokens.FMT_B_E) + (10, tokens.FMT_B_B, ""), (19, tokens.FMT_I_B, ""), + (26, tokens.FMT_I_E, ""), (26, tokens.FMT_B_E, ""), ] # Bold with overlapping italics # Here, bold is ignored because it is not on word boundary text, fmt = tokens._extractFormats("Text with **bold and overlapping _italics**_ in it.") assert text == "Text with **bold and overlapping italics** in it." - assert fmt == [(33, tokens.FMT_I_B), (42, tokens.FMT_I_E)] + assert fmt == [(33, tokens.FMT_I_B, ""), (42, tokens.FMT_I_E, "")] # Shortcodes # ========== @@ -901,43 +902,44 @@ def testCoreToken_ExtractFormats(mockGUI): # Plain bold text, fmt = tokens._extractFormats("Text with [b]bold[/b] in it.") assert text == "Text with bold in it." - assert fmt == [(10, tokens.FMT_B_B), (14, tokens.FMT_B_E)] + assert fmt == [(10, tokens.FMT_B_B, ""), (14, tokens.FMT_B_E, "")] # Plain italics text, fmt = tokens._extractFormats("Text with [i]italics[/i] in it.") assert text == "Text with italics in it." - assert fmt == [(10, tokens.FMT_I_B), (17, tokens.FMT_I_E)] + assert fmt == [(10, tokens.FMT_I_B, ""), (17, tokens.FMT_I_E, "")] # Plain strikethrough text, fmt = tokens._extractFormats("Text with [s]strikethrough[/s] in it.") assert text == "Text with strikethrough in it." - assert fmt == [(10, tokens.FMT_D_B), (23, tokens.FMT_D_E)] + assert fmt == [(10, tokens.FMT_D_B, ""), (23, tokens.FMT_D_E, "")] # Plain underline text, fmt = tokens._extractFormats("Text with [u]underline[/u] in it.") assert text == "Text with underline in it." - assert fmt == [(10, tokens.FMT_U_B), (19, tokens.FMT_U_E)] + assert fmt == [(10, tokens.FMT_U_B, ""), (19, tokens.FMT_U_E, "")] # Plain mark text, fmt = tokens._extractFormats("Text with [m]highlight[/m] in it.") assert text == "Text with highlight in it." - assert fmt == [(10, tokens.FMT_M_B), (19, tokens.FMT_M_E)] + assert fmt == [(10, tokens.FMT_M_B, ""), (19, tokens.FMT_M_E, "")] # Plain superscript text, fmt = tokens._extractFormats("Text with super[sup]script[/sup] in it.") assert text == "Text with superscript in it." - assert fmt == [(15, tokens.FMT_SUP_B), (21, tokens.FMT_SUP_E)] + assert fmt == [(15, tokens.FMT_SUP_B, ""), (21, tokens.FMT_SUP_E, "")] # Plain subscript text, fmt = tokens._extractFormats("Text with sub[sub]script[/sub] in it.") assert text == "Text with subscript in it." - assert fmt == [(13, tokens.FMT_SUB_B), (19, tokens.FMT_SUB_E)] + assert fmt == [(13, tokens.FMT_SUB_B, ""), (19, tokens.FMT_SUB_E, "")] # Nested bold/italics text, fmt = tokens._extractFormats("Text with [b]bold and [i]italics[/i][/b] in it.") assert text == "Text with bold and italics in it." assert fmt == [ - (10, tokens.FMT_B_B), (19, tokens.FMT_I_B), (26, tokens.FMT_I_E), (26, tokens.FMT_B_E) + (10, tokens.FMT_B_B, ""), (19, tokens.FMT_I_B, ""), + (26, tokens.FMT_I_E, ""), (26, tokens.FMT_B_E, ""), ] # Bold with overlapping italics @@ -947,7 +949,8 @@ def testCoreToken_ExtractFormats(mockGUI): ) assert text == "Text with bold and overlapping italics in it." assert fmt == [ - (10, tokens.FMT_B_B), (31, tokens.FMT_I_B), (38, tokens.FMT_B_E), (38, tokens.FMT_I_E) + (10, tokens.FMT_B_B, ""), (31, tokens.FMT_I_B, ""), + (38, tokens.FMT_B_E, ""), (38, tokens.FMT_I_E, ""), ] # So does this @@ -956,7 +959,8 @@ def testCoreToken_ExtractFormats(mockGUI): ) assert text == "Text with bold and overlapping italics in it." assert fmt == [ - (10, tokens.FMT_B_B), (31, tokens.FMT_I_B), (38, tokens.FMT_B_E), (41, tokens.FMT_I_E) + (10, tokens.FMT_B_B, ""), (31, tokens.FMT_I_B, ""), + (38, tokens.FMT_B_E, ""), (41, tokens.FMT_I_E, ""), ] # END Test testCoreToken_ExtractFormats @@ -999,8 +1003,8 @@ def testCoreToken_TextFormat(mockGUI): Tokenizer.T_TEXT, 0, "Some bolded text on this lines", [ - (5, Tokenizer.FMT_B_B), - (16, Tokenizer.FMT_B_E), + (5, Tokenizer.FMT_B_B, ""), + (16, Tokenizer.FMT_B_E, ""), ], Tokenizer.A_NONE ), @@ -1015,8 +1019,8 @@ def testCoreToken_TextFormat(mockGUI): Tokenizer.T_TEXT, 0, "Some italic text on this lines", [ - (5, Tokenizer.FMT_I_B), - (16, Tokenizer.FMT_I_E), + (5, Tokenizer.FMT_I_B, ""), + (16, Tokenizer.FMT_I_E, ""), ], Tokenizer.A_NONE ), @@ -1031,10 +1035,10 @@ def testCoreToken_TextFormat(mockGUI): Tokenizer.T_TEXT, 0, "Some bold italic text on this lines", [ - (5, Tokenizer.FMT_B_B), - (5, Tokenizer.FMT_I_B), - (21, Tokenizer.FMT_I_E), - (21, Tokenizer.FMT_B_E), + (5, Tokenizer.FMT_B_B, ""), + (5, Tokenizer.FMT_I_B, ""), + (21, Tokenizer.FMT_I_E, ""), + (21, Tokenizer.FMT_B_E, ""), ], Tokenizer.A_NONE ), @@ -1049,8 +1053,8 @@ def testCoreToken_TextFormat(mockGUI): Tokenizer.T_TEXT, 0, "Some strikethrough text on this lines", [ - (5, Tokenizer.FMT_D_B), - (23, Tokenizer.FMT_D_E), + (5, Tokenizer.FMT_D_B, ""), + (23, Tokenizer.FMT_D_E, ""), ], Tokenizer.A_NONE ), @@ -1065,12 +1069,12 @@ def testCoreToken_TextFormat(mockGUI): Tokenizer.T_TEXT, 0, "Some nested bold and italic and strikethrough text here", [ - (5, Tokenizer.FMT_B_B), - (21, Tokenizer.FMT_I_B), - (27, Tokenizer.FMT_I_E), - (32, Tokenizer.FMT_D_B), - (45, Tokenizer.FMT_D_E), - (50, Tokenizer.FMT_B_E), + (5, Tokenizer.FMT_B_B, ""), + (21, Tokenizer.FMT_I_B, ""), + (27, Tokenizer.FMT_I_E, ""), + (32, Tokenizer.FMT_D_B, ""), + (45, Tokenizer.FMT_D_E, ""), + (50, Tokenizer.FMT_B_E, ""), ], Tokenizer.A_NONE ),