From f8b0de246a49eae71f2b0baeb9c8aedcb872af0f Mon Sep 17 00:00:00 2001 From: Rob Taylor Date: Tue, 1 Oct 2024 02:46:50 -0400 Subject: [PATCH] Don't generate inline svg for publish tests. It's proved difficult to get plantuml to generate the same svg output on all target platforms, due to font rendering differences effecting various aspects of its output. This switches the test cases to use embedded png output instead. --- doorstop/core/tests/files/REQ002.yml | 2 +- doorstop/core/tests/files/exported.csv | 2 +- doorstop/core/tests/files/exported.tsv | 2 +- doorstop/core/tests/files/exported.xlsx | Bin 6082 -> 9950 bytes doorstop/core/tests/files/exported.yml | 2 +- doorstop/core/tests/files/published.html | 2 +- doorstop/core/tests/files/published.md | 2 +- doorstop/core/tests/files/published.txt | 4 ++-- doorstop/core/tests/files/published2.html | 2 +- doorstop/core/tests/files/published2.md | 2 +- doorstop/core/tests/files/published2.txt | 4 ++-- doorstop/core/tests/test_all.py | 10 ++++++---- doorstop/core/tests/test_importer.py | 4 ++-- 13 files changed, 20 insertions(+), 18 deletions(-) diff --git a/doorstop/core/tests/files/REQ002.yml b/doorstop/core/tests/files/REQ002.yml index 9b6de5c73..2d4958141 100644 --- a/doorstop/core/tests/files/REQ002.yml +++ b/doorstop/core/tests/files/REQ002.yml @@ -10,7 +10,7 @@ reviewed: 1PvBLmy0xmdK_zLKrLu1au0wlIw_zsD6A8Oc5F4zWxU= text: | Hello, world! - ```plantuml format="svg_inline" alt="Use Cases of Doorstop" title="Use Cases of Doorstop" + ```plantuml format="png" alt="Use Cases of Doorstop" title="Use Cases of Doorstop" @startuml Author --> (Create Document) Author --> (Create Item) diff --git a/doorstop/core/tests/files/exported.csv b/doorstop/core/tests/files/exported.csv index 2254cb6b0..b9bc36751 100644 --- a/doorstop/core/tests/files/exported.csv +++ b/doorstop/core/tests/files/exported.csv @@ -14,7 +14,7 @@ type:file,path:external/text2.txt",REQ001:35ed54323e3054c33ae5545fffdbbbf5,True, REQ004,1.6,"Hello, world!",,,,True,False,,True, REQ002,2.1,"Hello, world! -```plantuml format=""svg_inline"" alt=""Use Cases of Doorstop"" title=""Use Cases of Doorstop"" +```plantuml format=""png"" alt=""Use Cases of Doorstop"" title=""Use Cases of Doorstop"" @startuml Author --> (Create Document) Author --> (Create Item) diff --git a/doorstop/core/tests/files/exported.tsv b/doorstop/core/tests/files/exported.tsv index 11b64e223..5b10705d6 100644 --- a/doorstop/core/tests/files/exported.tsv +++ b/doorstop/core/tests/files/exported.tsv @@ -14,7 +14,7 @@ type:file,path:external/text2.txt" REQ001:35ed54323e3054c33ae5545fffdbbbf5 True REQ004 1.6 Hello, world! True False True REQ002 2.1 "Hello, world! -```plantuml format=""svg_inline"" alt=""Use Cases of Doorstop"" title=""Use Cases of Doorstop"" +```plantuml format=""png"" alt=""Use Cases of Doorstop"" title=""Use Cases of Doorstop"" @startuml Author --> (Create Document) Author --> (Create Item) diff --git a/doorstop/core/tests/files/exported.xlsx b/doorstop/core/tests/files/exported.xlsx index b322f259183f1025bc7a94e8742f50e431b4fced..609ebc9e257fd053029df35c00d410d1a29ab8a2 100644 GIT binary patch literal 9950 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 DFde|3 diff --git a/doorstop/core/tests/files/exported.yml b/doorstop/core/tests/files/exported.yml index 94bb89c36..8c020faaf 100644 --- a/doorstop/core/tests/files/exported.yml +++ b/doorstop/core/tests/files/exported.yml @@ -76,7 +76,7 @@ REQ002: text: | Hello, world! - ```plantuml format="svg_inline" alt="Use Cases of Doorstop" title="Use Cases of Doorstop" + ```plantuml format="png" alt="Use Cases of Doorstop" title="Use Cases of Doorstop" @startuml Author --> (Create Document) Author --> (Create Item) diff --git a/doorstop/core/tests/files/published.html b/doorstop/core/tests/files/published.html index 882f46526..2484f4cab 100644 --- a/doorstop/core/tests/files/published.html +++ b/doorstop/core/tests/files/published.html @@ -105,7 +105,7 @@

1.6 REQ004

Hello, world!

2.1 Plantuml REQ002

Hello, world!

-

Dot Executable: /opt/local/bin/dotDot executable does not existCannot find Graphviz. You should try @startumltestdot@enduml or java -jar plantuml.jar -testdot 

+

Use Cases of Doorstop

Child links: TST001, TST002

2.1 REQ2-001

Hello, world!

diff --git a/doorstop/core/tests/files/published.md b/doorstop/core/tests/files/published.md index 112b8c604..316f2331a 100644 --- a/doorstop/core/tests/files/published.md +++ b/doorstop/core/tests/files/published.md @@ -36,7 +36,7 @@ Hello, world! Hello, world! -```plantuml format="svg_inline" alt="Use Cases of Doorstop" title="Use Cases of Doorstop" +```plantuml format="png" alt="Use Cases of Doorstop" title="Use Cases of Doorstop" @startuml Author --> (Create Document) Author --> (Create Item) diff --git a/doorstop/core/tests/files/published.txt b/doorstop/core/tests/files/published.txt index 2a6c6880b..f83e57914 100644 --- a/doorstop/core/tests/files/published.txt +++ b/doorstop/core/tests/files/published.txt @@ -38,8 +38,8 @@ Hello, world! - ```plantuml format="svg_inline" alt="Use Cases of Doorstop" title="Use - Cases of Doorstop" + ```plantuml format="png" alt="Use Cases of Doorstop" title="Use Cases + of Doorstop" @startuml Author --> (Create Document) Author --> (Create Item) diff --git a/doorstop/core/tests/files/published2.html b/doorstop/core/tests/files/published2.html index 3d01124a9..4b259da13 100644 --- a/doorstop/core/tests/files/published2.html +++ b/doorstop/core/tests/files/published2.html @@ -105,7 +105,7 @@

1.6 REQ004

Hello, world!

2.1 Plantuml REQ002

Hello, world!

-

Dot Executable: /opt/local/bin/dotDot executable does not existCannot find Graphviz. You should try @startumltestdot@enduml or java -jar plantuml.jar -testdot 

+

Use Cases of Doorstop

2.1 REQ2-001

Hello, world!

Test Math Expressions in Latex Style:

diff --git a/doorstop/core/tests/files/published2.md b/doorstop/core/tests/files/published2.md index dcb787d12..2e05bb2c8 100644 --- a/doorstop/core/tests/files/published2.md +++ b/doorstop/core/tests/files/published2.md @@ -36,7 +36,7 @@ Hello, world! Hello, world! -```plantuml format="svg_inline" alt="Use Cases of Doorstop" title="Use Cases of Doorstop" +```plantuml format="png" alt="Use Cases of Doorstop" title="Use Cases of Doorstop" @startuml Author --> (Create Document) Author --> (Create Item) diff --git a/doorstop/core/tests/files/published2.txt b/doorstop/core/tests/files/published2.txt index 1a8ff99ab..43fd2e3da 100644 --- a/doorstop/core/tests/files/published2.txt +++ b/doorstop/core/tests/files/published2.txt @@ -38,8 +38,8 @@ Hello, world! - ```plantuml format="svg_inline" alt="Use Cases of Doorstop" title="Use - Cases of Doorstop" + ```plantuml format="png" alt="Use Cases of Doorstop" title="Use Cases + of Doorstop" @startuml Author --> (Create Document) Author --> (Create Item) diff --git a/doorstop/core/tests/test_all.py b/doorstop/core/tests/test_all.py index 6d2af1f8b..047864d19 100644 --- a/doorstop/core/tests/test_all.py +++ b/doorstop/core/tests/test_all.py @@ -174,7 +174,7 @@ def test_issues_count(self): issues = self.document.issues for issue in self.document.issues: logging.info(repr(issue)) - self.assertEqual(13, len(issues)) + self.assertEqual(14, len(issues)) @patch("doorstop.settings.REORDER", False) @patch("doorstop.settings.REVIEW_NEW_ITEMS", False) @@ -330,7 +330,7 @@ def test_issues_count(self): issues = self.tree.issues for issue in self.tree.issues: logging.info(repr(issue)) - self.assertEqual(15, len(issues)) + self.assertEqual(16, len(issues)) @patch("doorstop.settings.REORDER", False) @patch("doorstop.settings.REVIEW_NEW_ITEMS", False) @@ -582,9 +582,11 @@ def setUp(self): FILES, "plantuml-1.2024.7.jar" ) plantuml_ext = next( - x for x in HtmlPublisher.EXTENSIONS if type(x) == PlantUMLMarkdownExtension + x for x in HtmlPublisher.EXTENSIONS if type(x) is PlantUMLMarkdownExtension + ) + plantuml_ext.setConfigs( + {"server": "", "plantuml_cmd": plantuml_cmd, "theme": "bluegray"} ) - plantuml_ext.setConfigs({"server": "", "plantuml_cmd": plantuml_cmd}) def tearDown(self): if os.path.exists(self.temp): diff --git a/doorstop/core/tests/test_importer.py b/doorstop/core/tests/test_importer.py index 1df09bf83..63f33dfaf 100644 --- a/doorstop/core/tests/test_importer.py +++ b/doorstop/core/tests/test_importer.py @@ -32,7 +32,7 @@ Inline Style 2: \\(ax^2 + bx + c = 0\\) Multiline: $$x = {-b \\pm \\sqrt{b^2-4ac} \\over 2a}.$$""" -PLANTUML_TXT = """```plantuml format="svg_inline" alt="Use Cases of Doorstop" title="Use Cases of Doorstop" +PLANTUML_TXT = """```plantuml format="png" alt="Use Cases of Doorstop" title="Use Cases of Doorstop" @startuml Author --> (Create Document) Author --> (Create Item) @@ -359,7 +359,7 @@ def test_file_xlsx(self, mock_itemize): [ "REQ002", "2.1", - 'Hello, world!\n\n```plantuml format="svg_inline" alt="Use Cases of Doorstop" title="Use Cases of Doorstop"\n@startuml\nAuthor --> (Create Document)\nAuthor --> (Create Item)\nAuthor --> (Link Item to Document)\nAuthor --> (Link Item to other Item)\nAuthor --> (Edit Item)\nAuthor --> (Review Item)\nAuthor -> (Delete Item)\nAuthor -> (Delete Document)\n(Export) <- (Author)\n(Import) <- (Author)\nReviewer --> (Review Item)\nSystem --> (Suspect Changes)\nSystem --> (Integrity)\n@enduml\n```', + 'Hello, world!\n\n```plantuml format="png" alt="Use Cases of Doorstop" title="Use Cases of Doorstop"\n@startuml\nAuthor --> (Create Document)\nAuthor --> (Create Item)\nAuthor --> (Link Item to Document)\nAuthor --> (Link Item to other Item)\nAuthor --> (Edit Item)\nAuthor --> (Review Item)\nAuthor -> (Delete Item)\nAuthor -> (Delete Document)\n(Export) <- (Author)\n(Import) <- (Author)\nReviewer --> (Review Item)\nSystem --> (Suspect Changes)\nSystem --> (Integrity)\n@enduml\n```', None, None, None,