Fixed a bunch of tests

Author: sesquideus

core/builder/convertor.py

@@ -115,7 +115,8 @@ def __init__(self, output_format: str, locale_code: str, infile, outfile, **opti
         self.math = options.get('math', 'mathjax')
         self.file = None
 
-        assert output_format in ['html', 'latex'], "Output format is neither 'html' nor 'latex'!"
+        assert output_format in ['html', 'latex'], \
+            "Output format is neither 'html' nor 'latex'!"
 
         # regexes = yaml.safe_load(open('core/builder/regexes.yaml', 'rb'))
 

core/tests/test_convertor.py

@@ -62,7 +62,8 @@ class TestImages:
     def test_image_latex(self, convert):
         output = convert('latex', 'sk', '![Masívna ryba](ryba.svg){#fig:ryba height=47mm}')
         output = output.replace('\n', ' ')
-        assert re.search(r'\\insertPicture\[width=\\textwidth,height=47mm]{.*}', output) is not None
+        assert re.search(r'\\insertPicture\[width=\\textwidth,height=47mm]{.*}', output) is not None, \
+            f"Got '{output}'"
         assert 'ryba.pdf' in output
 
     def test_image_latex_multiline(self, convert):
@@ -72,7 +73,8 @@ def test_image_latex_multiline(self, convert):
 Aj s newlinami.](file.png){#fig:long height=53mm}
 """)
         output = output.replace('\n', ' ')
-        assert re.search(r'\\insertPicture\[width=\\textwidth,height=53mm]{.*}', output) is not None
+        assert re.search(r'\\insertPicture\[width=\\textwidth,height=53mm]{.*}', output) is not None, \
+            f"Got '{output}'"
         assert 'file.png' in output
 
     def test_image_html(self, convert):
@@ -97,23 +99,27 @@ def test_image_html_multiline(self, convert):
 class TestTags:
     def test_h_latex(self, convert):
         output = convert('latex', 'en', '@H this should not be seen!')
-        assert output == '\n'
+        assert output == '', \
+            f"Got '{output}'"
 
     def test_h_html(self, convert):
         output = convert('html', 'en', '@H this should not be seen!')
-        assert output == '<p>this should not be seen!</p>\n'
+        assert output == '<p>this should not be seen!</p>', \
+            f"Got '{output}'"
 
     def test_l_latex(self, convert):
         output = convert('latex', 'en', '@L this should not be seen!')
-        assert output == 'this should not be seen!\n'
+        assert output == 'this should not be seen!', \
+            f"Got '{output}'"
 
     def test_l_html(self, convert):
         output = convert('html', 'en', '@L this should not be seen!')
-        assert output == '\n'
+        assert output == '', \
+            f"Got '{output}'"
 
     def test_e_latex(self, convert):
         output = convert('latex', 'sk', '@E error')
-        assert re.match(r'\\errorMessage\{error}\n', output) is not None
+        assert re.match(r'\\errorMessage\{error}', output) is not None
 
     def test_e_html(self, convert):
         output = convert('html', 'sk', '@E error')

core/tests/test_jinja.py

@@ -41,29 +41,21 @@ def create_temporary_file(string):
     return ntf
 
 
-def render_string_to_temporary(string, context) -> list[str]:
-    renderer = MarkdownJinjaRenderer(template=string)
-    output = SpooledTemporaryFile(0, 'r+')
-    renderer.render(context, outfile=output)
-    output.seek(0)
+def render_string_to_temporary(string, context) -> str:
+    renderer = MarkdownJinjaRenderer()
+    return renderer.render(string, context)
 
-    return output.readlines()
 
-
-def render_file_to_temporary(source, context) -> list[str]:
+def render_file_to_temporary(source, context) -> str:
+    renderer = MarkdownJinjaRenderer()
     with open(source, 'r' ) as file:
-        renderer = MarkdownJinjaRenderer(template=file.read())
-        output = SpooledTemporaryFile(0, 'r+')
-        renderer.render(context, outfile=output)
-        output.seek(0)
-
-    return output.readlines()
+        return renderer.render(file.read(), context)
 
 
 class TestConstant:
     @pytest.mark.parametrize("template,expected", [
         pytest.param('hello', 'hello', id='hello'),
-        pytest.param(r'(§ large §) < (§ giga|g §)', r'123456789 < e\+?09\n', id='complex'),
+        pytest.param(r'(§ large §) < (§ giga|g §)', r'123456789 < e\+?09', id='complex'),
         pytest.param('(§ your_mom|g5 §)', r'3.14e\+?15\n?', id='sci5'),
         pytest.param('(§ small|g4 §)', r'2.443e-19\n?', id='sci-small'),
         pytest.param('(§ (small * your_mom * five**5)|g5 §)', r'2.3975\n?', id='complex-expression'),
@@ -72,7 +64,7 @@ class TestConstant:
     ])
     def test_render(self, template, expected, context_simple) -> None:
         rr = re.compile(expected)
-        output = render_string_to_temporary(template, context_simple)[0]
+        output = render_string_to_temporary(template, context_simple)
         assert rr.match(output), output
 
     @pytest.mark.parametrize("source,expected", [
@@ -92,7 +84,7 @@ def test_render(self, template, expected, context_simple) -> None:
     ])
     def test_does_it_render(self, source, expected, context_simple) -> None:
         result = render_file_to_temporary(Path('core/tests') / 'snippets' / source, context_simple)
-        assert result == [f"{expected}\n"], \
+        assert result == expected, \
             f"Expected {expected}, got {result}"
 
     @pytest.mark.parametrize("name,expected,digits", [