Foo
Bar
Baz

' soup = self.soup(markup) - self.assertEqual(['foo', 'bar'], soup.div['class']) + assert ['foo', 'bar'] == soup.div['class'] # If you search by the literal name of the class it's like the whitespace # wasn't there. - self.assertEqual(soup.div, soup.find('div', class_="foo bar")) + assert soup.div == soup.find('div', class_="foo bar") def test_deeply_nested_multivalued_attribute(self): # html5lib can set the attributes of the same tag many times @@ -562,7 +556,7 @@ Hello, world! # multivalued attributes. markup = '

' soup = self.soup(markup) - self.assertEqual(["css"], soup.div.div['class']) + assert ["css"] == soup.div.div['class'] def test_multivalued_attribute_on_html(self): # html5lib uses a different API to set the attributes ot the @@ -570,21 +564,21 @@ Hello, world! # attributes. markup = '' soup = self.soup(markup) - self.assertEqual(["a", "b"], soup.html['class']) + assert ["a", "b"] == soup.html['class'] def test_angle_brackets_in_attribute_values_are_escaped(self): - self.assertSoupEquals('', '') + self.assert_soup('', '') def test_strings_resembling_character_entity_references(self): # "&T" and "&p" look like incomplete character entities, but they are # not. - self.assertSoupEquals( + self.assert_soup( "

• AT&T is in the s&p 500

", "

\u2022 AT&T is in the s&p 500

" ) def test_apos_entity(self): - self.assertSoupEquals( + self.assert_soup( "

Bob's Bar

", "

Bob's Bar

", ) @@ -599,45 +593,45 @@ Hello, world! # characters. markup = "

“Hello” -☃

" soup = self.soup(markup) - self.assertEqual("“Hello” -☃", soup.p.string) + assert "“Hello” -☃" == soup.p.string def test_entities_in_attributes_converted_to_unicode(self): expect = '

' - self.assertSoupEquals('

', expect) - self.assertSoupEquals('

', expect) + self.assert_soup('

', expect) def test_entities_in_text_converted_to_unicode(self): expect = '

pi\N{LATIN SMALL LETTER N WITH TILDE}ata

' - self.assertSoupEquals("

piñata

", expect) - self.assertSoupEquals("

piñata

", expect) - self.assertSoupEquals("

piñata

", expect) - self.assertSoupEquals("

piñata

", expect) + self.assert_soup("

piñata

", expect) + self.assert_soup("

piñata

", expect) + self.assert_soup("

piñata

", expect) + self.assert_soup("

piñata

", expect) def test_quot_entity_converted_to_quotation_mark(self): - self.assertSoupEquals("

I said "good day!"

", + self.assert_soup("

I said "good day!"

", '

I said "good day!"

') def test_out_of_range_entity(self): expect = "\N{REPLACEMENT CHARACTER}" - self.assertSoupEquals("�", expect) - self.assertSoupEquals("�", expect) - self.assertSoupEquals("�", expect) + self.assert_soup("�", expect) + self.assert_soup("�", expect) + self.assert_soup("�", expect) def test_multipart_strings(self): "Mostly to prevent a recurrence of a bug in the html5lib treebuilder." soup = self.soup("

\nfoo

") - self.assertEqual("p", soup.h2.string.next_element.name) - self.assertEqual("p", soup.p.name) + assert "p" == soup.h2.string.next_element.name + assert "p" == soup.p.name self.assertConnectedness(soup) def test_empty_element_tags(self): """Verify consistent handling of empty-element tags, no matter how they come in through the markup. """ - self.assertSoupEquals('

', "

") - self.assertSoupEquals('

', "

") + self.assert_soup('

', "

") + self.assert_soup('

', "

") def test_head_tag_between_head_and_body(self): "Prevent recurrence of a bug in the html5lib treebuilder." @@ -647,7 +641,7 @@ Hello, world! """ soup = self.soup(content) - self.assertNotEqual(None, soup.html.body) + assert soup.html.body is not None self.assertConnectedness(soup) def test_multiple_copies_of_a_tag(self): @@ -674,18 +668,16 @@ Hello, world! markup = b'4' soup = self.soup(markup) - self.assertEqual(markup, soup.encode()) + assert markup == soup.encode() html = soup.html - self.assertEqual('http://www.w3.org/1999/xhtml', soup.html['xmlns']) - self.assertEqual( - 'http://www.w3.org/1998/Math/MathML', soup.html['xmlns:mathml']) - self.assertEqual( - 'http://www.w3.org/2000/svg', soup.html['xmlns:svg']) + assert 'http://www.w3.org/1999/xhtml' == soup.html['xmlns'] + assert 'http://www.w3.org/1998/Math/MathML' == soup.html['xmlns:mathml'] + assert 'http://www.w3.org/2000/svg' == soup.html['xmlns:svg'] def test_multivalued_attribute_value_becomes_list(self): markup = b'' soup = self.soup(markup) - self.assertEqual(['foo', 'bar'], soup.a['class']) + assert ['foo', 'bar'] == soup.a['class'] # # Generally speaking, tests below this point are more tests of @@ -700,67 +692,65 @@ Hello, world! # encoding found in the declaration! The horror! markup = 'Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!' soup = self.soup(markup) - self.assertEqual('Sacr\xe9 bleu!', soup.body.string) + assert 'Sacr\xe9 bleu!' == soup.body.string def test_soupstrainer(self): """Parsers should be able to work with SoupStrainers.""" strainer = SoupStrainer("b") soup = self.soup("A bold statement", parse_only=strainer) - self.assertEqual(soup.decode(), "bold") + assert soup.decode() == "bold" def test_single_quote_attribute_values_become_double_quotes(self): - self.assertSoupEquals("", + self.assert_soup("", '') def test_attribute_values_with_nested_quotes_are_left_alone(self): text = """a""" - self.assertSoupEquals(text) + self.assert_soup(text) def test_attribute_values_with_double_nested_quotes_get_quoted(self): text = """a""" soup = self.soup(text) soup.foo['attr'] = 'Brawls happen at "Bob\'s Bar"' - self.assertSoupEquals( + self.assert_soup( soup.foo.decode(), """a""") def test_ampersand_in_attribute_value_gets_escaped(self): - self.assertSoupEquals('', + self.assert_soup('', '') - self.assertSoupEquals( + self.assert_soup( 'foo', 'foo') def test_escaped_ampersand_in_attribute_value_is_left_alone(self): - self.assertSoupEquals('') + self.assert_soup('') def test_entities_in_strings_converted_during_parsing(self): # Both XML and HTML entities are converted to Unicode characters # during parsing. text = "

<<sacré bleu!>>

" expected = "

<<sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!>>

" - self.assertSoupEquals(text, expected) + self.assert_soup(text, expected) def test_smart_quotes_converted_on_the_way_in(self): # Microsoft smart quotes are converted to Unicode characters during # parsing. quote = b"

\x91Foo\x92

" soup = self.soup(quote) - self.assertEqual( - soup.p.string, - "\N{LEFT SINGLE QUOTATION MARK}Foo\N{RIGHT SINGLE QUOTATION MARK}") + assert soup.p.string == "\N{LEFT SINGLE QUOTATION MARK}Foo\N{RIGHT SINGLE QUOTATION MARK}" def test_non_breaking_spaces_converted_on_the_way_in(self): soup = self.soup(" ") - self.assertEqual(soup.a.string, "\N{NO-BREAK SPACE}" * 2) + assert soup.a.string == "\N{NO-BREAK SPACE}" * 2 def test_entities_converted_on_the_way_out(self): text = "

<<sacré bleu!>>

" expected = "

<<sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!>>

".encode("utf-8") soup = self.soup(text) - self.assertEqual(soup.p.encode("utf-8"), expected) + assert soup.p.encode("utf-8") == expected def test_real_iso_latin_document(self): # Smoke test of interrelated functionality, using an @@ -787,7 +777,7 @@ Hello, world! expected = expected.encode("utf-8") # Ta-da! - self.assertEqual(result, expected) + assert result == expected def test_real_shift_jis_document(self): # Smoke test to make sure the parser can handle a document in @@ -803,8 +793,8 @@ Hello, world! # Make sure the parse tree is correctly encoded to various # encodings. - self.assertEqual(soup.encode("utf-8"), unicode_html.encode("utf-8")) - self.assertEqual(soup.encode("euc_jp"), unicode_html.encode("euc_jp")) + assert soup.encode("utf-8") == unicode_html.encode("utf-8") + assert soup.encode("euc_jp") == unicode_html.encode("euc_jp") def test_real_hebrew_document(self): # A real-world test to make sure we can convert ISO-8859-9 (a @@ -815,9 +805,9 @@ Hello, world! # Some tree builders call it iso8859-8, others call it iso-8859-9. # That's not a difference we really care about. assert soup.original_encoding in ('iso8859-8', 'iso-8859-8') - self.assertEqual( - soup.encode('utf-8'), - hebrew_document.decode("iso8859-8").encode("utf-8")) + assert soup.encode('utf-8') == ( + hebrew_document.decode("iso8859-8").encode("utf-8") + ) def test_meta_tag_reflects_current_encoding(self): # Here's the tag saying that a document is @@ -835,14 +825,14 @@ Hello, world! # Parse the document, and the charset is seemingly unaffected. parsed_meta = soup.find('meta', {'http-equiv': 'Content-type'}) content = parsed_meta['content'] - self.assertEqual('text/html; charset=x-sjis', content) + assert 'text/html; charset=x-sjis' == content # But that value is actually a ContentMetaAttributeValue object. - self.assertTrue(isinstance(content, ContentMetaAttributeValue)) + assert isinstance(content, ContentMetaAttributeValue) # And it will take on a value that reflects its current # encoding. - self.assertEqual('text/html; charset=utf8', content.encode("utf8")) + assert 'text/html; charset=utf8' == content.encode("utf8") # For the rest of the story, see TestSubstitutions in # test_tree.py. @@ -862,14 +852,14 @@ Hello, world! # Parse the document, and the charset is seemingly unaffected. parsed_meta = soup.find('meta', id="encoding") charset = parsed_meta['charset'] - self.assertEqual('x-sjis', charset) + assert 'x-sjis' == charset # But that value is actually a CharsetMetaAttributeValue object. - self.assertTrue(isinstance(charset, CharsetMetaAttributeValue)) + assert isinstance(charset, CharsetMetaAttributeValue) # And it will take on a value that reflects its current # encoding. - self.assertEqual('utf8', charset.encode("utf8")) + assert 'utf8' == charset.encode("utf8") def test_python_specific_encodings_not_used_in_charset(self): # You can encode an HTML document using a Python-specific @@ -897,7 +887,7 @@ Hello, world! def test_tag_with_no_attributes_can_have_attributes_added(self): data = self.soup("text") data.a['foo'] = 'bar' - self.assertEqual('text', data.a.decode()) + assert 'text' == data.a.decode() def test_closing_tag_with_no_opening_tag(self): # Without BeautifulSoup.open_tag_counter, the tag will @@ -905,9 +895,7 @@ Hello, world! # for a tag that wasn't there. The result is that 'text2' # will show up outside the body of the document. soup = self.soup("

text1

text2

") - self.assertEqual( - "

text1

text2

", soup.body.decode() - ) + assert "

text1

text2

" == soup.body.decode() def test_worst_case(self): """Test the worst case (currently) for linking issues.""" @@ -924,18 +912,17 @@ class XMLTreeBuilderSmokeTest(TreeBuilderSmokeTest): tree = self.soup("foo") dumped = pickle.dumps(tree, 2) loaded = pickle.loads(dumped) - self.assertEqual(loaded.__class__, BeautifulSoup) - self.assertEqual(loaded.decode(), tree.decode()) + assert loaded.__class__ == BeautifulSoup + assert loaded.decode() == tree.decode() def test_docstring_generated(self): soup = self.soup("") - self.assertEqual( - soup.encode(), b'\n') + assert soup.encode() == b'\n' def test_xml_declaration(self): markup = b"""\n""" soup = self.soup(markup) - self.assertEqual(markup, soup.encode("utf8")) + assert markup == soup.encode("utf8") def test_python_specific_encodings_not_used_in_xml_declaration(self): # You can encode an XML document using a Python-specific @@ -959,7 +946,7 @@ class XMLTreeBuilderSmokeTest(TreeBuilderSmokeTest): def test_processing_instruction(self): markup = b"""\n""" soup = self.soup(markup) - self.assertEqual(markup, soup.encode("utf8")) + assert markup == soup.encode("utf8") def test_real_xhtml_document(self): """A real XHTML document should come out *exactly* the same as it went in.""" @@ -970,8 +957,7 @@ class XMLTreeBuilderSmokeTest(TreeBuilderSmokeTest): Goodbye. """ soup = self.soup(markup) - self.assertEqual( - soup.encode("utf-8"), markup) + assert soup.encode("utf-8") == markup def test_nested_namespaces(self): doc = b""" @@ -982,7 +968,7 @@ class XMLTreeBuilderSmokeTest(TreeBuilderSmokeTest): """ soup = self.soup(doc) - self.assertEqual(doc, soup.encode()) + assert doc == soup.encode() def test_formatter_processes_script_tag_for_xml_documents(self): doc = """ @@ -994,24 +980,21 @@ class XMLTreeBuilderSmokeTest(TreeBuilderSmokeTest): # it later. soup.script.string = 'console.log("< < hey > > ");' encoded = soup.encode() - self.assertTrue(b"< < hey > >" in encoded) + assert b"< < hey > >" in encoded def test_can_parse_unicode_document(self): markup = 'Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!' soup = self.soup(markup) - self.assertEqual('Sacr\xe9 bleu!', soup.root.string) + assert 'Sacr\xe9 bleu!' == soup.root.string def test_popping_namespaced_tag(self): markup = 'b2012-07-02T20:33:42Zcd' soup = self.soup(markup) - self.assertEqual( - str(soup.rss), markup) + assert str(soup.rss) == markup def test_docstring_includes_correct_encoding(self): soup = self.soup("") - self.assertEqual( - soup.encode("latin1"), - b'\n') + assert soup.encode("latin1") == b'\n' def test_large_xml_document(self): """A large XML document should come out the same as it went in.""" @@ -1019,34 +1002,33 @@ class XMLTreeBuilderSmokeTest(TreeBuilderSmokeTest): + b'0' * (2**12) + b'') soup = self.soup(markup) - self.assertEqual(soup.encode("utf-8"), markup) - + assert soup.encode("utf-8") == markup def test_tags_are_empty_element_if_and_only_if_they_are_empty(self): - self.assertSoupEquals("
", "
") - self.assertSoupEquals("
foo
") + self.assert_soup("
", "
") + self.assert_soup("
foo
") def test_namespaces_are_preserved(self): markup = 'This tag is in the a namespaceThis tag is in the b namespace' soup = self.soup(markup) root = soup.root - self.assertEqual("http://example.com/", root['xmlns:a']) - self.assertEqual("http://example.net/", root['xmlns:b']) + assert "http://example.com/" == root['xmlns:a'] + assert "http://example.net/" == root['xmlns:b'] def test_closing_namespaced_tag(self): markup = '
20010504
' soup = self.soup(markup) - self.assertEqual(str(soup.p), markup) + assert str(soup.p) == markup def test_namespaced_attributes(self): markup = '' soup = self.soup(markup) - self.assertEqual(str(soup.foo), markup) + assert str(soup.foo) == markup def test_namespaced_attributes_xml_namespace(self): markup = 'bar' soup = self.soup(markup) - self.assertEqual(str(soup.foo), markup) + assert str(soup.foo) == markup def test_find_by_prefixed_name(self): doc = """ @@ -1061,14 +1043,14 @@ class XMLTreeBuilderSmokeTest(TreeBuilderSmokeTest): soup = self.soup(doc) # There are three tags. - self.assertEqual(3, len(soup.find_all('tag'))) + assert 3 == len(soup.find_all('tag')) # But two of them are ns1:tag and one of them is ns2:tag. - self.assertEqual(2, len(soup.find_all('ns1:tag'))) - self.assertEqual(1, len(soup.find_all('ns2:tag'))) + assert 2 == len(soup.find_all('ns1:tag')) + assert 1 == len(soup.find_all('ns2:tag')) - self.assertEqual(1, len(soup.find_all('ns2:tag', key='value'))) - self.assertEqual(3, len(soup.find_all(['ns1:tag', 'ns2:tag']))) + assert 1, len(soup.find_all('ns2:tag', key='value')) + assert 3, len(soup.find_all(['ns1:tag', 'ns2:tag'])) def test_copy_tag_preserves_namespace(self): xml = """ @@ -1079,7 +1061,7 @@ class XMLTreeBuilderSmokeTest(TreeBuilderSmokeTest): duplicate = copy.copy(tag) # The two tags have the same namespace prefix. - self.assertEqual(tag.prefix, duplicate.prefix) + assert tag.prefix == duplicate.prefix def test_worst_case(self): """Test the worst case (currently) for linking issues.""" @@ -1099,29 +1081,29 @@ class HTML5TreeBuilderSmokeTest(HTMLTreeBuilderSmokeTest): def test_html_tags_have_namespace(self): markup = "" soup = self.soup(markup) - self.assertEqual("http://www.w3.org/1999/xhtml", soup.a.namespace) + assert "http://www.w3.org/1999/xhtml" == soup.a.namespace def test_svg_tags_have_namespace(self): markup = '' soup = self.soup(markup) namespace = "http://www.w3.org/2000/svg" - self.assertEqual(namespace, soup.svg.namespace) - self.assertEqual(namespace, soup.circle.namespace) + assert namespace == soup.svg.namespace + assert namespace == soup.circle.namespace def test_mathml_tags_have_namespace(self): markup = ' $\sqrt{5}$ ' soup = self.soup(markup) namespace = 'http://www.w3.org/1998/Math/MathML' - self.assertEqual(namespace, soup.math.namespace) - self.assertEqual(namespace, soup.msqrt.namespace) + assert namespace == soup.math.namespace + assert namespace == soup.msqrt.namespace def test_xml_declaration_becomes_comment(self): markup = '' soup = self.soup(markup) - self.assertTrue(isinstance(soup.contents[0], Comment)) - self.assertEqual(soup.contents[0], '?xml version="1.0" encoding="utf-8"?') - self.assertEqual("html", soup.contents[0].next_element.name) + assert isinstance(soup.contents[0], Comment) + assert soup.contents[0] == '?xml version="1.0" encoding="utf-8"?' + assert "html" == soup.contents[0].next_element.name def skipIf(condition, reason): def nothing(test, *args, **kwargs): -- cgit v1.2.3