[Python-checkins] python/dist/src/Lib/test test_minidom.py,1.32,1.33

fdrake@users.sourceforge.net fdrake@users.sourceforge.net
Fri, 19 Jul 2002 15:16:43 -0700


Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv5775

Modified Files:
	test_minidom.py 
Log Message:
Follow PyXML: Remove all prints from successful tests.  This means we can
also drop the output file.


Index: test_minidom.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_minidom.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** test_minidom.py	30 Jun 2002 15:05:00 -0000	1.32
--- test_minidom.py	19 Jul 2002 22:16:40 -0000	1.33
***************
*** 1,13 ****
  # test for xml.dom.minidom
  
- from xml.dom.minidom import parse, Node, Document, parseString
- from xml.dom import HierarchyRequestErr
- import xml.parsers.expat
- 
  import os
  import sys
  import traceback
  from test_support import verbose
  
  if __name__ == "__main__":
      base = sys.argv[0]
--- 1,15 ----
  # test for xml.dom.minidom
  
  import os
  import sys
  import traceback
+ 
  from test_support import verbose
  
+ import xml.dom
+ import xml.parsers.expat
+ 
+ from xml.dom.minidom import parse, Node, Document, parseString
+ 
  if __name__ == "__main__":
      base = sys.argv[0]
***************
*** 18,24 ****
  
  def confirm(test, testname = "Test"):
!     if test:
!         print "Passed " + testname
!     else:
          print "Failed " + testname
          raise Exception
--- 20,24 ----
  
  def confirm(test, testname = "Test"):
!     if not test:
          print "Failed " + testname
          raise Exception
***************
*** 138,142 ****
  
      try: dom.appendChild(text)
!     except HierarchyRequestErr: pass
      else:
          print "dom.appendChild didn't raise HierarchyRequestErr"
--- 138,142 ----
  
      try: dom.appendChild(text)
!     except xml.dom.HierarchyRequestErr: pass
      else:
          print "dom.appendChild didn't raise HierarchyRequestErr"
***************
*** 144,153 ****
      dom.appendChild(elem)
      try: dom.insertBefore(text, elem)
!     except HierarchyRequestErr: pass
      else:
          print "dom.appendChild didn't raise HierarchyRequestErr"
  
      try: dom.replaceChild(text, elem)
!     except HierarchyRequestErr: pass
      else:
          print "dom.appendChild didn't raise HierarchyRequestErr"
--- 144,153 ----
      dom.appendChild(elem)
      try: dom.insertBefore(text, elem)
!     except xml.dom.HierarchyRequestErr: pass
      else:
          print "dom.appendChild didn't raise HierarchyRequestErr"
  
      try: dom.replaceChild(text, elem)
!     except xml.dom.HierarchyRequestErr: pass
      else:
          print "dom.appendChild didn't raise HierarchyRequestErr"
***************
*** 155,164 ****
      nodemap = elem.attributes
      try: nodemap.setNamedItem(text)
!     except HierarchyRequestErr: pass
      else:
          print "NamedNodeMap.setNamedItem didn't raise HierarchyRequestErr"
  
      try: nodemap.setNamedItemNS(text)
!     except HierarchyRequestErr: pass
      else:
          print "NamedNodeMap.setNamedItemNS didn't raise HierarchyRequestErr"
--- 155,164 ----
      nodemap = elem.attributes
      try: nodemap.setNamedItem(text)
!     except xml.dom.HierarchyRequestErr: pass
      else:
          print "NamedNodeMap.setNamedItem didn't raise HierarchyRequestErr"
  
      try: nodemap.setNamedItemNS(text)
!     except xml.dom.HierarchyRequestErr: pass
      else:
          print "NamedNodeMap.setNamedItemNS didn't raise HierarchyRequestErr"
***************
*** 389,394 ****
      try:
          doc.appendChild(elem)
!     except HierarchyRequestErr:
!         print "Caught expected exception when adding extra document element."
      else:
          print "Failed to catch expected exception when" \
--- 389,394 ----
      try:
          doc.appendChild(elem)
!     except xml.dom.HierarchyRequestErr:
!         pass
      else:
          print "Failed to catch expected exception when" \
***************
*** 627,631 ****
          try:
              func()
-             print "Test Succeeded", name
              confirm(len(Node.allnodes) == 0,
                      "assertion: len(Node.allnodes) == 0")
--- 627,630 ----
***************
*** 651,658 ****
      for name in failed:
          print "  " + name
-     print
- else:
-     print "All tests succeeded"
- 
- Node.debug = None # Delete debug output collected in a StringIO object
- Node._debug = 0   # And reset debug mode
--- 650,651 ----