Cleanup test_parser2.py a bit

adamchainz · May 20, 2016 · 1df7e5f · 1df7e5f
1 parent 3065630
commit 1df7e5f
Showing 1 changed file with 20 additions and 24 deletions.
diff --git a/html5lib/tests/test_parser2.py b/html5lib/tests/test_parser2.py
@@ -7,51 +7,47 @@
 from . import support # flake8: noqa
 from html5lib import html5parser
 from html5lib.constants import namespaces
-from html5lib import treebuilders
+from html5lib import parse
 
 
 # tests that aren't autogenerated from text files
-@pytest.fixture
-def dom_tree():
- return treebuilders.getTreeBuilder("dom")
-
-
-def test_assertDoctypeCloneable(dom_tree):
- parser = html5parser.HTMLParser(tree=dom_tree)
- doc = parser.parse('<!DOCTYPE HTML>')
+def test_assertDoctypeCloneable():
+ doc = parse('<!DOCTYPE HTML>', treebuilder="dom")
  assert doc.cloneNode(True) is not None
 
 
-def test_line_counter(dom_tree):
+def test_line_counter():
  # https://groups.google.com/group/html5lib-discuss/browse_frm/thread/f4f00e4a2f26d5c0
- parser = html5parser.HTMLParser(tree=dom_tree)
- parser.parse("<pre>\nx\n&gt;\n</pre>")
+ assert parse("<pre>\nx\n&gt;\n</pre>") is not None
 
 
-def test_namespace_html_elements_0_dom(dom_tree):
- parser = html5parser.HTMLParser(tree=dom_tree, namespaceHTMLElements=True)
- doc = parser.parse("<html></html>")
+def test_namespace_html_elements_0_dom():
+ doc = parse("<html></html>",
+ treebuilder="dom",
+ namespaceHTMLElements=True)
  assert doc.childNodes[0].namespaceURI == namespaces["html"]
 
 
-def test_namespace_html_elements_1_dom(dom_tree):
- parser = html5parser.HTMLParser(tree=dom_tree, namespaceHTMLElements=False)
- doc = parser.parse("<html></html>")
+def test_namespace_html_elements_1_dom():
+ doc = parse("<html></html>",
+ treebuilder="dom",
+ namespaceHTMLElements=False)
  assert doc.childNodes[0].namespaceURI is None
 
 
 def test_namespace_html_elements_0_etree():
- parser = html5parser.HTMLParser(namespaceHTMLElements=True)
- doc = parser.parse("<html></html>")
+ doc = parse("<html></html>",
+ treebuilder="etree",
+ namespaceHTMLElements=True)
  assert doc.tag == "{%s}html" % (namespaces["html"],)
 
 
 def test_namespace_html_elements_1_etree():
- parser = html5parser.HTMLParser(namespaceHTMLElements=False)
- doc = parser.parse("<html></html>")
+ doc = parse("<html></html>",
+ treebuilder="etree",
+ namespaceHTMLElements=False)
  assert doc.tag == "html"
 
 
 def test_unicode_file():
- parser = html5parser.HTMLParser()
- parser.parse(io.StringIO("a"))
+ assert parse(io.StringIO("a")) is not None