diff --git a/.drone.yml b/.drone.yml index 2dc868f..a9759a6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,4 +8,4 @@ steps: environment: commands: - uv pip install --system --break-system-packages --requirements requirements.txt - - cd test && pytest --junitxml=./test-reports/junit.xml + - pytest --junitxml=./test-reports/junit.xml diff --git a/.vscode/settings.json b/.vscode/settings.json index 1bb72f5..8decbe7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,5 +10,6 @@ "source.fixAll.ruff": "explicit", "source.organizeImports.ruff": "explicit" } - } + }, + "python.analysis.autoImportCompletions": true } \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 42b7d2f..b9f34b5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ requires-python = ">=3.12" dependencies = [] [tool.ruff] -line-length = 88 +line-length = 120 indent-width = 4 [tool.ruff.lint] @@ -39,3 +39,7 @@ select = [ # ruff-specific: No unused noqa directives "RUF100", ] + +[tool.pytest.ini_options] +addopts = ["--color=yes"] +markers = ["html", "latex"] diff --git a/renderer/comment.py b/renderer/comment.py index 52fff45..ee70ef3 100644 --- a/renderer/comment.py +++ b/renderer/comment.py @@ -9,7 +9,9 @@ class SpanComment(SpanToken): Coment span token (% Eiersalat). Identifies a comment in text. """ - pattern = re.compile(r'(%.*\n?)') + + pattern = re.compile(r"(%.*\n?)") + class BlockComment(BlockToken): @staticmethod @@ -19,4 +21,4 @@ class BlockComment(BlockToken): @classmethod def read(cls, lines): next(lines) - return None \ No newline at end of file + return None diff --git a/renderer/dash.py b/renderer/dash.py index 10f80a2..3ac5d67 100644 --- a/renderer/dash.py +++ b/renderer/dash.py @@ -8,4 +8,5 @@ class Dash(SpanToken): Dash span token ( - ). Identifies a dash in a text. """ - pattern = re.compile(r'(\s-\s)') + + pattern = re.compile(r"(\s-\s)") diff --git a/renderer/fifty_ohm_html_renderer.py b/renderer/fifty_ohm_html_renderer.py index 5af5929..db8a67d 100644 --- a/renderer/fifty_ohm_html_renderer.py +++ b/renderer/fifty_ohm_html_renderer.py @@ -2,16 +2,16 @@ import textwrap from mistletoe import HtmlRenderer -from renderer.comment import BlockComment, SpanComment -from renderer.dash import Dash -from renderer.halfwidth_spaces import HalfwidthSpaces -from renderer.morse import Morse -from renderer.nonbreaking_spaces import NonbreakingSpaces, NonbreakingSpacesDots -from renderer.quote import Quote -from renderer.references import References -from renderer.tag import Tag -from renderer.underline import Underline -from renderer.unit import Unit +from .comment import BlockComment, SpanComment +from .dash import Dash +from .halfwidth_spaces import HalfwidthSpaces +from .morse import Morse +from .nonbreaking_spaces import NonbreakingSpaces, NonbreakingSpacesDots +from .quote import Quote +from .references import References +from .tag import Tag +from .underline import Underline +from .unit import Unit class FiftyOhmHtmlRenderer(HtmlRenderer): @@ -146,9 +146,7 @@ class FiftyOhmHtmlRenderer(HtmlRenderer): else: type = token.tagtype - return self.render_tag_helper( - type, self.render_inner(token), self.margin_id, self.margin_anchor_id - ) + return self.render_tag_helper(type, self.render_inner(token), self.margin_id, self.margin_anchor_id) def render_halfwidth_spaces(self, token): return f"{token.first}. {token.second}." diff --git a/renderer/fifty_ohm_latex_renderer.py b/renderer/fifty_ohm_latex_renderer.py index 5e55998..1e1c204 100644 --- a/renderer/fifty_ohm_latex_renderer.py +++ b/renderer/fifty_ohm_latex_renderer.py @@ -1,16 +1,15 @@ from mistletoe.latex_renderer import LaTeXRenderer -from renderer.comment import BlockComment, SpanComment -from renderer.dash import Dash -from renderer.halfwidth_spaces import HalfwidthSpaces -from renderer.nonbreaking_spaces import NonbreakingSpaces, NonbreakingSpacesDots -from renderer.quote import Quote -from renderer.tag import Tag -from renderer.underline import Underline +from .comment import BlockComment, SpanComment +from .dash import Dash +from .halfwidth_spaces import HalfwidthSpaces +from .nonbreaking_spaces import NonbreakingSpaces, NonbreakingSpacesDots +from .quote import Quote +from .tag import Tag +from .underline import Underline class FiftyOhmLaTeXRenderer(LaTeXRenderer): - def __init__(self): super().__init__( Dash, @@ -23,7 +22,7 @@ class FiftyOhmLaTeXRenderer(LaTeXRenderer): NonbreakingSpaces, NonbreakingSpacesDots, ) - + def render_document(self, token): self.footnotes.update(token.footnotes) return self.render_inner(token) @@ -32,25 +31,24 @@ class FiftyOhmLaTeXRenderer(LaTeXRenderer): return " -- " def render_block_comment(self, token): - return "" # TODO propagate comments to the LaTeX document + return "" # TODO propagate comments to the LaTeX document def render_span_comment(self, token): - return "" # TODO propagate comments to the LaTeX document + return "" # TODO propagate comments to the LaTeX document def render_quote(self, token): - return fr"\enquote{{{self.render_inner(token)}}}" + return rf"\enquote{{{self.render_inner(token)}}}" def render_emphasis(self, token): - return fr"\emph{{{self.render_inner(token)}}}" + return rf"\emph{{{self.render_inner(token)}}}" def render_underline(self, token): - return fr"\underline{{{self.render_inner(token)}}}" + return rf"\underline{{{self.render_inner(token)}}}" def render_thematic_break(self, token): return "" def render_tag(self, token): # noqa: C901 - tagtype = None match token.tagtype: @@ -81,7 +79,7 @@ class FiftyOhmLaTeXRenderer(LaTeXRenderer): case _: tagtype = "Margin" - return fr"\{tagtype}{{{self.render_inner(token)}}}" + return rf"\{tagtype}{{{self.render_inner(token)}}}" def render_halfwidth_spaces(self, token): return f"{token.first}.\,{token.second}." @@ -90,8 +88,5 @@ class FiftyOhmLaTeXRenderer(LaTeXRenderer): return f"{token.first}~{token.second}" def render_nonbreaking_spaces_dots(self, token): - lookup = { - "" : "", - " " : "~" - } - return f"{lookup[token.first]}{token.second}{lookup[token.third]}" \ No newline at end of file + lookup = {"": "", " ": "~"} + return f"{lookup[token.first]}{token.second}{lookup[token.third]}" diff --git a/renderer/halfwidth_spaces.py b/renderer/halfwidth_spaces.py index dfdd374..a6abd13 100644 --- a/renderer/halfwidth_spaces.py +++ b/renderer/halfwidth_spaces.py @@ -8,11 +8,9 @@ class HalfwidthSpaces(SpanToken): Insert halfwidth space into span token (Z. B.) Identifies "z.B.", "d.h." and "D.h." with and without space in between. """ + pattern = re.compile(r"\b(z|Z|d|D)\.\s?(B|h)\.") def __init__(self, match_object): self.first = match_object.group(1) self.second = match_object.group(2) - - - diff --git a/renderer/morse.py b/renderer/morse.py index 93ffd73..ebec4c9 100644 --- a/renderer/morse.py +++ b/renderer/morse.py @@ -8,8 +8,9 @@ class Morse(SpanToken): Morse code span token ("[morse:moe]"). Generates morse code from a text. """ + @staticmethod - def convert_to_morse_code(text): + def convert_to_morse_code(text): dit = 1 dah = 2 space = 3 @@ -74,16 +75,16 @@ class Morse(SpanToken): "bk": [dah, dit, dit, dit, dah, dit, dah], "sk": [dit, dit, dit, dah, dit, dah], "correction": [dit, dit, dit, dit, dit, dit, dit, dit], - " ": [space] + " ": [space], } - + result = [] for char in text: if char.lower() in morse_code: result.append(morse_code[char.lower()]) - + return result parse_inner = False - pattern = re.compile(r'"\[morse:\s*(.+)\]"') \ No newline at end of file + pattern = re.compile(r'"\[morse:\s*(.+)\]"') diff --git a/renderer/nonbreaking_spaces.py b/renderer/nonbreaking_spaces.py index 08ac99d..8347b0d 100644 --- a/renderer/nonbreaking_spaces.py +++ b/renderer/nonbreaking_spaces.py @@ -8,23 +8,23 @@ class NonbreakingSpaces(SpanToken): Insert unbreakable space into span token (§ 3) Identifies "§$number", "Abs.$number", "Klasse [A,E,N]" w/ and without space between. """ + pattern = re.compile(r"(§|Abs\.|Klasse)\s?(\d|[NEA])") def __init__(self, match_object): self.first = match_object.group(1) self.second = match_object.group(2) + class NonbreakingSpacesDots(SpanToken): """ Insert unbreakable space before and after "..." if there is a space Identifies "..." with leading and/or trailing space """ + pattern = re.compile(r"(\s?)(\.\.\.)(\s?)") def __init__(self, match_object): self.first = match_object.group(1) self.second = match_object.group(2) self.third = match_object.group(3) - - - diff --git a/renderer/quote.py b/renderer/quote.py index 01a381b..7ff9101 100644 --- a/renderer/quote.py +++ b/renderer/quote.py @@ -8,4 +8,5 @@ class Quote(SpanToken): Quote span token ("Eiersalat"). Identifies quoted text. """ + pattern = re.compile(r'"([^"]+)"') diff --git a/renderer/references.py b/renderer/references.py index e8b5f18..bb9de72 100644 --- a/renderer/references.py +++ b/renderer/references.py @@ -8,8 +8,8 @@ class References(SpanToken): Resolve references for html Identifies "[ref:$]" """ + pattern = re.compile(r"\[ref\:(\S+)\]") def __init__(self, match_object): self.first = match_object.group(1) - diff --git a/renderer/underline.py b/renderer/underline.py index 36d6b8e..0a29de9 100644 --- a/renderer/underline.py +++ b/renderer/underline.py @@ -8,4 +8,5 @@ class Underline(SpanToken): Underline span token (Untersrich). Identifies underlined text. """ - pattern = re.compile(r'(.+)') + + pattern = re.compile(r"(.+)") diff --git a/test/test_comment.py b/test/test_comment.py index c8ee2db..28c3612 100644 --- a/test/test_comment.py +++ b/test/test_comment.py @@ -1,28 +1,31 @@ import mistletoe +import pytest from renderer.fifty_ohm_html_renderer import FiftyOhmHtmlRenderer from renderer.fifty_ohm_latex_renderer import FiftyOhmLaTeXRenderer +from test.util import paragraph -def test_comment_html() : - +@pytest.mark.html +def test_comment_html(): assertions = { - "%Comment\nBar" : "

Bar

\n", + "%Comment\nBar": "Bar", # TODO: This test is not working as expected. The comment should be removed - #"%Comment\n" : "a", - "Foo\n%Comment\nBar" : "

Foo\nBar

\n", + # "%Comment\n" : "a", + "Foo\n%Comment\nBar": "Foo\nBar", } for assertion in assertions: - assert mistletoe.markdown(assertion, FiftyOhmHtmlRenderer) == assertions[assertion] + assert mistletoe.markdown(assertion, FiftyOhmHtmlRenderer) == paragraph(assertions[assertion]) -def test_comment_latex() : +@pytest.mark.latex +def test_comment_latex(): assertions = { - "%Comment\nBar" : "\nBar\n", + "%Comment\nBar": "\nBar\n", # TODO: This test is not working as expected. The comment should be removed - #"%Comment\n" : "a", - "Foo\n%Comment\nBar" : "\nFoo\nBar\n", + # "%Comment\n" : "a", + "Foo\n%Comment\nBar": "\nFoo\nBar\n", } for assertion in assertions: diff --git a/test/test_dash.py b/test/test_dash.py index 7fa363e..0a571e4 100644 --- a/test/test_dash.py +++ b/test/test_dash.py @@ -1,23 +1,25 @@ import mistletoe +import pytest from renderer.fifty_ohm_html_renderer import FiftyOhmHtmlRenderer from renderer.fifty_ohm_latex_renderer import FiftyOhmLaTeXRenderer from test.util import paragraph -def test_dash_html() : - +@pytest.mark.html +def test_dash_html(): assertions = { - "Foo - Bar" : "Foo – Bar", + "Foo - Bar": "Foo – Bar", } for assertion in assertions: assert mistletoe.markdown(assertion, FiftyOhmHtmlRenderer) == paragraph(assertions[assertion]) -def test_dash_latex() : +@pytest.mark.latex +def test_dash_latex(): assertions = { - "Foo - Bar" : "\nFoo -- Bar\n", + "Foo - Bar": "\nFoo -- Bar\n", } for assertion in assertions: diff --git a/test/test_halfwidth_spaces.py b/test/test_halfwidth_spaces.py index 56a0d46..97a57ac 100644 --- a/test/test_halfwidth_spaces.py +++ b/test/test_halfwidth_spaces.py @@ -1,10 +1,12 @@ import mistletoe +import pytest from renderer.fifty_ohm_html_renderer import FiftyOhmHtmlRenderer from renderer.fifty_ohm_latex_renderer import FiftyOhmLaTeXRenderer from test.util import paragraph +@pytest.mark.html def test_halfwidth_space_html(): input = "Dies ist z.B. ein Test. D.h. hier sollten d.h. Spaces ersetzt worden sein." target = "Dies ist z. B. ein Test. D. h. hier sollten d. h. Spaces ersetzt worden sein." @@ -12,6 +14,7 @@ def test_halfwidth_space_html(): assert mistletoe.markdown(input, FiftyOhmHtmlRenderer) == paragraph(target) +@pytest.mark.latex def test_halfwidth_space_latex(): input = "Dies ist z.B. ein Test. D.h. hier sollten d.h. Spaces ersetzt worden sein." target = "\nDies ist z.\,B. ein Test. D.\,h. hier sollten d.\,h. Spaces ersetzt worden sein.\n" diff --git a/test/test_html.py b/test/test_html.py index 8c2dc42..e7160de 100644 --- a/test/test_html.py +++ b/test/test_html.py @@ -1,14 +1,12 @@ - import mistletoe from renderer.fifty_ohm_html_renderer import FiftyOhmHtmlRenderer -def test_html(capsys) : - +def test_html(capsys): with capsys.disabled(): with open("test/acceptanceTest.md") as file: content = file.read() output = mistletoe.markdown(content, FiftyOhmHtmlRenderer) with open("test/acceptanceTest.html", "w") as output_file: - output_file.write(output) \ No newline at end of file + output_file.write(output) diff --git a/test/test_morse.py b/test/test_morse.py index d7ece1a..e053b68 100644 --- a/test/test_morse.py +++ b/test/test_morse.py @@ -1,17 +1,19 @@ import mistletoe +import pytest from renderer.fifty_ohm_html_renderer import FiftyOhmHtmlRenderer +from test.util import paragraph -def test_morse_html() : - +@pytest.mark.html +def test_morse_html(): assertions = { - '"[morse:a]"' : "

"+FiftyOhmHtmlRenderer.render_morse_helper([[1,2]])+"

\n", - '"[morse: a]"' : "

"+FiftyOhmHtmlRenderer.render_morse_helper([[1,2]])+"

\n", - '"[morse: aaa]"' : "

"+FiftyOhmHtmlRenderer.render_morse_helper([[1,2],[1,2],[1,2]])+"

\n", - '"[morse: a a]"' : "

"+FiftyOhmHtmlRenderer.render_morse_helper([[1,2],[3],[1,2]])+"

\n", - '"[morse: db0]"' : "

"+FiftyOhmHtmlRenderer.render_morse_helper([[2,1,1],[2,1,1,1],[2,2,2,2,2]])+"

\n", + '"[morse:a]"': FiftyOhmHtmlRenderer.render_morse_helper([[1, 2]]), + '"[morse: a]"': FiftyOhmHtmlRenderer.render_morse_helper([[1, 2]]), + '"[morse: aaa]"': FiftyOhmHtmlRenderer.render_morse_helper([[1, 2], [1, 2], [1, 2]]), + '"[morse: a a]"': FiftyOhmHtmlRenderer.render_morse_helper([[1, 2], [3], [1, 2]]), + '"[morse: db0]"': FiftyOhmHtmlRenderer.render_morse_helper([[2, 1, 1], [2, 1, 1, 1], [2, 2, 2, 2, 2]]), } for assertion in assertions: - assert mistletoe.markdown(assertion, FiftyOhmHtmlRenderer) == assertions[assertion] \ No newline at end of file + assert mistletoe.markdown(assertion, FiftyOhmHtmlRenderer) == paragraph(assertions[assertion]) diff --git a/test/test_nonbreaking_spaces.py b/test/test_nonbreaking_spaces.py index 814662e..4b52992 100644 --- a/test/test_nonbreaking_spaces.py +++ b/test/test_nonbreaking_spaces.py @@ -1,67 +1,80 @@ import mistletoe +import pytest from renderer.fifty_ohm_html_renderer import FiftyOhmHtmlRenderer from renderer.fifty_ohm_latex_renderer import FiftyOhmLaTeXRenderer from test.util import paragraph +@pytest.mark.html def test_paragraph_html(): input = "Der Test befindet sich unter §2 vielleicht aber auch § 3." target = "Der Test befindet sich unter § 2 vielleicht aber auch § 3." assert mistletoe.markdown(input, FiftyOhmHtmlRenderer) == paragraph(target) + +@pytest.mark.html def test_three_points_html(): assertions = { - "Heute hatte ich ... zum Mittagessen." : "Heute hatte ich ... zum Mittagessen.", - "Niemals hätte ich gedacht, dass...ich ...nicht kann." : "Niemals hätte ich gedacht, dass...ich ...nicht kann.", - "Oh nein ...ein Pinguin." : "Oh nein ...ein Pinguin.", - "Haha .. . Hahaha" : "Haha .. . Hahaha" + "Heute hatte ich ... zum Mittagessen.": "Heute hatte ich ... zum Mittagessen.", + "Niemals hätte ich gedacht, dass...ich ...nicht kann.": "Niemals hätte ich gedacht, dass...ich ...nicht kann.", + "Oh nein ...ein Pinguin.": "Oh nein ...ein Pinguin.", + "Haha .. . Hahaha": "Haha .. . Hahaha", } for key, value in assertions.items(): assert mistletoe.markdown(key, FiftyOhmHtmlRenderer) == paragraph(value) +@pytest.mark.html def test_absatz_html(): input = "Der Test befindet sich unter Abs.2 vielleicht aber auch Abs. 3." target = "Der Test befindet sich unter Abs. 2 vielleicht aber auch Abs. 3." assert mistletoe.markdown(input, FiftyOhmHtmlRenderer) == paragraph(target) + +@pytest.mark.html def test_class_html(): input = "Ich lerne für Klasse A, Klasse E und Klasse N." target = "Ich lerne für Klasse A, Klasse E und Klasse N." assert mistletoe.markdown(input, FiftyOhmHtmlRenderer) == paragraph(target) + +@pytest.mark.latex def test_paragraph_latex(): input = "Der Test befindet sich unter §2 vielleicht aber auch § 3." target = "\nDer Test befindet sich unter §~2 vielleicht aber auch §~3.\n" assert mistletoe.markdown(input, FiftyOhmLaTeXRenderer) == target + +@pytest.mark.latex def test_three_points_latex(): assertions = { - "Heute hatte ich ... zum Mittagessen." : "\nHeute hatte ich~...~zum Mittagessen.\n", - "Niemals hätte ich gedacht, dass...ich ...nicht kann." : "\nNiemals hätte ich gedacht, dass...ich~...nicht kann.\n", - "Oh nein ...ein Pinguin." : "\nOh nein~...ein Pinguin.\n", - "Haha .. . Hahaha" : "\nHaha .. . Hahaha\n" + "Heute hatte ich ... zum Mittagessen.": "\nHeute hatte ich~...~zum Mittagessen.\n", + "Niemals hätte ich gedacht, dass...ich ...nicht kann.": "\nNiemals hätte ich gedacht, dass...ich~...nicht kann.\n", + "Oh nein ...ein Pinguin.": "\nOh nein~...ein Pinguin.\n", + "Haha .. . Hahaha": "\nHaha .. . Hahaha\n", } for key, value in assertions.items(): assert mistletoe.markdown(key, FiftyOhmLaTeXRenderer) == value + +@pytest.mark.latex def test_absatz_latex(): input = "Der Test befindet sich unter Abs.2 vielleicht aber auch Abs. 3." target = "\nDer Test befindet sich unter Abs.~2 vielleicht aber auch Abs.~3.\n" assert mistletoe.markdown(input, FiftyOhmLaTeXRenderer) == target + +@pytest.mark.latex def test_class_latex(): input = "Ich lerne für Klasse A, Klasse E und Klasse N." target = "\nIch lerne für Klasse~A, Klasse~E und Klasse~N.\n" assert mistletoe.markdown(input, FiftyOhmLaTeXRenderer) == target - - diff --git a/test/test_quote.py b/test/test_quote.py index deb119a..a83f8e8 100644 --- a/test/test_quote.py +++ b/test/test_quote.py @@ -1,33 +1,35 @@ import mistletoe +import pytest from renderer.fifty_ohm_html_renderer import FiftyOhmHtmlRenderer from renderer.fifty_ohm_latex_renderer import FiftyOhmLaTeXRenderer from test.util import paragraph -def test_quote_html() : - +@pytest.mark.html +def test_quote_html(): assertions = { - '"quote"' : '„quote“', - '" quote "' : '„ quote “', - '"quote" "' : '„quote“ "', - '"quo te1" filltext "qu ot e2"' : '„quo te1“ filltext „qu ot e2“', - '"quo *te1*" filltext "qu ot e2"' : '„quo te1“ filltext „qu ot e2“', - '""' : '""', + '"quote"': "„quote“", + '" quote "': "„ quote “", + '"quote" "': '„quote“ "', + '"quo te1" filltext "qu ot e2"': "„quo te1“ filltext „qu ot e2“", + '"quo *te1*" filltext "qu ot e2"': "„quo te1“ filltext „qu ot e2“", + '""': '""', } for assertion in assertions: assert mistletoe.markdown(assertion, FiftyOhmHtmlRenderer) == paragraph(assertions[assertion]) -def test_quote_latex() : +@pytest.mark.latex +def test_quote_latex(): assertions = { - '"quote"' : '\n\enquote{quote}\n', - '" quote "' : '\n\enquote{ quote }\n', - '"quote" "' : '\n\enquote{quote} "\n', - '"quo te1" filltext "qu ot e2"' : '\n\enquote{quo te1} filltext \enquote{qu ot e2}\n', - '"quo *te1*" filltext "qu ot e2"' : '\n\enquote{quo \emph{te1}} filltext \enquote{qu ot e2}\n', - '""' : '\n""\n', + '"quote"': "\n\enquote{quote}\n", + '" quote "': "\n\enquote{ quote }\n", + '"quote" "': '\n\enquote{quote} "\n', + '"quo te1" filltext "qu ot e2"': "\n\enquote{quo te1} filltext \enquote{qu ot e2}\n", + '"quo *te1*" filltext "qu ot e2"': "\n\enquote{quo \emph{te1}} filltext \enquote{qu ot e2}\n", + '""': '\n""\n', } for assertion in assertions: diff --git a/test/test_references.py b/test/test_references.py index 80dff9d..4d60018 100644 --- a/test/test_references.py +++ b/test/test_references.py @@ -1,9 +1,11 @@ import mistletoe +import pytest from renderer.fifty_ohm_html_renderer import FiftyOhmHtmlRenderer from test.util import paragraph +@pytest.mark.html def test_references_html(): # Right now this tests only the default values. # The correct behavior can be tested when the information is added to the renderer class diff --git a/test/test_tag.py b/test/test_tag.py index ca7eb26..25eefdd 100644 --- a/test/test_tag.py +++ b/test/test_tag.py @@ -1,85 +1,103 @@ import mistletoe +import pytest from renderer.fifty_ohm_html_renderer import FiftyOhmHtmlRenderer from renderer.fifty_ohm_latex_renderer import FiftyOhmLaTeXRenderer - -def test_thematic_break_html() : +@pytest.mark.html +def test_thematic_break_html(): assertions = { - "---" : '\n', - "---\n---" : '\n\n', + "---": '\n', + "---\n---": '\n\n', } for assertion in assertions: assert mistletoe.markdown(assertion, FiftyOhmHtmlRenderer) == assertions[assertion] -def test_tag_html() : +@pytest.mark.html +def test_tag_html(): assertions = { - "\nFoo\n" : FiftyOhmHtmlRenderer.render_tag_helper("margin","

Foo

",1,0)+'\n', - "\nFoo\n" : FiftyOhmHtmlRenderer.render_tag_helper("indepth","

Foo

",1,0)+'\n', - "\nFoo\n" : FiftyOhmHtmlRenderer.render_tag_helper("margin","

Foo

",1,0)+'\n', - "\nFoo\n" : FiftyOhmHtmlRenderer.render_tag_helper("tip","

Foo

",1,0)+'\n', - "\nFoo\n" : FiftyOhmHtmlRenderer.render_tag_helper("tip","

Foo

",1,0)+'\n', - "\nFoo\n" : FiftyOhmHtmlRenderer.render_tag_helper("indepth","

Foo

",1,0)+'\n', - "\nFoo\n" : FiftyOhmHtmlRenderer.render_tag_helper("unit","

Foo

",1,0)+'\n', - "\nFoo\n" : FiftyOhmHtmlRenderer.render_tag_helper("danger","

Foo

",1,0)+'\n', - "\nFoo\n" : '

Foo

\n', - "\nFoo\n" : "", + "\nFoo\n": FiftyOhmHtmlRenderer.render_tag_helper("margin", "

Foo

", 1, 0) + "\n", + "\nFoo\n": FiftyOhmHtmlRenderer.render_tag_helper("indepth", "

Foo

", 1, 0) + "\n", + "\nFoo\n": FiftyOhmHtmlRenderer.render_tag_helper("margin", "

Foo

", 1, 0) + "\n", + "\nFoo\n": FiftyOhmHtmlRenderer.render_tag_helper("tip", "

Foo

", 1, 0) + "\n", + "\nFoo\n": FiftyOhmHtmlRenderer.render_tag_helper("tip", "

Foo

", 1, 0) + "\n", + "\nFoo\n": FiftyOhmHtmlRenderer.render_tag_helper("indepth", "

Foo

", 1, 0) + + "\n", + "\nFoo\n": FiftyOhmHtmlRenderer.render_tag_helper("unit", "

Foo

", 1, 0) + "\n", + "\nFoo\n": FiftyOhmHtmlRenderer.render_tag_helper("danger", "

Foo

", 1, 0) + "\n", + "\nFoo\n": "

Foo

\n", + "\nFoo\n": "", } for assertion in assertions: assert mistletoe.markdown(assertion, FiftyOhmHtmlRenderer) == assertions[assertion] -def test_thematic_break_and_tag_html() : +@pytest.mark.html +def test_thematic_break_and_tag_html(): assertions = { - "---\n\nFoo\n" : '\n'+FiftyOhmHtmlRenderer.render_tag_helper("margin","

Foo

",1,1)+'\n', - "---\n\nFoo\n\n\nFoo\n" : '\n'+FiftyOhmHtmlRenderer.render_tag_helper("margin","

Foo

",1,1)+'\n'+FiftyOhmHtmlRenderer.render_tag_helper("margin","

Foo

",2,1)+'\n', - "---\n\nFoo\n\n---\n\nFoo\n" : '\n'+FiftyOhmHtmlRenderer.render_tag_helper("margin","

Foo

",1,1)+'\n\n'+FiftyOhmHtmlRenderer.render_tag_helper("margin","

Foo

",2,2)+'\n', + "---\n\nFoo\n": '\n' + + FiftyOhmHtmlRenderer.render_tag_helper("margin", "

Foo

", 1, 1) + + "\n", + "---\n\nFoo\n\n\nFoo\n": '\n' + + FiftyOhmHtmlRenderer.render_tag_helper("margin", "

Foo

", 1, 1) + + "\n" + + FiftyOhmHtmlRenderer.render_tag_helper("margin", "

Foo

", 2, 1) + + "\n", + "---\n\nFoo\n\n---\n\nFoo\n": '\n' + + FiftyOhmHtmlRenderer.render_tag_helper("margin", "

Foo

", 1, 1) + + '\n\n' + + FiftyOhmHtmlRenderer.render_tag_helper("margin", "

Foo

", 2, 2) + + "\n", } for assertion in assertions: assert mistletoe.markdown(assertion, FiftyOhmHtmlRenderer) == assertions[assertion] -def test_thematic_break_latex() : + +@pytest.mark.latex +def test_thematic_break_latex(): assertions = { - "---" : '', - "---\n---" : '', + "---": "", + "---\n---": "", } for assertion in assertions: assert mistletoe.markdown(assertion, FiftyOhmLaTeXRenderer) == assertions[assertion] -def test_tag_latex() : +@pytest.mark.latex +def test_tag_latex(): assertions = { - "\nFoo\n" : "\Margin{\nFoo\n}", - "\nFoo\n" : "\MarginDanger{\nFoo\n}", - "\nFoo\n" : "\MarginWarning{\nFoo\n}", - "\nFoo\n" : "\MarginAttention{\nFoo\n}", - "\nFoo\n" : "\MarginTip{\nFoo\n}", - "\nFoo\n" : "\WebTip{\nFoo\n}", - "\nFoo\n" : "\MarginUnit{\nFoo\n}", - "\nFoo\n" : "\MarginInDepth{\nFoo\n}", - "\nFoo\n" : "\MarginWebInDepth{\nFoo\n}", - "\nFoo\n" : "\WebMargin{\nFoo\n}", - "\nFoo\n" : "\FullWidth{\nFoo\n}", - "\nFoo\n" : "\nFoo\n", - "\nFoo\n" : "", + "\nFoo\n": "\Margin{\nFoo\n}", + "\nFoo\n": "\MarginDanger{\nFoo\n}", + "\nFoo\n": "\MarginWarning{\nFoo\n}", + "\nFoo\n": "\MarginAttention{\nFoo\n}", + "\nFoo\n": "\MarginTip{\nFoo\n}", + "\nFoo\n": "\WebTip{\nFoo\n}", + "\nFoo\n": "\MarginUnit{\nFoo\n}", + "\nFoo\n": "\MarginInDepth{\nFoo\n}", + "\nFoo\n": "\MarginWebInDepth{\nFoo\n}", + "\nFoo\n": "\WebMargin{\nFoo\n}", + "\nFoo\n": "\FullWidth{\nFoo\n}", + "\nFoo\n": "\nFoo\n", + "\nFoo\n": "", } for assertion in assertions: assert mistletoe.markdown(assertion, FiftyOhmLaTeXRenderer) == assertions[assertion] -def test_thematic_break_and_tag_latex() : +@pytest.mark.latex +def test_thematic_break_and_tag_latex(): assertions = { - "---\n\nFoo\n" : "\Margin{\nFoo\n}", - "---\n\nFoo\n\n\nFoo\n" : "\Margin{\nFoo\n}\Margin{\nFoo\n}", - "---\n\nFoo\n\n---\n\nFoo\n" : "\Margin{\nFoo\n}\Margin{\nFoo\n}", + "---\n\nFoo\n": "\Margin{\nFoo\n}", + "---\n\nFoo\n\n\nFoo\n": "\Margin{\nFoo\n}\Margin{\nFoo\n}", + "---\n\nFoo\n\n---\n\nFoo\n": "\Margin{\nFoo\n}\Margin{\nFoo\n}", } for assertion in assertions: - assert mistletoe.markdown(assertion, FiftyOhmLaTeXRenderer) == assertions[assertion] \ No newline at end of file + assert mistletoe.markdown(assertion, FiftyOhmLaTeXRenderer) == assertions[assertion] diff --git a/test/test_underline.py b/test/test_underline.py index 3de4ade..9edfe16 100644 --- a/test/test_underline.py +++ b/test/test_underline.py @@ -1,27 +1,29 @@ import mistletoe +import pytest from renderer.fifty_ohm_html_renderer import FiftyOhmHtmlRenderer from renderer.fifty_ohm_latex_renderer import FiftyOhmLaTeXRenderer from test.util import paragraph -def test_underline_html() : - +@pytest.mark.html +def test_underline_html(): assertions = { - "Text" : "Text", - " Text Text " : " Text Text ", - " Text *Text* " : " Text Text ", + "Text": "Text", + " Text Text ": " Text Text ", + " Text *Text* ": " Text Text ", } for assertion in assertions: assert mistletoe.markdown(assertion, FiftyOhmHtmlRenderer) == paragraph(assertions[assertion]) -def test_underline_latex() : +@pytest.mark.latex +def test_underline_latex(): assertions = { - "Text" : "\n\\underline{Text}\n", - " Text Text " : "\n\\underline{ Text Text }\n", - " Text *Text* " : "\n\\underline{ Text \emph{Text} }\n", + "Text": "\n\\underline{Text}\n", + " Text Text ": "\n\\underline{ Text Text }\n", + " Text *Text* ": "\n\\underline{ Text \emph{Text} }\n", } for assertion in assertions: