diff options
Diffstat (limited to 'bs4/tests/test_htmlparser.py')
| -rw-r--r-- | bs4/tests/test_htmlparser.py | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/bs4/tests/test_htmlparser.py b/bs4/tests/test_htmlparser.py index 0d8161e..640cb1f 100644 --- a/bs4/tests/test_htmlparser.py +++ b/bs4/tests/test_htmlparser.py @@ -8,7 +8,7 @@ from bs4.testing import SoupTest, HTMLTreeBuilderSmokeTest from bs4.builder import HTMLParserTreeBuilder from bs4.builder._htmlparser import BeautifulSoupHTMLParser -class HTMLParserTreeBuilderSmokeTest(SoupTest, HTMLTreeBuilderSmokeTest): +class TestHTMLParserTreeBuilder(SoupTest, HTMLTreeBuilderSmokeTest): default_builder = HTMLParserTreeBuilder @@ -27,30 +27,30 @@ class HTMLParserTreeBuilderSmokeTest(SoupTest, HTMLTreeBuilderSmokeTest): tree = self.soup("<a><b>foo</a>") dumped = pickle.dumps(tree, 2) loaded = pickle.loads(dumped) - self.assertTrue(isinstance(loaded.builder, type(tree.builder))) + assert isinstance(loaded.builder, type(tree.builder)) def test_redundant_empty_element_closing_tags(self): - self.assertSoupEquals('<br></br><br></br><br></br>', "<br/><br/><br/>") - self.assertSoupEquals('</br></br></br>', "") + self.assert_soup('<br></br><br></br><br></br>', "<br/><br/><br/>") + self.assert_soup('</br></br></br>', "") def test_empty_element(self): # This verifies that any buffered data present when the parser # finishes working is handled. - self.assertSoupEquals("foo &# bar", "foo &# bar") + self.assert_soup("foo &# bar", "foo &# bar") def test_tracking_line_numbers(self): # The html.parser TreeBuilder keeps track of line number and # position of each element. markup = "\n <p>\n\n<sourceline>\n<b>text</b></sourceline><sourcepos></p>" soup = self.soup(markup) - self.assertEqual(2, soup.p.sourceline) - self.assertEqual(3, soup.p.sourcepos) - self.assertEqual("sourceline", soup.p.find('sourceline').name) + assert 2 == soup.p.sourceline + assert 3 == soup.p.sourcepos + assert "sourceline" == soup.p.find('sourceline').name # You can deactivate this behavior. soup = self.soup(markup, store_line_numbers=False) - self.assertEqual("sourceline", soup.p.sourceline.name) - self.assertEqual("sourcepos", soup.p.sourcepos.name) + assert "sourceline" == soup.p.sourceline.name + assert "sourcepos" == soup.p.sourcepos.name def test_on_duplicate_attribute(self): # The html.parser tree builder has a variety of ways of @@ -61,20 +61,20 @@ class HTMLParserTreeBuilderSmokeTest(SoupTest, HTMLTreeBuilderSmokeTest): # If you don't provide any particular value for # on_duplicate_attribute, later values replace earlier values. soup = self.soup(markup) - self.assertEqual("url3", soup.a['href']) - self.assertEqual(["cls"], soup.a['class']) - self.assertEqual("id", soup.a['id']) + assert "url3" == soup.a['href'] + assert ["cls"] == soup.a['class'] + assert "id" == soup.a['id'] # You can also get this behavior explicitly. def assert_attribute(on_duplicate_attribute, expected): soup = self.soup( markup, on_duplicate_attribute=on_duplicate_attribute ) - self.assertEqual(expected, soup.a['href']) + assert expected == soup.a['href'] # Verify that non-duplicate attributes are treated normally. - self.assertEqual(["cls"], soup.a['class']) - self.assertEqual("id", soup.a['id']) + assert ["cls"] == soup.a['class'] + assert "id" == soup.a['id'] assert_attribute(None, "url3") assert_attribute(BeautifulSoupHTMLParser.REPLACE, "url3") @@ -114,11 +114,11 @@ class HTMLParserTreeBuilderSmokeTest(SoupTest, HTMLTreeBuilderSmokeTest): div = self.soup(markup).div without_element = div.encode() expect = b"<div>%s</div>" % output_unicode.encode("utf8") - self.assertEqual(without_element, expect) + assert without_element == expect with_element = div.encode(formatter="html") expect = b"<div>%s</div>" % output_element - self.assertEqual(with_element, expect) + assert with_element == expect class TestHTMLParserSubclass(SoupTest): |