You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2022/02/11 17:36:38 UTC
[allura] 01/12: [#8408] stronger markdown test. and don't use deprecated unittest methods
This is an automated email from the ASF dual-hosted git repository.
kentontaylor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
commit c9096c5940c90b96f1479302ff226c401f88dcc1
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Tue Jan 18 12:09:49 2022 -0500
[#8408] stronger markdown test. and don't use deprecated unittest methods
---
Allura/allura/tests/test_globals.py | 54 ++++++++++++++++++++++++++++++-------
AlluraTest/alluratest/tools.py | 4 +--
2 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 8a38cc7..3a3ecd0 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -449,27 +449,61 @@ def test_markdown_big_text():
def test_markdown_basics():
with h.push_context('test', 'wiki', neighborhood='Projects'):
text = g.markdown.convert('# Foo!\n[Home]')
- assert '<a class="alink" href="/p/test/wiki/Home/">[Home]</a>' in text, text
+ assert_equal(text,
+ '<div class="markdown_content"><h1 id="foo">Foo!</h1>\n'
+ '<p><a class="alink" href="/p/test/wiki/Home/">[Home]</a></p></div>')
text = g.markdown.convert('# Foo!\n[Rooted]')
- assert '<a href=' not in text, text
+ assert_equal(text,
+ '<div class="markdown_content"><h1 id="foo">Foo!</h1>\n'
+ '<p><span>[Rooted]</span></p></div>')
- assert '<br' in g.markdown.convert('Multi\nLine'), g.markdown.convert('Multi\nLine')
- assert '<br' not in g.markdown.convert('Multi\n\nLine')
+ assert_equal(
+ g.markdown.convert('Multi\nLine'),
+ '<div class="markdown_content"><p>Multi<br/>\n'
+ 'Line</p></div>')
+ assert_equal(
+ g.markdown.convert('Multi\n\nLine'),
+ '<div class="markdown_content"><p>Multi</p>\n'
+ '<p>Line</p></div>')
- g.markdown.convert("<class 'foo'>") # should not raise an exception
- assert '<br' not in g.markdown.convert('''# Header
+ # should not raise an exception:
+ assert_equal(
+ g.markdown.convert("<class 'foo'>"),
+ '''<div class="markdown_content"><p><class 'foo'=""></class></p></div>''')
+
+ assert_equal(
+ g.markdown.convert('''# Header
Some text in a regular paragraph
:::python
for i in range(10):
print i
-''')
- assert_in('http://localhost/', g.forge_markdown(email=True).convert('[Home]'))
- assert 'class="codehilite"' in g.markdown.convert('''
+'''),
+ # no <br
+ '<div class="markdown_content"><h1 id="header">Header</h1>\n'
+ '<p>Some text in a regular paragraph</p>\n'
+ '<div class="codehilite"><pre><span></span><span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">10</span><span class="p">):</span>\n'
+ ' <span class="nb">print</span> <span class="n">i</span>\n'
+ '</pre></div>\n'
+ '\n'
+ '</div>'
+ )
+ assert_equal(
+ g.forge_markdown(email=True).convert('[Home]'),
+ # uses localhost:
+ '<div class="markdown_content"><p><a class="alink" href="http://localhost/p/test/wiki/Home/">[Home]</a></p></div>'
+ )
+ assert_equal(
+ g.markdown.convert('''
~~~~
def foo(): pass
-~~~~''')
+~~~~'''),
+ '<div class="markdown_content"><div class="codehilite"><pre><span></span>def foo(): pass\n'
+ '</pre></div>\n'
+ '\n'
+ '</div>'
+ )
def test_markdown_autolink():
diff --git a/AlluraTest/alluratest/tools.py b/AlluraTest/alluratest/tools.py
index 71a9a6a..efd93e9 100644
--- a/AlluraTest/alluratest/tools.py
+++ b/AlluraTest/alluratest/tools.py
@@ -50,7 +50,7 @@ def assert_equal(*a, **kw):
def assert_equals(*a, **kw):
- return testcase.assertEquals(*a, **kw)
+ return testcase.assertEqual(*a, **kw)
def assert_not_equal(*a, **kw):
@@ -102,7 +102,7 @@ def assert_greater_equal(*a, **kw):
def assert_regexp_matches(*a, **kw):
- return testcase.assertRegexpMatches(*a, **kw)
+ return testcase.assertRegex(*a, **kw)
#