[4suite-checkins] In 4Suite/test/Xml/Core, files test_parse_fragment.py

[Jeremy Kloth]

Modified Files:
    test_parse_fragment.py

Log Message:
Compare the resulting XML using TreeCompare.
Corrected the ordering of the argument to compare().

ViewCVS diff:
  http://cvs.4suite.org/viewcvs/4Suite/test/Xml/Core/test_parse_fragment.py.diff?r1=1.3&r2=1.4
ViewCVS view:
  http://cvs.4suite.org/viewcvs/4Suite/test/Xml/Core/test_parse_fragment.py?rev=1.4&content-type=text/vnd.viewcvs-markup

Index: test_parse_fragment.py
===================================================================
RCS file: /var/local/cvsroot/4Suite/test/Xml/Core/test_parse_fragment.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- test_parse_fragment.py	20 Dec 2006 00:57:11 -0000	1.3
+++ test_parse_fragment.py	21 Dec 2006 06:05:23 -0000	1.4
@@ -1,4 +1,5 @@
 from Ft.Xml import Parse, CreateInputSource
 from Ft.Xml.Domlette import Print, EntityReader, GetAllNs, ParseFragment
+from Ft.Xml.Lib import TreeCompare
 from Ft.Lib import Uri, Uuid
 from xml.dom import Node
@@ -28,61 +29,70 @@
     stream = cStringIO.StringIO()
     Print(doc, stream)
-    tester.compare(EXPECTED1, stream.getvalue())
+    tester.compare(EXPECTED1, stream.getvalue(),
+                  func=TreeCompare.XmlTreeCompare)
     #Minimal node testing
-    tester.compare(len(doc.childNodes), 1)
-    tester.compare(doc.childNodes[0].nodeType, Node.ELEMENT_NODE)
-    tester.compare(doc.childNodes[0].nodeName, u'p')
-    tester.compare(doc.childNodes[0].namespaceURI, None)
-    tester.compare(doc.childNodes[0].prefix, None,)
+    tester.compare(1, len(doc.childNodes), 'childNodes')
+    elem = doc.childNodes[0]
+    tester.compare(Node.ELEMENT_NODE, elem.nodeType, 'nodeType')
+    tester.compare(u'p', elem.nodeName, 'nodeName')
+    tester.compare(None, elem.namespaceURI, 'namespaceURI')
+    tester.compare(None, elem.prefix, 'prefix')
     tester.testDone()
 
     tester.startTest("Parse with overridden default namespace")
+    XHTML_NAMESPACE = u'http://www.w3.org/1999/xhtml'
     nss = {u'xml': u'http://www.w3.org/XML/1998/namespace',
-           None: u'http://www.w3.org/1999/xhtml'}
+           None: XHTML_NAMESPACE}
     isrc = CreateInputSource(SOURCE1)
     doc = ParseFragment(isrc, nss)
     stream = cStringIO.StringIO()
     Print(doc, stream)
-    tester.compare(EXPECTED2, stream.getvalue())
+    tester.compare(EXPECTED2, stream.getvalue(),
+                  func=TreeCompare.XmlTreeCompare)
     #doc = ParseFragment(TEST_STRING)
     #Minimal node testing
-    tester.compare(len(doc.childNodes), 1)
-    tester.compare(doc.childNodes[0].nodeType, Node.ELEMENT_NODE)
-    tester.compare(doc.childNodes[0].nodeName, u'p')
-    tester.compare(doc.childNodes[0].namespaceURI, u'http://www.w3.org/1999/xhtml')
-    tester.compare(doc.childNodes[0].prefix, None,)
+    tester.compare(1, len(doc.childNodes), 'childNodes')
+    elem = doc.childNodes[0]
+    tester.compare(Node.ELEMENT_NODE, elem.nodeType, 'nodeType')
+    tester.compare(u'p', elem.nodeName, 'nodeName')
+    tester.compare(elem.namespaceURI, XHTML_NAMESPACE, 'namespaceURI')
+    tester.compare(None, elem.prefix, 'prefix')
     tester.testDone()
 
     tester.startTest("Parse with overridden default namespace and re-overridden child")
     nss = {u'xml': u'http://www.w3.org/XML/1998/namespace',
-           None: u'http://www.w3.org/1999/xhtml'}
+           None: XHTML_NAMESPACE}
     isrc = CreateInputSource(SOURCE2)
     doc = ParseFragment(isrc, nss)
     stream = cStringIO.StringIO()
     Print(doc, stream)
-    tester.compare(EXPECTED3, stream.getvalue())
+    tester.compare(EXPECTED3, stream.getvalue(),
+                  func=TreeCompare.XmlTreeCompare)
     #Minimal node testing
-    tester.compare(len(doc.childNodes), 1)
-    tester.compare(doc.childNodes[0].nodeType, Node.ELEMENT_NODE)
-    tester.compare(doc.childNodes[0].nodeName, u'p')
-    tester.compare(doc.childNodes[0].namespaceURI, u'http://www.w3.org/1999/xhtml')
-    tester.compare(doc.childNodes[0].prefix, None,)
+    tester.compare(1, len(doc.childNodes), 'childNodes')
+    elem = doc.childNodes[0]
+    tester.compare(Node.ELEMENT_NODE, elem.nodeType, 'nodeType')
+    tester.compare(u'p', elem.nodeName, 'nodeName')
+    tester.compare(elem.namespaceURI, XHTML_NAMESPACE, 'namespaceURI')
+    tester.compare(None, elem.prefix, 'prefix')
     tester.testDone()
 
     tester.startTest("Parse with overridden non-default namespace")
     nss = {u'xml': u'http://www.w3.org/XML/1998/namespace',
-           u'h': u'http://www.w3.org/1999/xhtml'}
+           u'h': XHTML_NAMESPACE}
     isrc = CreateInputSource(SOURCE3)
     doc = ParseFragment(isrc, nss)
     stream = cStringIO.StringIO()
     Print(doc, stream)
-    tester.compare(EXPECTED4, stream.getvalue())
+    tester.compare(EXPECTED4, stream.getvalue(),
+                  func=TreeCompare.XmlTreeCompare)
     #doc = ParseFragment(TEST_STRING)
     #Minimal node testing
-    tester.compare(len(doc.childNodes), 1)
-    tester.compare(doc.childNodes[0].nodeType, Node.ELEMENT_NODE)
-    tester.compare(doc.childNodes[0].nodeName, u'h:p')
-    tester.compare(doc.childNodes[0].namespaceURI, u'http://www.w3.org/1999/xhtml')
-    tester.compare(doc.childNodes[0].prefix, u'h')
+    tester.compare(1, len(doc.childNodes), 'childNodes')
+    elem = doc.childNodes[0]
+    tester.compare(Node.ELEMENT_NODE, elem.nodeType, 'nodeType')
+    tester.compare(u'h:p', elem.nodeName, 'nodeName')
+    tester.compare(elem.namespaceURI, XHTML_NAMESPACE, 'namespaceURI')
+    tester.compare(u'h', elem.prefix, 'prefix')
     tester.testDone()