aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaylan Limberg <waylan.limberg@icloud.com>2015-04-07 21:15:06 -0400
committerWaylan Limberg <waylan.limberg@icloud.com>2018-07-31 11:40:59 -0400
commitf261ffd065bcfea13d41a9861232155816c5933f (patch)
tree7add804effaaf78e6304376f3824719266b5c8c8
parentcba86d6175d00b897d6f5c4b3fec640e7309de60 (diff)
downloadmarkdown-f261ffd065bcfea13d41a9861232155816c5933f.tar.gz
markdown-f261ffd065bcfea13d41a9861232155816c5933f.tar.bz2
markdown-f261ffd065bcfea13d41a9861232155816c5933f.zip
Refactor options tests
-rw-r--r--tests/options/html4.html2
-rw-r--r--tests/options/html4.txt2
-rw-r--r--tests/test_apis.py12
-rw-r--r--tests/test_legacy.py6
4 files changed, 12 insertions, 10 deletions
diff --git a/tests/options/html4.html b/tests/options/html4.html
deleted file mode 100644
index 7c88ad7..0000000
--- a/tests/options/html4.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>A test of the most<br>
-basic of html/xhtml differences.</p> \ No newline at end of file
diff --git a/tests/options/html4.txt b/tests/options/html4.txt
deleted file mode 100644
index fddaf8e..0000000
--- a/tests/options/html4.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-A test of the most
-basic of html/xhtml differences. \ No newline at end of file
diff --git a/tests/test_apis.py b/tests/test_apis.py
index c813e56..b5c7733 100644
--- a/tests/test_apis.py
+++ b/tests/test_apis.py
@@ -695,6 +695,18 @@ class testSerializers(unittest.TestCase):
'<p>foo</p>'
)
+ def testXHTMLOutput(self):
+ self.assertEqual(
+ markdown.markdown('foo \nbar', output_format='xhtml'),
+ '<p>foo<br />\nbar</p>'
+ )
+
+ def testHTMLOutput(self):
+ self.assertEqual(
+ markdown.markdown('foo \nbar', output_format='html'),
+ '<p>foo<br>\nbar</p>'
+ )
+
class testAtomicString(unittest.TestCase):
""" Test that AtomicStrings are honored (not parsed). """
diff --git a/tests/test_legacy.py b/tests/test_legacy.py
index 0d0dd09..f4e807e 100644
--- a/tests/test_legacy.py
+++ b/tests/test_legacy.py
@@ -41,12 +41,6 @@ class TestMisc(LegacyTestCase):
location = os.path.join(parent_test_dir, 'misc')
-class TestOptions(LegacyTestCase):
- location = os.path.join(parent_test_dir, 'options')
-
- html4 = Kwargs(output_format='html4')
-
-
class TestPhp(LegacyTestCase):
"""
Notes on "excluded" tests: