diff options
Diffstat (limited to 'creole/tests')
| -rw-r--r-- | creole/tests/test_creole2html.py | 17 | ||||
| -rw-r--r-- | creole/tests/test_cross_compare_creole.py | 13 | ||||
| -rw-r--r-- | creole/tests/test_html2creole.py | 14 | ||||
| -rw-r--r-- | creole/tests/utils/base_unittest.py | 43 | ||||
| -rw-r--r-- | creole/tests/utils/utils.py | 5 |
5 files changed, 54 insertions, 38 deletions
diff --git a/creole/tests/test_creole2html.py b/creole/tests/test_creole2html.py index dc93561..2e12b21 100644 --- a/creole/tests/test_creole2html.py +++ b/creole/tests/test_creole2html.py @@ -326,9 +326,7 @@ class TestCreole2htmlMarkup(BaseCreoleTest): the|text <p>the end</p> """, - emitter_kwargs={ - "macros":test_macros, - } + macros=test_macros, ) def test_macro_html1(self): @@ -345,9 +343,7 @@ class TestCreole2htmlMarkup(BaseCreoleTest): <p>inline: {...} code</p> """, - emitter_kwargs={ - "macros":example_macros, - } + macros=example_macros, ) def test_macro_not_exist1(self): @@ -376,7 +372,7 @@ class TestCreole2htmlMarkup(BaseCreoleTest): </p> """ - self.assert_creole2html(source_string, should_string, emitter_kwargs={"verbose":1}) + self.assert_creole2html(source_string, should_string, verbose=1) #---------------------------------------------------------------------- # Test with verbose=2 ans a StringIO stderr handler @@ -389,7 +385,7 @@ class TestCreole2htmlMarkup(BaseCreoleTest): <p>wrong macro line:<br /> [Error: Wrong macro arguments: '>Some funky page summary.<</summary' for macro 'summary' (maybe wrong macro tag syntax?)] </p> - """, + """, #verbose=True ) def test_macro_not_exist2(self): @@ -411,10 +407,7 @@ class TestCreole2htmlMarkup(BaseCreoleTest): <p>inline macro:<br /> </p> - """, - emitter_kwargs={ - "verbose":0, - } + """, verbose=False ) def test_image(self): diff --git a/creole/tests/test_cross_compare_creole.py b/creole/tests/test_cross_compare_creole.py index 60486c3..9127b66 100644 --- a/creole/tests/test_cross_compare_creole.py +++ b/creole/tests/test_cross_compare_creole.py @@ -428,15 +428,10 @@ class CrossCompareCreoleTests(BaseCreoleTest): <p>555<x />666</p> """, - # use macro in creole2html emitter - html_emitter_kwargs={ - "macros":example_macros, - - }, - # escape unknown tags with <<html>> in html2creole emitter - creole_emitter_kwargs={ - "unknown_emit":use_html_macro, - } + # use macro in creole2html emitter: + macros=example_macros, + # escape unknown tags with <<html>> in html2creole emitter: + unknown_emit=use_html_macro, ) def test_entities(self): diff --git a/creole/tests/test_html2creole.py b/creole/tests/test_html2creole.py index 14aab93..0b38ad5 100644 --- a/creole/tests/test_html2creole.py +++ b/creole/tests/test_html2creole.py @@ -66,7 +66,7 @@ class TestHtml2CreoleMarkup(BaseCreoleTest): self.assertRaises(NotImplementedError, html2creole, html_string="<unknwon>", - emitter_kwargs={"unknown_emit":raise_unknown_node} + unknown_emit=raise_unknown_node ) def test_use_html_macro(self): @@ -85,7 +85,7 @@ class TestHtml2CreoleMarkup(BaseCreoleTest): <p>555<unknown />666</p> """, - emitter_kwargs={"unknown_emit":use_html_macro} + unknown_emit=use_html_macro ) def test_escape_unknown_nodes(self): @@ -104,7 +104,7 @@ class TestHtml2CreoleMarkup(BaseCreoleTest): <p>555<unknown />666</p> """, - emitter_kwargs={"unknown_emit":escape_unknown_nodes} + unknown_emit=escape_unknown_nodes ) def test_escape_unknown_nodes2(self): @@ -119,7 +119,7 @@ class TestHtml2CreoleMarkup(BaseCreoleTest): var js_sha_link='<p>***</p>'; </script> """, - emitter_kwargs={"unknown_emit":escape_unknown_nodes} + unknown_emit=escape_unknown_nodes ) def test_transparent_unknown_nodes(self): @@ -132,7 +132,7 @@ class TestHtml2CreoleMarkup(BaseCreoleTest): //baz//, **quux** """, """ <form class="foo" id="bar"><label><em>baz</em></label>, <strong>quux</strong></form> - """, emitter_kwargs={"unknown_emit":transparent_unknown_nodes} + """, unknown_emit=transparent_unknown_nodes ) def test_transparent_unknown_nodes2(self): @@ -144,7 +144,7 @@ class TestHtml2CreoleMarkup(BaseCreoleTest): FOO var a='<em>STRONG</em>'; BAR """, """ <p>FOO <script>var a='<em>STRONG</em>';</script> BAR</p> - """, emitter_kwargs={"unknown_emit":transparent_unknown_nodes} + """, unknown_emit=transparent_unknown_nodes ) def test_transparent_unknown_nodes_block_elements(self): @@ -160,7 +160,7 @@ class TestHtml2CreoleMarkup(BaseCreoleTest): """, """ <div><em>baz</em>,</div> <fieldset><strong>quux</strong></fieldset> <span>spam, </span><label>ham, </label>and eggs - """, emitter_kwargs={"unknown_emit":transparent_unknown_nodes} + """, unknown_emit=transparent_unknown_nodes ) #-------------------------------------------------------------------------- diff --git a/creole/tests/utils/base_unittest.py b/creole/tests/utils/base_unittest.py index bfaf30f..f1eaede 100644 --- a/creole/tests/utils/base_unittest.py +++ b/creole/tests/utils/base_unittest.py @@ -105,12 +105,17 @@ class BaseCreoleTest(MarkupTest): f(member, container, *args, **kwargs) def assert_creole2html(self, raw_creole, raw_html, \ - strip_lines=False, debug=False, parser_kwargs={}, emitter_kwargs={}): + strip_lines=False, debug=False, + parser_kwargs={}, emitter_kwargs={}, + block_rules=None, blog_line_breaks=True, macros=None, verbose=None, stderr=None, + ): """ compare the generated html code from the markup string >creole_string< with the >html_string< reference. """ self.assertNotEqual(raw_creole, raw_html) + self.assertEqual(parser_kwargs, {}, "parser_kwargs is deprecated!") + self.assertEqual(emitter_kwargs, {}, "parser_kwargs is deprecated!") # prepare whitespace on test strings markup_string = self._prepare_text(raw_creole) @@ -125,7 +130,9 @@ class BaseCreoleTest(MarkupTest): # convert creole markup into html code out_string = creole2html( - markup_string, debug, parser_kwargs, emitter_kwargs + markup_string, debug, + block_rules=block_rules, blog_line_breaks=blog_line_breaks, + macros=macros, verbose=verbose, stderr=stderr, ) if debug: self._debug_text("assert_creole2html() creole2html", out_string) @@ -139,11 +146,18 @@ class BaseCreoleTest(MarkupTest): self.assertEqual(out_string, html_string, msg="creole2html") def assert_html2creole(self, raw_creole, raw_html, \ - strip_lines=False, debug=False, parser_kwargs={}, emitter_kwargs={}): + strip_lines=False, debug=False, + # OLD API: + parser_kwargs={}, emitter_kwargs={}, + # html2creole: + unknown_emit=None + ): """ Compare the genereted markup from the given >raw_html< html code, with the given >creole_string< reference string. """ + self.assertEqual(parser_kwargs, {}, "parser_kwargs is deprecated!") + self.assertEqual(emitter_kwargs, {}, "parser_kwargs is deprecated!") # assert isinstance(raw_html, TEXT_TYPE) # creole_string = unicode(creole_string, encoding="utf8") # raw_html = unicode(raw_html, "utf8") @@ -160,7 +174,7 @@ class BaseCreoleTest(MarkupTest): assert isinstance(html, TEXT_TYPE) # convert html code into creole markup - out_string = html2creole(html, debug, parser_kwargs, emitter_kwargs) + out_string = html2creole(html, debug, unknown_emit=unknown_emit) if debug: self._debug_text("assert_html2creole() html2creole", out_string) @@ -169,28 +183,39 @@ class BaseCreoleTest(MarkupTest): def cross_compare_creole(self, creole_string, html_string, strip_lines=False, debug=False, - # creole2html: + # creole2html old API: creole_parser_kwargs={}, html_emitter_kwargs={}, - # html2creole: + # html2creole old API: html_parser_kwargs={}, creole_emitter_kwargs={}, - ): + + # creole2html new API: + block_rules=None, blog_line_breaks=True, macros=None, stderr=None, + # html2creole: + unknown_emit=None + ): """ Cross compare with: * creole2html * html2creole """ + self.assertEqual(creole_parser_kwargs, {}, "creole_parser_kwargs is deprecated!") + self.assertEqual(html_emitter_kwargs, {}, "html_emitter_kwargs is deprecated!") + self.assertEqual(html_parser_kwargs, {}, "html_parser_kwargs is deprecated!") + self.assertEqual(creole_emitter_kwargs, {}, "creole_emitter_kwargs is deprecated!") + assert isinstance(creole_string, TEXT_TYPE) assert isinstance(html_string, TEXT_TYPE) self.assertNotEqual(creole_string, html_string) self.assert_creole2html( creole_string, html_string, strip_lines, debug, - creole_parser_kwargs, html_emitter_kwargs + block_rules=block_rules, blog_line_breaks=blog_line_breaks, + macros=macros, stderr=stderr, ) self.assert_html2creole( creole_string, html_string, strip_lines, debug, - html_parser_kwargs, creole_emitter_kwargs + unknown_emit=unknown_emit, ) def assert_html2textile(self, textile_string, html_string, \ diff --git a/creole/tests/utils/utils.py b/creole/tests/utils/utils.py index 34e659a..ef202e0 100644 --- a/creole/tests/utils/utils.py +++ b/creole/tests/utils/utils.py @@ -56,7 +56,10 @@ class MarkupTest(unittest.TestCase): #~ first = first.rstrip("\\n") #~ second = second.rstrip("\\n") - diff = make_diff(first, second) + try: + diff = make_diff(first, second) + except AttributeError: + raise self.failureException("%s is not %s" % (repr(first), repr(second))) if VERBOSE >= 2: print("diff: %r" % diff) |