markdown: update tests to v1.4.0 (exercism#1797)

xitanggg · cmccandless · commit 4ecd1670751f · 2019-05-28T09:01:13.000-04:00
* markdown: update tests to v1.4.0 exercism#1752 * example.py: fix </ul> append bug
diff --git a/exercises/markdown/example.py b/exercises/markdown/example.py
@@ -5,10 +5,12 @@ def parse_markdown(markdown):
     lines = markdown.split('\n')
     html = ''
     in_list = False
+    in_list_append = False
     for line in lines:
-        res = parse_line(line, in_list)
+        res = parse_line(line, in_list, in_list_append)
         html += res['line']
         in_list = res['in_list']
+        in_list_append = res['in_list_append']
     if in_list:
         html += '</ul>'
     return html
@@ -47,7 +49,7 @@ def check_italic(line):
         return None
 
 
-def parse_line(line, in_list):
+def parse_line(line, in_list, in_list_append):
     res = check_headers(line)
 
     list_match = re.match(r'\* (.*)', res)
@@ -60,7 +62,7 @@ def parse_line(line, in_list):
             res = wrap(list_match.group(1), 'li')
     else:
         if in_list:
-            res += '</ul>'
+            in_list_append = True
             in_list = False
 
     if not re.match('<h|<ul|<li', res):
@@ -74,7 +76,12 @@ def parse_line(line, in_list):
     while check_italic(res):
         res = check_italic(res)
 
+    if in_list_append:
+        res = '</ul>' + res
+        in_list_append = False
+
     return {
         'line': res,
-        'in_list': in_list
+        'in_list': in_list,
+        'in_list_append': in_list_append
     }
diff --git a/exercises/markdown/markdown.py b/exercises/markdown/markdown.py
@@ -5,6 +5,7 @@ def parse_markdown(markdown):
     lines = markdown.split('\n')
     res = ''
     in_list = False
+    in_list_append = False
     for i in lines:
         if re.match('###### (.*)', i) is not None:
             i = '<h6>' + i[7:] + '</h6>'
@@ -49,7 +50,7 @@ def parse_markdown(markdown):
                 i = '<li>' + curr + '</li>'
         else:
             if in_list:
-                i = '</ul>+i'
+                in_list_append = True
                 in_list = False
 
         m = re.match('<h|<ul|<p|<li', i)
@@ -61,6 +62,9 @@ def parse_markdown(markdown):
         m = re.match('(.*)_(.*)_(.*)', i)
         if m:
             i = m.group(1) + '<em>' + m.group(2) + '</em>' + m.group(3)
+        if in_list_append:
+            i = '</ul>' + i
+            in_list_append = False
         res += i
     if in_list:
         res += '</ul>'
diff --git a/exercises/markdown/markdown_test.py b/exercises/markdown/markdown_test.py
@@ -2,7 +2,7 @@
 from markdown import parse_markdown
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.3.0
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.4.0
 
 class MarkdownTest(unittest.TestCase):
 
@@ -64,6 +64,13 @@ def test_symbols_in_the_paragraph_text_that_should_not_be_interpreted(
             parse_markdown('This is a paragraph with # and * in the text'),
             '<p>This is a paragraph with # and * in the text</p>')
 
+    def test_unordered_lists_close_properly_with_preceding_and_following_lines(
+            self):
+        self.assertEqual(
+            parse_markdown('# Start a list\n* Item 1\n* Item 2\nEnd a list'),
+            '<h1>Start a list</h1><ul><li>Item 1</li>'
+            '<li>Item 2</li></ul><p>End a list</p>')
+
 
 if __name__ == '__main__':
     unittest.main()
