p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #31250 -- Ignored processing instructions in assertXMLEqual()/assertXMLNotEqual().

This commit is contained in:
yura 2020-02-12 13:38:06 +03:00 committed by Mariusz Felisiak
parent 4070d6ceb0
commit 54b7af7eb4
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/test/utils.py
View File

@ -537,8 +537,8 @@ def compare_xml(want, got):
""" """
Try to do a 'xml-comparison' of want and got. Plain string comparison Try to do a 'xml-comparison' of want and got. Plain string comparison
doesn't always work because, for example, attribute ordering should not be doesn't always work because, for example, attribute ordering should not be
important. Ignore comment nodes, document type node, and leading and important. Ignore comment nodes, processing instructions, document type
trailing whitespaces. node, and leading and trailing whitespaces.
Based on https://github.com/lxml/lxml/blob/master/src/lxml/doctestcompare.py Based on https://github.com/lxml/lxml/blob/master/src/lxml/doctestcompare.py
""" """
@ -576,7 +576,11 @@ def compare_xml(want, got):
def first_node(document): def first_node(document):
for node in document.childNodes: for node in document.childNodes:
if node.nodeType not in (Node.COMMENT_NODE, Node.DOCUMENT_TYPE_NODE): if node.nodeType not in (
Node.COMMENT_NODE,
Node.DOCUMENT_TYPE_NODE,
Node.PROCESSING_INSTRUCTION_NODE,
):
return node return node
want = want.strip().replace('\\n', '\n') want = want.strip().replace('\\n', '\n')

4
docs/topics/testing/tools.txt
View File

@ -1613,8 +1613,8 @@ your test suite.
syntax differences. When invalid XML is passed in any parameter, an syntax differences. When invalid XML is passed in any parameter, an
``AssertionError`` is always raised, even if both string are identical. ``AssertionError`` is always raised, even if both string are identical.
XML declaration, document type, and comments are ignored. Only the root XML declaration, document type, processing instructions, and comments are
element and its children are compared. ignored. Only the root element and its children are compared.
Output in case of error can be customized with the ``msg`` argument. Output in case of error can be customized with the ``msg`` argument.

15
tests/test_utils/tests.py
View File

@ -926,6 +926,21 @@ class XMLEqualTests(SimpleTestCase):
xml2 = '<?xml version="1.0"?><!DOCTYPE root SYSTEM "example2.dtd"><root />' xml2 = '<?xml version="1.0"?><!DOCTYPE root SYSTEM "example2.dtd"><root />'
self.assertXMLEqual(xml1, xml2) self.assertXMLEqual(xml1, xml2)
def test_processing_instruction(self):
xml1 = (
'<?xml version="1.0"?>'
'<?xml-model href="http://www.example1.com"?><root />'
)
xml2 = (
'<?xml version="1.0"?>'
'<?xml-model href="http://www.example2.com"?><root />'
)
self.assertXMLEqual(xml1, xml2)
self.assertXMLEqual(
'<?xml-stylesheet href="style1.xslt" type="text/xsl"?><root />',
'<?xml-stylesheet href="style2.xslt" type="text/xsl"?><root />',
)
class SkippingExtraTests(TestCase): class SkippingExtraTests(TestCase):
fixtures = ['should_not_be_loaded.json'] fixtures = ['should_not_be_loaded.json']