diff --git a/doorstop/core/tests/files/REQ002.yml b/doorstop/core/tests/files/REQ002.yml index 9b6de5c7..2d495814 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 2254cb6b..b9bc3675 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 11b64e22..5b10705d 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 b322f259..609ebc9e 100644 Binary files a/doorstop/core/tests/files/exported.xlsx and b/doorstop/core/tests/files/exported.xlsx differ diff --git a/doorstop/core/tests/files/exported.yml b/doorstop/core/tests/files/exported.yml index 94bb89c3..8c020faa 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 882f4652..2484f4ca 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 112b8c60..316f2331 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 2a6c6880..f83e5791 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 3d01124a..4b259da1 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 dcb787d1..2e05bb2c 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 1a8ff99a..43fd2e3d 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 6d2af1f8..047864d1 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 1df09bf8..63f33dfa 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,