[Zope3-checkins] CVS: Zope3/src/zope/app/utility - tests.py:1.8

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/utility
In directory cvs.zope.org:/tmp/cvs-serv30761/src/zope/app/utility

Modified Files:
	tests.py 
Log Message:


Test new utility vocabulary code.




=== Zope3/src/zope/app/utility/tests.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/utility/tests.py:1.7	Sat Apr 17 10:33:46 2004
+++ Zope3/src/zope/app/utility/tests.py	Sat Apr 24 19:20:26 2004
@@ -16,6 +16,7 @@
 $Id$
 """
 import unittest
+from zope.testing.doctestunit import DocTestSuite
 from zope.app.tests import setup
 from zope.app.site.tests import placefulsetup
 from zope.app import utility, zapi
@@ -211,9 +212,14 @@
         # Make sure we override:
         self.assertEqual(zapi.getUtility(sm2, IFoo, 'u2').name, 'u22')
 
-def test_suite():
-    return unittest.makeSuite(TestUtilityService)
 
+def test_suite():
+    return unittest.TestSuite((
+        unittest.makeSuite(TestUtilityService),
+        DocTestSuite('zope.app.utility.vocabulary',
+                     setUp=setup.placelessSetUp,
+                     tearDown=setup.placelessTearDown)
+        ))
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(default='test_suite')