[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - test_utility.py:1.3

Fred L. Drake, Jr. fred@zope.com
Thu, 3 Apr 2003 17:06:05 -0500


Update of /cvs-repository/Zope3/src/zope/app/services/tests
In directory cvs.zope.org:/tmp/cvs-serv10877/app/services/tests

Modified Files:
	test_utility.py 
Log Message:
Added configuration user-interface for the local utility service.

=== Zope3/src/zope/app/services/tests/test_utility.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/tests/test_utility.py:1.2	Wed Apr  2 16:10:35 2003
+++ Zope3/src/zope/app/services/tests/test_utility.py	Thu Apr  3 17:05:34 2003
@@ -31,6 +31,7 @@
 from zope.app.interfaces.services.utility import ILocalUtility
 from zope.app.interfaces.services.configuration import IUseConfiguration
 from zope.app.interfaces.dependable import IDependable
+from zope.proxy.context import getWrapperContainer
 
 class IFo(Interface): pass
 
@@ -179,14 +180,24 @@
             configuration.status = Registered
 
             self.assertEqual(utilities.getUtility(IFoo, name=name).foo(), gout)
-            
-            
+
+    def test_getRegisteredMatching(self):
+        self.test_local_utilities()
+        utilities = getService(self.rootFolder, "Utilities")
+        r = list(utilities.getRegisteredMatching())
+        r.sort()
+        path = "/++etc++Services/default/foo"
+        cr1 = utilities.queryConfigurationsFor(
+            utility.UtilityConfiguration("", IFoo, path))
+        cr2 = utilities.queryConfigurationsFor(
+            utility.UtilityConfiguration("bob", IFoo, path))
+        self.assertEqual(r, [(IFoo, "", cr1), (IFoo, "bob", cr2)])
+        self.assertEqual(getWrapperContainer(r[0][2]), utilities)
+        self.assertEqual(getWrapperContainer(r[1][2]), utilities)
 
 
 def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestUtilityService))
-    return suite
+    return unittest.makeSuite(TestUtilityService)
 
 
 if __name__ == '__main__':