Ticket #7441: 7441_wrapper_for_xml_outputchecker.diff

django/test/testcases.py

@@ -55 +55 @@
         """Tries to do a 'xml-comparision' of want and got.  Plain string
         comparision doesn't always work because, for example, attribute
         ordering should not be important.
-        
+
         Based on http://codespeak.net/svn/lxml/trunk/src/lxml/doctestcompare.py
         """
-        
-        # We use this to distinguish the output of repr() from an XML element:
-        _repr_re = re.compile(r'^<[^>]+ (at|object) ')
 
         _norm_whitespace_re = re.compile(r'[ \t\n][ \t\n]+')
         def norm_whitespace(v):
             return _norm_whitespace_re.sub(' ', v)
-
-        def looks_like_xml(s):
-            s = s.strip()
-            return (s.startswith('<')
-                    and not _repr_re.search(s))
 
         def child_text(element):
             return ''.join([c.data for c in element.childNodes
@@ -104 +96 @@
         want, got = self._strip_quotes(want, got)
         want = want.replace('\\n','\n')
         got = got.replace('\\n','\n')
-        
-        # If what we want doesn't look like markup, don't bother trying
-        # to parse it.
-        if not looks_like_xml(want):
-            return False
+
+        # If the string is not a complete xml document, we may need to add a
+        # root element
+        if not (want.startswith('<?xml') or got.startswith('<?xml')):
+            wrapper = '<root>%s</root>' # This allow us to compare fragments, like
+                                        # "<foo/><bar/>"
+            want = wrapper % want
+            got = wrapper % got
 
         # Parse the want and got strings, and compare the parsings.
         try:
@@ -181 +176 @@
         """Performs any pre-test setup. This includes:
 
             * Flushing the database.
-            * If the Test Case class has a 'fixtures' member, installing the 
+            * If the Test Case class has a 'fixtures' member, installing the
               named fixtures.
             * If the Test Case class has a 'urls' member, replace the
               ROOT_URLCONF with it.