[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ServiceManager/tests - PlacefulSetup.py:1.1.2.2 testServiceManager.py:1.1.2.8

Gary Poster garyposter@earthlink.net
Mon, 29 Apr 2002 19:20:36 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/ServiceManager/tests
In directory cvs.zope.org:/tmp/cvs-serv1556/App/OFS/ServiceManager/tests

Modified Files:
      Tag: Zope-3x-branch
	PlacefulSetup.py testServiceManager.py 
Log Message:
ComponentArchitecture reorganization; addition of for_container; addition of IWriteContainer.isAddable.

good news: all tests pass; bad news: after the new security system, my changes have some problems.  I had to punt on the default contents view of all folders for instance--hasServiceManager is causing a problem for some reason I couldn't divine, even with Shane's Checker tool.  I commented out the offending code on the contents.pt just to keep things up.

I tagged before committing: gary_CA-reorganization

changes more in depth (as I understand it, all or most approved :-) ):

(in ComponentArchitecture:)
 * changing implementation names to Global* (i.e., AdapterService becomes 
GlobalAdapterService) and giving each its own file (many are clumped together 
in hooks.py)
 * removing hooks.py in ComponentArchitecture, putting all functions in appropriate module above (i.e. getAdapter will be in the adapter module)
 * largely removing indirection (_hook) except for getService and 
getNextService
 * changing IServiceService.py to IServiceManager
 * changing Service.py to GlobalServiceManager.py (and class name too)
 * removing "provide*" functions (i.e., provideAdapter, provideUtility, etc.) 
and "defineService" from the __init__.py imports
 * change all global services to classes with appropriate methods as per 
interfaces
 * update all tests 
 * remove all of the "provide*" functions from the interfaces
 * renamed IComponentArchitecture to IPlacefulComponentArchitecture (hereafter IPCA), after long discussion with SteveA 
 * list Resources as one of core CA services in IPlacefulComponentArchitecture
 * build actual IPCA interface, not just import of service interfaces (because we want IPCA to be placeful, but the service interfaces do not need to be)
 * place functions implementing ICA actually in __init__
 * explicitly setting up services in zcml
 * created Global service interfaces, and placed the "provides" and "set" and "define" functions there: however, to keep the main interfaces clean and clear, I placed these global interfaces in the same file as the global implementations, hoping to clarify that these are not reusable interfaces but descriptive, one-time interfaces
 * built PlacefulSetup in Zope.ComponentArchitecture.tests for more specific CleanUp (a subclass).  PlacefulSetup is in the tests folder of the local ServiceManager.  AddableSetup also is available, in the AddableService tests.

(elsewhere in Zope3)
 * built for_container in addables
 * built isAddable for containers (after discussion with Jim, we decided an addable "contains" attribute in the zcml might not be the way to go.  I chose the isAddable approach for a number of reasons)
 * addableservice does some more checks in getting the addable list, pertinent to the above and to whether it can find the appropriate factories
 * a few more tests: a start of one in the local event service, and some more here and there

I'm sorry to add to the confusion of the big security changes, but I needed to either trash these changes or commit them: I'm a bit out of time for the moment.  If all else fails, again, I did tag the previous version.



=== Zope3/lib/python/Zope/App/OFS/ServiceManager/tests/PlacefulSetup.py 1.1.2.1 => 1.1.2.2 ===
 $Id$
 """
+from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
 
-class PlacefulSetup:
-
-    def getGlobalServiceManager_hook(self):
-        return self.serviceManager
+class PlacefulSetup(PlacelessSetup):
     
-    def __init__(self):
+    def setUp(self):
+        PlacelessSetup.setUp(self)
         # set up placeful hooks, saving originals for tearDown
-        from Zope.ComponentArchitecture import hooks
-        self.__old_getServiceManager_hook=hooks.getServiceManager_hook
-        self.__old_getNextServiceManager_hook=hooks.getNextServiceManager_hook
-        from Zope.App.OFS.ServiceManager import hooks as pHooks
-        hooks.getServiceManager_hook=pHooks.getServiceManager_hook
-        hooks.getNextServiceManager_hook=pHooks.getNextServiceManager_hook
-        # put in a temporary global service manager
-        self.__old_getGlobalServiceManager_hook=hooks.getGlobalServiceManager_hook
-        from Zope.ComponentArchitecture.Service import ServiceManager
-        self.serviceManager=ServiceManager()
-        hooks.getGlobalServiceManager_hook=self.getGlobalServiceManager_hook
+        from Zope import ComponentArchitecture as CA
+        self.__old_getServiceManager_hook=CA.getServiceManager_hook
+        self.__old_getNextServiceManager_hook=CA.getNextServiceManager_hook
+        from Zope.App.OFS.ServiceManager import hooks
+        CA.getServiceManager_hook=hooks.getServiceManager_hook
+        CA.getNextServiceManager_hook=hooks.getNextServiceManager_hook
+
+    def buildFolders(self):
         # set up a reasonably complex folder structure
         #
         #     ____________ rootFolder ____________
@@ -46,43 +42,58 @@
         # folder1_1_1 folder1_1_2  folder1_2_1  folder2_1_1
         from Zope.App.OFS.Folder.Folder import Folder
         from Zope.App.OFS.Folder.RootFolder import RootFolder
-        from Zope.ContextWrapper import Wrapper
+        from Zope.Proxy.ContextWrapper import ContextWrapper
         # top
         self.rootFolder=RootFolder()
         # level 1
         self.folder1=Folder()
         self.rootFolder.setObject("folder1",self.folder1)
-        self.folder1=Wrapper(self.folder1, self.rootFolder, name="folder1")
+        self.folder1=ContextWrapper(self.folder1, self.rootFolder,
+             name="folder1")
         self.folder2=Folder()
         self.rootFolder.setObject("folder2",self.folder2)
-        self.folder2=Wrapper(self.folder2, self.rootFolder, name="folder2")
+        self.folder2=ContextWrapper(self.folder2, self.rootFolder,
+             name="folder2")
         # level 2
         self.folder1_1=Folder()
         self.folder1.setObject("folder1_1",self.folder1_1)
-        self.folder1_1=Wrapper(self.folder1_1, self.folder1, name="folder1_1")
+        self.folder1_1=ContextWrapper(self.folder1_1, self.folder1,
+             name="folder1_1")
         self.folder1_2=Folder()
         self.folder1.setObject("folder1_2",self.folder1_2)
-        self.folder1_2=Wrapper(self.folder1_2, self.folder1, name="folder1_2")
+        self.folder1_2=ContextWrapper(self.folder1_2, self.folder1,
+             name="folder1_2")
         self.folder2_1=Folder()
         self.folder2.setObject("folder2_1",self.folder2_1)
-        self.folder2_1=Wrapper(self.folder2_1, self.folder2, name="folder2_1")
+        self.folder2_1=ContextWrapper(self.folder2_1, self.folder2,
+             name="folder2_1")
         # level 3
         self.folder1_1_1=Folder()
         self.folder1_1.setObject("folder1_1_1",self.folder1_1_1)
-        self.folder1_1_1=Wrapper(self.folder1_1_1, self.folder1_1, name="folder1_1_1")
+        self.folder1_1_1=ContextWrapper(self.folder1_1_1, self.folder1_1,
+             name="folder1_1_1")
         self.folder1_1_2=Folder()
         self.folder1_1.setObject("folder1_1_2",self.folder1_1_2)
-        self.folder1_1_2=Wrapper(self.folder1_1_2, self.folder1_1, name="folder1_1_2")
+        self.folder1_1_2=ContextWrapper(self.folder1_1_2, self.folder1_1,
+             name="folder1_1_2")
         self.folder1_2_1=Folder()
         self.folder1_2.setObject("folder1_2_1",self.folder1_2_1)
-        self.folder1_2_1=Wrapper(self.folder1_2_1, self.folder1_2, name="folder1_2_1")
+        self.folder1_2_1=ContextWrapper(self.folder1_2_1, self.folder1_2,
+             name="folder1_2_1")
         self.folder2_1_1=Folder()
         self.folder2_1.setObject("folder2_1_1",self.folder2_1_1)
-        self.folder2_1_1=Wrapper(self.folder2_1_1, self.folder2_1, name="folder2_1_1")
-        
+        self.folder2_1_1=ContextWrapper(self.folder2_1_1, self.folder2_1,
+             name="folder2_1_1")
+
+    def createServiceManager(self, folder=None):
+        if folder is None: folder=self.rootFolder
+        from Zope.App.OFS.ServiceManager.ServiceManager import ServiceManager
+        folder.setServiceManager(ServiceManager())
+
     def tearDown(self):
-        from Zope.ComponentArchitecture import hooks
-        hooks.getServiceManager_hook=self.__old_getServiceManager_hook
-        hooks.getNextServiceManager_hook=self.__old_getNextServiceManager_hook
-        hooks.getGlobalServiceManager_hook=self.__old_getGlobalServiceManager_hook
+        # clean up folders and placeful service managers and services too?
+        from Zope import ComponentArchitecture as CA
+        CA.getServiceManager_hook=self.__old_getServiceManager_hook
+        CA.getNextServiceManager_hook=self.__old_getNextServiceManager_hook
+        PlacelessSetup.tearDown(self)
 


=== Zope3/lib/python/Zope/App/OFS/ServiceManager/tests/testServiceManager.py 1.1.2.7 => 1.1.2.8 ===
 from Zope.App.OFS.Folder.RootFolder import RootFolder
 from Zope.App.OFS.Folder.Folder import Folder
-from Zope.Proxy.ContextWrapper import ContextWrapper
+from Zope.Proxy.ContextWrapper import getWrapperContext
 from Zope.App.OFS.ServiceManager.ServiceManager import ServiceManager
-from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
-from Zope.ComponentArchitecture import provideService, getService
-from Zope.ComponentArchitecture import defineService
+from Zope.ComponentArchitecture import getService, getServiceManager
 from Zope.Exceptions import ZopeError
-from Zope.ContextWrapper import Wrapper, getcontext
+from PlacefulSetup import PlacefulSetup
 
 class ITestService(Interface): pass
 
@@ -36,101 +34,95 @@
 
     __implements__ = ITestService
 
-class ServiceManagerTests(BaseTestIContainer, CleanUp, TestCase):
+class ServiceManagerTests(PlacefulSetup, BaseTestIContainer, TestCase):
+
+    def setUp(self):
+        PlacefulSetup.setUp(self)
+        self.buildFolders()
 
     def _Test__new(self):
         return ServiceManager()
 
-    def setUp(self):
-        from PlacefulSetup import PlacefulSetup
-        self.__sandbox=PlacefulSetup()
-    
-    def tearDown(self):
-        self.__sandbox.tearDown()
-
     def testAddService(self):
         sm = ServiceManager()
-        self.__sandbox.rootFolder.setServiceManager(sm)
-        sm=self.__sandbox.rootFolder.getServiceManager()
+        self.rootFolder.setServiceManager(sm)
+        sm=self.rootFolder.getServiceManager()
         ts = TestService()
         sm.setObject('test_service1', ts)
         self.assertEqual(sm.getObject('test_service1'), ts)
 
     def testGetService(self):
         sm = ServiceManager()
-        self.__sandbox.rootFolder.setServiceManager(sm)
-        sm=self.__sandbox.rootFolder.getServiceManager()
+        self.rootFolder.setServiceManager(sm)
+        sm=self.rootFolder.getServiceManager()
         ts = TestService()
         sm.setObject('test_service1', ts)
         sm.bindService('test_service', 'test_service1')
-        testOb=getService(self.__sandbox.rootFolder, 'test_service')
-        self.assertEqual(getcontext(getcontext(testOb)),self.__sandbox.rootFolder)
+        testOb=getService(self.rootFolder, 'test_service')
+        self.assertEqual(getWrapperContext
+             (getWrapperContext(testOb)),self.rootFolder)
         self.assertEqual(testOb, ts)
 
     def testUnbindService(self):
         sm = ServiceManager()
-        self.__sandbox.rootFolder.setServiceManager(sm)
-        sm=self.__sandbox.rootFolder.getServiceManager()
+        self.rootFolder.setServiceManager(sm)
+        sm=self.rootFolder.getServiceManager()
         ts = TestService()
         root_ts = TestService()
-        self.__sandbox.serviceManager.defineService('test_service', ITestService)
-        self.__sandbox.serviceManager.provideService('test_service', root_ts)
-        
+        gsm=getServiceManager(None)
+        gsm.defineService('test_service', ITestService)
+        gsm.provideService('test_service', root_ts)
+
         sm.setObject('test_service1', ts)
         sm.bindService('test_service', 'test_service1')
-        self.assertEqual(getService(self.__sandbox.rootFolder, 'test_service'), ts)
+        self.assertEqual(getService(self.rootFolder, 'test_service'), ts)
         sm.unbindService('test_service')
-        self.assertEqual(getService(self.__sandbox.rootFolder, 'test_service'), root_ts)
+        self.assertEqual(getService(self.rootFolder, 'test_service'), root_ts)
 
     def testDeleteService(self):
-        sm = ServiceManager()
-        self.__sandbox.rootFolder.setServiceManager(sm)
-        sm=self.__sandbox.rootFolder.getServiceManager()
+        self.rootFolder.setServiceManager(ServiceManager())
+        sm=getServiceManager(self.rootFolder)
         ts = TestService()
         
         sm.setObject('test_service1', ts)
         sm.bindService('test_service', 'test_service1')
-        self.assertEqual(getService(self.__sandbox.rootFolder, 'test_service'), ts)
+        self.assertEqual(getService(self.rootFolder, 'test_service'), ts)
         self.assertRaises(ZopeError, sm.delObject, 'test_service1')
     
     def testContextServiceLookup(self):
-        sm = ServiceManager()
-        self.__sandbox.rootFolder.setServiceManager(sm)
-        sm=self.__sandbox.rootFolder.getServiceManager()
+        self.rootFolder.setServiceManager(ServiceManager())
+        sm=getServiceManager(self.rootFolder)
         ts = TestService()
         sm.setObject('test_service1', ts)
         sm.bindService('test_service', 'test_service1')
-        self.assertEqual(getService(self.__sandbox.folder1, 'test_service'), ts)
-        self.assertEqual(getService(self.__sandbox.folder1_1, 'test_service'), ts)
+        self.assertEqual(getService(self.folder1, 'test_service'), ts)
+        self.assertEqual(getService(self.folder1_1, 'test_service'), ts)
 
     def testContextServiceLookupWithMultipleServiceManagers(self):
-        sm = ServiceManager()
-        self.__sandbox.rootFolder.setServiceManager(sm)
-        sm=self.__sandbox.rootFolder.getServiceManager()
+        self.rootFolder.setServiceManager(ServiceManager())
+        sm=getServiceManager(self.rootFolder)
         ts = TestService()
         sm.setObject('test_service1', ts)
         sm.bindService('test_service', 'test_service1')
 
-        sm2 = ServiceManager()
-        self.__sandbox.folder1.setServiceManager(sm)
-        sm2=self.__sandbox.folder1.getServiceManager()
-        
-        self.assertEqual(getService(self.__sandbox.folder1, 'test_service'), ts)
+        self.folder1.setServiceManager(ServiceManager())
+        sm2=getServiceManager(self.folder1)
+
+        self.assertEqual(getService(self.folder1, 'test_service'), ts)
 
     def testComponentArchitectureServiceLookup(self):
-        sm = ServiceManager()
-        self.__sandbox.rootFolder.setServiceManager(sm)
-        sm=self.__sandbox.rootFolder.getServiceManager()
-        sm2 = ServiceManager()
-        self.__sandbox.folder1.setServiceManager(sm)
-        sm2=self.__sandbox.folder1.getServiceManager()
+        self.rootFolder.setServiceManager(ServiceManager())
+        sm=getServiceManager(self.rootFolder)
+        self.folder1.setServiceManager(ServiceManager())
+        sm2=getServiceManager(self.folder1)
         
         ts = TestService()
 
-        self.__sandbox.serviceManager.defineService('test_service', ITestService)
-        self.__sandbox.serviceManager.provideService('test_service', ts)
+        globsm=getServiceManager(None)
+        globsm.defineService('test_service', ITestService)
+        globsm.provideService('test_service', ts)
         
-        self.assertEqual(getService(self.__sandbox.folder1, 'test_service'), ts)
+        self.assertEqual(getService(self.folder1, 'test_service'), ts)