Skip to content

Commit 1df7e5f

Browse files
committed
Cleanup test_parser2.py a bit
1 parent 3065630 commit 1df7e5f

File tree

1 file changed

+20
-24
lines changed

1 file changed

+20
-24
lines changed

html5lib/tests/test_parser2.py

+20-24
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,47 @@
77
from . import support # flake8: noqa
88
from html5lib import html5parser
99
from html5lib.constants import namespaces
10-
from html5lib import treebuilders
10+
from html5lib import parse
1111

1212

1313
# tests that aren't autogenerated from text files
14-
@pytest.fixture
15-
def dom_tree():
16-
return treebuilders.getTreeBuilder("dom")
17-
18-
19-
def test_assertDoctypeCloneable(dom_tree):
20-
parser = html5parser.HTMLParser(tree=dom_tree)
21-
doc = parser.parse('<!DOCTYPE HTML>')
14+
def test_assertDoctypeCloneable():
15+
doc = parse('<!DOCTYPE HTML>', treebuilder="dom")
2216
assert doc.cloneNode(True) is not None
2317

2418

25-
def test_line_counter(dom_tree):
19+
def test_line_counter():
2620
# http://groups.google.com/group/html5lib-discuss/browse_frm/thread/f4f00e4a2f26d5c0
27-
parser = html5parser.HTMLParser(tree=dom_tree)
28-
parser.parse("<pre>\nx\n&gt;\n</pre>")
21+
assert parse("<pre>\nx\n&gt;\n</pre>") is not None
2922

3023

31-
def test_namespace_html_elements_0_dom(dom_tree):
32-
parser = html5parser.HTMLParser(tree=dom_tree, namespaceHTMLElements=True)
33-
doc = parser.parse("<html></html>")
24+
def test_namespace_html_elements_0_dom():
25+
doc = parse("<html></html>",
26+
treebuilder="dom",
27+
namespaceHTMLElements=True)
3428
assert doc.childNodes[0].namespaceURI == namespaces["html"]
3529

3630

37-
def test_namespace_html_elements_1_dom(dom_tree):
38-
parser = html5parser.HTMLParser(tree=dom_tree, namespaceHTMLElements=False)
39-
doc = parser.parse("<html></html>")
31+
def test_namespace_html_elements_1_dom():
32+
doc = parse("<html></html>",
33+
treebuilder="dom",
34+
namespaceHTMLElements=False)
4035
assert doc.childNodes[0].namespaceURI is None
4136

4237

4338
def test_namespace_html_elements_0_etree():
44-
parser = html5parser.HTMLParser(namespaceHTMLElements=True)
45-
doc = parser.parse("<html></html>")
39+
doc = parse("<html></html>",
40+
treebuilder="etree",
41+
namespaceHTMLElements=True)
4642
assert doc.tag == "{%s}html" % (namespaces["html"],)
4743

4844

4945
def test_namespace_html_elements_1_etree():
50-
parser = html5parser.HTMLParser(namespaceHTMLElements=False)
51-
doc = parser.parse("<html></html>")
46+
doc = parse("<html></html>",
47+
treebuilder="etree",
48+
namespaceHTMLElements=False)
5249
assert doc.tag == "html"
5350

5451

5552
def test_unicode_file():
56-
parser = html5parser.HTMLParser()
57-
parser.parse(io.StringIO("a"))
53+
assert parse(io.StringIO("a")) is not None

0 commit comments

Comments
 (0)