[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Folder/Views/Browser/tests - testFolderAdder.py:1.1.4.4

[Gary Poster]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Folder/Views/Browser/tests
In directory cvs.zope.org:/tmp/cvs-serv31509/App/OFS/Folder/Views/Browser/tests

Modified Files:
      Tag: Zope-3x-branch
	testFolderAdder.py 
Log Message:
1. As per ZopeTop discussion, moved Addable out of ZMI into the Services folder, and turned it into a true service (this involved a lot of small changes, particularly in the folders and a number of tests) and gave it some hooks
2. used SteveA's ContextWrapper.ContextMethod to make the ServiceManager and Services placefully look up to parent placeful equivalents
3. Made Event into a more standard service, and gave it some hooks
4. Built the beginning of a placeful EventService (will need tests, and views, and EventChannels, and more meat; just wanted to check this in for now)
5. made it so you can't add an item to a folder with a blank string id, and updated the folder interface
6. some typos fixed here and there
7. a few more tests here and there

I'm checking this in then checking it out again to check my work; also tagged previous version as gary-service_update.



=== Zope3/lib/python/Zope/App/OFS/Folder/Views/Browser/tests/testFolderAdder.py 1.1.4.3 => 1.1.4.4 ===
 from Zope.App.OFS.Container.Views.Browser.tests.AdderBaseTests \
      import BaseRegistryTest, BaseAddingTest
-from Zope.App.ZMI.Addable import ContentAddables
 
 class Methods:
-    # Supply the methds needed by the bases.
+    # Supply the methods needed by the bases.
+    
+    def setUp(self):
+        from Zope.App.OFS.ServiceManager.tests.PlacefulSetup import PlacefulSetup
+        self.__sandbox=PlacefulSetup()
+        from Zope.App.OFS.Services.AddableService.IAddableService import IAddableService
+        from Zope.App.OFS.Services.AddableService.GlobalAddableService \
+             import GlobalAddableService
+        self.__sandbox.serviceManager.defineService("AddableContent", IAddableService)
+        self.addableContent=GlobalAddableService()
+        self.__sandbox.serviceManager.provideService("AddableContent", self.addableContent)
+        from Zope.App.OFS.ServiceManager.ServiceManager import ServiceManager
+        self.__sandbox.rootFolder.setServiceManager(ServiceManager())
+        self.sm=self.__sandbox.rootFolder.getServiceManager()
+    
+    def tearDown(self):
+        self.__sandbox.tearDown()
 
     def _TestView__newContext(self):
-        from Zope.App.OFS.Folder.Folder import Folder
-        return Folder()
+        return self.sm
 
     def _TestView__newView(self, container):
         from Zope.App.OFS.Folder.Views.Browser.FolderAdder import FolderAdder 
         return FolderAdder(container)
 
     def _TestAdderView__registry(self):
-        return ContentAddables
+        return 'AddableContent'
     
 
 class RegistryTest(Methods, BaseRegistryTest, TestCase): pass
-class AddingTest(Methods, BaseAddingTest, TestCase): pass
+class AddingTest(Methods, BaseAddingTest, TestCase):
+    def setUp(self):
+        Methods.setUp(self)
+        BaseAddingTest.setUp(self)
 
 def test_suite():
     return TestSuite([makeSuite(RegistryTest),