Updated test suite to latest pulldom changes.

diff --git a/Lib/test/output/test_minidom b/Lib/test/output/test_minidom
index 83e55b37aa25e71fbe72f6345f946942e74db7b7..cb46def2facdae6e998dd3d57fe30a31b86ccf9e 100644 (file)
--- a/Lib/test/output/test_minidom
+++ b/Lib/test/output/test_minidom
@@ -110,10 +110,6 @@ Test Succeeded testHasChildNodes
 Passed assertion: len(Node.allnodes) == 0
 Test Succeeded testInsertBefore
 Passed assertion: len(Node.allnodes) == 0
-Passed testNonNSElements - siblings
-Passed testNonNSElements - parents
-Test Succeeded testNonNSElements
-Passed assertion: len(Node.allnodes) == 0
 Passed Test
 Passed Test
 Test Succeeded testNonZero
@@ -154,6 +150,10 @@ Passed Test
 Passed Test
 Test Succeeded testRemoveAttributeNode
 Passed assertion: len(Node.allnodes) == 0
+Passed testSAX2DOM - siblings
+Passed testSAX2DOM - parents
+Test Succeeded testSAX2DOM
+Passed assertion: len(Node.allnodes) == 0
 Test Succeeded testSetAttrValueandNodeValue
 Passed assertion: len(Node.allnodes) == 0
 Passed testSiblings

diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index 5f0ab256de8bcd5b028efde959f14d72fa95c0d5..7afdf5d197d7c0d723d7a6da0d685289ce79e140 100644 (file)
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -337,21 +337,21 @@ def testParents():
 
     doc.unlink()
 
-def testNonNSElements():
+def testSAX2DOM():
     from xml.dom import pulldom
 
-    pulldom = pulldom.PullDOM()
-    pulldom.startDocument()
-    pulldom.startElement("doc", {})
-    pulldom.characters("text")
-    pulldom.startElement("subelm", {})
-    pulldom.characters("text")
-    pulldom.endElement("subelm")
-    pulldom.characters("text")    
-    pulldom.endElement("doc")
-    pulldom.endDocument()
-
-    doc = pulldom.document
+    sax2dom = pulldom.SAX2DOM()
+    sax2dom.startDocument()
+    sax2dom.startElement("doc", {})
+    sax2dom.characters("text")
+    sax2dom.startElement("subelm", {})
+    sax2dom.characters("text")
+    sax2dom.endElement("subelm")
+    sax2dom.characters("text")    
+    sax2dom.endElement("doc")
+    sax2dom.endDocument()
+
+    doc = sax2dom.document
     root = doc.documentElement
     (text1, elm1, text2) = root.childNodes
     text3 = elm1.childNodes[0]
@@ -363,13 +363,13 @@ def testNonNSElements():
             text2.previousSibling is elm1 and
             text2.nextSibling is None and
             text3.previousSibling is None and
-            text3.nextSibling is None, "testNonNSElements - siblings")
+            text3.nextSibling is None, "testSAX2DOM - siblings")
 
     confirm(root.parentNode is doc and
             text1.parentNode is root and
             elm1.parentNode is root and
             text2.parentNode is root and
-            text3.parentNode is elm1, "testNonNSElements - parents")
+            text3.parentNode is elm1, "testSAX2DOM - parents")
             
     doc.unlink()