[z3-checkins] r19373 - z3/Five/trunk/tests

[efge at codespeak.net]

Author: efge
Date: Tue Nov  1 21:53:21 2005
New Revision: 19373

Modified:
   z3/Five/trunk/tests/event.txt
   z3/Five/trunk/tests/test_event.py
Log:
Use standard doctest module.

Modified: z3/Five/trunk/tests/event.txt
==============================================================================
--- z3/Five/trunk/tests/event.txt	(original)
+++ z3/Five/trunk/tests/event.txt	Tue Nov  1 21:53:21 2005
@@ -43,12 +43,12 @@
   >>> app = MyApp('')
   >>> root['app'] = app
   >>> folder = MyFolder('folder')
-  >>> app._setObject('folder', folder)
+  >>> app._setObject('folder', folder) # doctest: +NORMALIZE_WHITESPACE
   old manage_afterAdd folder folder
   'folder'
   >>> folder = app.folder
   >>> btfolder = MyBTreeFolder('btfolder')
-  >>> app._setObject('btfolder', btfolder)
+  >>> app._setObject('btfolder', btfolder) # doctest: +NORMALIZE_WHITESPACE
   old manage_afterAdd btfolder btfolder
   'btfolder'
 
@@ -363,7 +363,7 @@
 OrderedFolder has the same renaming behavior than before::
 
   >>> ofolder = MyOrderedFolder('ofolder')
-  >>> app._setObject('ofolder', ofolder)
+  >>> app._setObject('ofolder', ofolder) # doctest: +NORMALIZE_WHITESPACE
   ObjectWillBeAddedEvent ofolder
   ObjectAddedEvent ofolder
   old manage_afterAdd ofolder ofolder

Modified: z3/Five/trunk/tests/test_event.py
==============================================================================
--- z3/Five/trunk/tests/test_event.py	(original)
+++ z3/Five/trunk/tests/test_event.py	Tue Nov  1 21:53:21 2005
@@ -75,8 +75,8 @@
 
 
 def test_suite():
-    from Testing.ZopeTestCase import ZopeDocFileSuite
-    return ZopeDocFileSuite('event.txt', package="Products.Five.tests")
+    from doctest import DocFileSuite
+    return DocFileSuite('event.txt', package="Products.Five.tests")
 
 if __name__ == '__main__':
     framework()