[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Service/tests - testServiceManager.py:1.1.2.3

[Michael McLay]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Service/tests
In directory cvs.zope.org:/tmp/cvs-serv22671/lib/python/Zope/App/Service/tests

Modified Files:
      Tag: Zope-3x-branch
	testServiceManager.py 
Log Message:
Added ServiceManagerBindingView and Service/pt/services_binding.pt.
Moved funtionality from IServiceService to IServiceManager and added
getServiceDefinitions() to Service.py. Changed the name of provideService
in ServiceManager to bindService and modified the functionality to allow
multiple service implementations to be associated with a service definition.



=== Zope3/lib/python/Zope/App/Service/tests/testServiceManager.py 1.1.2.2 => 1.1.2.3 ===
         self.assertEqual(self.root.getServiceManager(), sm)
 
+    def testAddService(self):
+	sm = ServiceManager()
+	self.root.setServiceManager(sm)
+	ts = TestService()
+	sm.setObject('test_service1', ts)
+	self.assertEqual(sm.getObject('test_service1'), ts)
+
     def testGetService(self):
         sm = ServiceManager()
         self.root.setServiceManager(sm)
         ts = TestService()
         sm.defineService('test_service', ITestService)
-        sm.provideService('test_service', ts)
+	sm.setObject('test_service1', ts)
+        sm.bindService('test_service', 'test_service1')
         self.assertEqual(getService(self.root, 'test_service'), ts)
 
     def testContextServiceLookup(self):
         sm = ServiceManager()
         self.root.setServiceManager(sm)
         ts = TestService()
-        sm.defineService('test_service', ITestService)
-        sm.provideService('test_service', ts)
+	sm.defineService('test_service', ITestService)
+	sm.setObject('test_service1', ts)
+        sm.bindService('test_service', 'test_service1')
         self.assertEqual(getService(self.wrapped_folder, 'test_service'), ts)
 
     def testContextServiceLookupWithMultipleServiceManagers(self):
         sm = ServiceManager()
         self.root.setServiceManager(sm)
         ts = TestService()
-        sm.defineService('test_service', ITestService)
-        sm.provideService('test_service', ts)
+	sm.defineService('test_service', ITestService)
+	sm.setObject('test_service1', ts)
+        sm.bindService('test_service', 'test_service1')
 
         sm2 = ServiceManager()
         self.folder.setServiceManager(sm2)
         
         self.assertEqual(getService(self.wrapped_folder, 'test_service'), ts)
 
+
     def testComponentArchitectureServiceLookup(self):
         sm = ServiceManager()
         self.root.setServiceManager(sm)
@@ -89,6 +100,7 @@
         serviceManager.provideService('test_service', ts)
         
         self.assertEqual(getService(self.wrapped_folder, 'test_service'), ts)
+
 
         
 def test_suite():