Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit3065630

Browse files
committed
Get rid of last remenents of our usage of the stdlib unittest
1 parent8cb66f2 commit3065630

File tree

4 files changed

+315
-352
lines changed

4 files changed

+315
-352
lines changed

‎html5lib/tests/test_encoding.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
from __future__importabsolute_import,division,unicode_literals
22

33
importos
4-
importunittest
5-
6-
try:
7-
unittest.TestCase.assertEqual
8-
exceptAttributeError:
9-
unittest.TestCase.assertEqual=unittest.TestCase.assertEquals
104

115
from .supportimportget_data_files,test_dir,errorMessage,TestDataas_TestData
126
fromhtml5libimportHTMLParser,inputstream

‎html5lib/tests/test_parser2.py‎

Lines changed: 32 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,56 @@
22

33
importio
44

5+
importpytest
6+
57
from .importsupport# flake8: noqa
68
fromhtml5libimporthtml5parser
79
fromhtml5lib.constantsimportnamespaces
810
fromhtml5libimporttreebuilders
911

10-
importunittest
1112

1213
# tests that aren't autogenerated from text files
14+
@pytest.fixture
15+
defdom_tree():
16+
returntreebuilders.getTreeBuilder("dom")
1317

1418

15-
classMoreParserTests(unittest.TestCase):
16-
17-
defsetUp(self):
18-
self.dom_tree=treebuilders.getTreeBuilder("dom")
19+
deftest_assertDoctypeCloneable(dom_tree):
20+
parser=html5parser.HTMLParser(tree=dom_tree)
21+
doc=parser.parse('<!DOCTYPE HTML>')
22+
assertdoc.cloneNode(True)isnotNone
1923

20-
deftest_assertDoctypeCloneable(self):
21-
parser=html5parser.HTMLParser(tree=self.dom_tree)
22-
doc=parser.parse('<!DOCTYPE HTML>')
23-
self.assertTrue(doc.cloneNode(True))
2424

25-
deftest_line_counter(self):
26-
# http://groups.google.com/group/html5lib-discuss/browse_frm/thread/f4f00e4a2f26d5c0
27-
parser=html5parser.HTMLParser(tree=self.dom_tree)
28-
parser.parse("<pre>\nx\n&gt;\n</pre>")
25+
deftest_line_counter(dom_tree):
26+
# 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>")
2929

30-
deftest_namespace_html_elements_0_dom(self):
31-
parser=html5parser.HTMLParser(tree=self.dom_tree,namespaceHTMLElements=True)
32-
doc=parser.parse("<html></html>")
33-
self.assertTrue(doc.childNodes[0].namespaceURI==namespaces["html"])
3430

35-
deftest_namespace_html_elements_1_dom(self):
36-
parser=html5parser.HTMLParser(tree=self.dom_tree,namespaceHTMLElements=False)
37-
doc=parser.parse("<html></html>")
38-
self.assertTrue(doc.childNodes[0].namespaceURIisNone)
31+
deftest_namespace_html_elements_0_dom(dom_tree):
32+
parser=html5parser.HTMLParser(tree=dom_tree,namespaceHTMLElements=True)
33+
doc=parser.parse("<html></html>")
34+
assertdoc.childNodes[0].namespaceURI==namespaces["html"]
3935

40-
deftest_namespace_html_elements_0_etree(self):
41-
parser=html5parser.HTMLParser(namespaceHTMLElements=True)
42-
doc=parser.parse("<html></html>")
43-
self.assertTrue(doc.tag=="{%s}html"% (namespaces["html"],))
4436

45-
deftest_namespace_html_elements_1_etree(self):
46-
parser=html5parser.HTMLParser(namespaceHTMLElements=False)
47-
doc=parser.parse("<html></html>")
48-
self.assertTrue(doc.tag=="html")
37+
deftest_namespace_html_elements_1_dom(dom_tree):
38+
parser=html5parser.HTMLParser(tree=dom_tree,namespaceHTMLElements=False)
39+
doc=parser.parse("<html></html>")
40+
assertdoc.childNodes[0].namespaceURIisNone
4941

50-
deftest_unicode_file(self):
51-
parser=html5parser.HTMLParser()
52-
parser.parse(io.StringIO("a"))
5342

43+
deftest_namespace_html_elements_0_etree():
44+
parser=html5parser.HTMLParser(namespaceHTMLElements=True)
45+
doc=parser.parse("<html></html>")
46+
assertdoc.tag=="{%s}html"% (namespaces["html"],)
5447

55-
defbuildTestSuite():
56-
returnunittest.defaultTestLoader.loadTestsFromName(__name__)
5748

49+
deftest_namespace_html_elements_1_etree():
50+
parser=html5parser.HTMLParser(namespaceHTMLElements=False)
51+
doc=parser.parse("<html></html>")
52+
assertdoc.tag=="html"
5853

59-
defmain():
60-
buildTestSuite()
61-
unittest.main()
6254

63-
if__name__=='__main__':
64-
main()
55+
deftest_unicode_file():
56+
parser=html5parser.HTMLParser()
57+
parser.parse(io.StringIO("a"))

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp