[Zope3-checkins] CVS: Zope3/src/zope/app/content/tests - test_sqlscript.py:1.7

[Guido van Rossum]

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

Modified Files:
	test_sqlscript.py 
Log Message:
Merge from use-config-branch.  (A joint production by Jim, Tim and Guido.)

- Refactor the service creation and configuration code, making the UI
  for creating and configuring services much more pleasant.

- Add a new marker interface, IUseConfigurable, which is used to say
  that an object records dependencies between it and its
  configurations.  (This applies to other configurable objects besides
  services.)  Another marker interface, IAttributeUseConfigurable,
  says that these dependencies are stored as annotations.  And finally
  IUseConfiguration defines the actual interface for discussing these
  dependencies; implementing IUseConfigurable is a promise that such
  an adapter exists (and implementing IAttributeUseConfigurable is one
  way of making this promise come true :-).

- Add a new view tab for services, called "Configurations", which
  displays links to its configurations with summary information.  (Try
  it for the Events service, which has two configurations by default.)

- Add a new interface, ILocalService, which all local services must
  implement.  Also add ISimpleService, which extends ILocalService
  with IAttributeUseConfigurable.  All existing local service
  implementations implement this.

- Some miscellaneous cleanup (e.g. made the browser namespace the
  default namespace in zope/app/browser/services/configure.zcml).


=== Zope3/src/zope/app/content/tests/test_sqlscript.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/content/tests/test_sqlscript.py:1.6	Tue Feb 11 21:17:18 2003
+++ Zope3/src/zope/app/content/tests/test_sqlscript.py	Mon Mar  3 18:16:08 2003
@@ -38,6 +38,7 @@
 from zope.app.interfaces.cache.cache import ICachingService
 from zope.app.cache.annotationcacheable import AnnotationCacheable
 from zope.app.interfaces.traversing import IPhysicallyLocatable
+from zope.app.interfaces.services.interfaces import ISimpleService
 
 
 # Make spme fixes, so that we overcome some of the natural ZODB properties
@@ -73,7 +74,7 @@
 
 
 class ConnectionServiceStub:
-    __implements__ = IConnectionService
+    __implements__ = IConnectionService, ISimpleService
 
     def getConnection(self, name):
         return ConnectionStub()
@@ -101,7 +102,7 @@
 
 class CachingServiceStub:
 
-    __implements__ = ICachingService
+    __implements__ = ICachingService, ISimpleService
 
     def __init__(self):
         self.caches = {}