[Zope3-checkins] CVS: Zope3/src/zope/xmlpickle/tests - test_xmlpickle.py:1.7

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/xmlpickle/tests
In directory cvs.zope.org:/tmp/cvs-serv29357/tests

Modified Files:
	test_xmlpickle.py 
Log Message:
Added support for converting strings with multiple pickles to XML.

(It would be better to convert all of the pickles at once.)



=== Zope3/src/zope/xmlpickle/tests/test_xmlpickle.py 1.6 => 1.7 ===
--- Zope3/src/zope/xmlpickle/tests/test_xmlpickle.py:1.6	Sun Sep 21 13:32:12 2003
+++ Zope3/src/zope/xmlpickle/tests/test_xmlpickle.py	Tue Jan 13 12:21:46 2004
@@ -16,11 +16,10 @@
 $Id$
 """
 
-from unittest import TestCase, main, makeSuite
-
+import unittest
 from zope.xmlpickle import dumps, loads
 
-class Test(TestCase):
+class Test(unittest.TestCase):
 
     def __test(self, v, expected_xml=None):
         xml = dumps(v)
@@ -269,7 +268,11 @@
         return not self.__eq__(other)
 
 def test_suite():
-    return makeSuite(Test)
+    from zope.testing.doctestunit import DocTestSuite
+    return unittest.TestSuite((
+        unittest.makeSuite(Test),
+        DocTestSuite('zope.xmlpickle.xmlpickle'),
+        ))
 
 if __name__=='__main__':
-    main(defaultTest='test_suite')
+    unittest.main(defaultTest='test_suite')