[checkmk-commits] Repaired generator tests.

Module: check_mk Branch: master Commit: 6b657bd064e08d7d79462a7be6f49c16d45fd381 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b657bd064e08d… Author: Roland Halbig &lt;rh(a)mathias-kettner.de&gt; Date: Wed Feb 22 10:24:41 2017 +0100 Repaired generator tests. Change-Id: I81bf3e1f32db037d8861423772843e9d13c37fd5 --- tests/web/test_generator.py | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/tests/web/test_generator.py b/tests/web/test_generator.py index 72b0137..553b990 100644 --- a/tests/web/test_generator.py +++ b/tests/web/test_generator.py @@ -7,6 +7,7 @@ import re # internal imports from htmllib import HTML, HTMLGenerator +import tools def test_HTMLGenerator(): @@ -14,23 +15,28 @@ def test_HTMLGenerator(): html = HTMLGenerator() html.plug() - html.open_div() - assert html.drain() == "<div>" + with html.plugged(): + html.open_div() + text = html.drain() + assert text.rstrip('\n').rstrip(' ') == "<div>" + + with html.plugged(): + #html.open_div().write("test").close_div() + html.open_div() + html.write("test") + html.close_div() + assert tools.compare_html(html.drain(), "<div>test</div>") + + with html.plugged(): + #html.open_table().open_tr().td("1").td("2").close_tr().close_table() + html.open_table() + html.open_tr() + html.td("1") + html.td("2") + html.close_tr() + html.close_table() + assert tools.compare_html(html.drain(), "<table><tr><td>1</td><td>2</td></tr></table>") - #html.open_div().write("test").close_div() - html.open_div() - html.write("test") - html.close_div() - assert html.drain() == "<div>test</div>" - - #html.open_table().open_tr().td("1").td("2").close_tr().close_table() - html.open_table() - html.open_tr() - html.td("1") - html.td("2") - html.close_tr() - html.close_table() - assert html.drain() == "<table><tr><td>1</td><td>2</td></tr></table>" def test_exception_handling(): html = HTMLGenerator() @@ -38,4 +44,4 @@ def test_exception_handling(): try: raise Exception("Test") except Exception, e: - assert html.render_div(e) == "<div>%s</div>" % e + assert tools.compare_html(html.render_div(e), "<div>%s</div>" % e)