[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ServiceManager/Views/Browser/tests - testBindings.py:1.1.2.2

[Steve Alexander]

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

Modified Files:
      Tag: Zope-3x-branch
	testBindings.py 
Log Message:
Working TTW service manager + tests.


=== Zope3/lib/python/Zope/App/OFS/ServiceManager/Views/Browser/tests/testBindings.py 1.1.2.1 => 1.1.2.2 ===
 from Zope.App.OFS.ServiceManager.Views.Browser.Bindings \
         import Bindings
+from Zope.ComponentArchitecture import provideService, defineService
 from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
 
 
@@ -39,50 +40,54 @@
 
     def setUp(self):
         CleanUp.setUp(self)
-	sm = ServiceManager()
-	sm.defineService('service1', ITestService1)
-	sm.defineService('service2', ITestService2)
-	
-	sA = TestService1()
-	sB = TestService1()
-	sC = TestService2()
-
-	sm.setObject('TestServiceA', sA)
-	sm.setObject('TestServiceB', sB)
-	sm.setObject('TestServiceC', sC)
-
-	sm.bindService('service1', 'TestServiceA')
-	
-	self.sm = sm
+        sm = ServiceManager()
+        defineService('service1', ITestService1)
+        defineService('service2', ITestService2)
+        
+        sA = TestService1()
+        sB = TestService1()
+        sC = TestService2()
+
+        sm.setObject('TestServiceA', sA)
+        sm.setObject('TestServiceB', sB)
+        sm.setObject('TestServiceC', sC)
+
+        sm.bindService('service1', 'TestServiceA')
+        
+        self.sm = sm
 
     def testGetServicesTable(self):
-	view = Bindings(self.sm)
-	self.assertEqual(len(view.getServicesTable()), 2)
+        view = Bindings(self.sm)
+        self.assertEqual(len(view.getServicesTable()), 2)
 
     def testServiceTableBound(self):
-	view = Bindings(self.sm)
-	services = view.getServicesTable()
-	serviceMap = None
-	for sMap in services:
-	    if sMap['name'] == 'service1':
-		serviceMap = sMap
-		break
-	    
-	self.assertEqual(serviceMap['bound'], 'TestServiceA')
-
-## This test is not working (bug in getServicesTable(), returning
-## 'Acquired' instead of 'None'
-	
-##    def testServiceTableNone(self):
-##	view = Bindings(self.sm)
-##	services = view.getServicesTable()
-##	serviceMap = None
-##	for sMap in services:
-##	    if sMap['name'] == 'service2':
-##		serviceMap = sMap
-##		break
-	    
-##	self.assertEqual(serviceMap['bound'], 'None')
+        view = Bindings(self.sm)
+        services = view.getServicesTable()
+        serviceMap = None
+        for sMap in services:
+            if sMap['name'] == 'service1':
+                serviceMap = sMap
+                break
+            
+        self.assertEqual(serviceMap['bound'], 'TestServiceA')
+
+## Was commented:
+## """This test is not working (bug in getServicesTable(), returning
+## 'Acquired' instead of 'None'"""
+## 
+## However, we're now acquiring from the globally defined services,
+## so it is appropriate to return 'Acquired'.
+        
+    def testServiceTableNone(self):
+        view = Bindings(self.sm)
+        services = view.getServicesTable()
+        serviceMap = None
+        for sMap in services:
+            if sMap['name'] == 'service2':
+                serviceMap = sMap
+                break
+            
+        self.assertEqual(serviceMap['bound'], 'Acquired')
 
 def test_suite():
     return TestSuite([makeSuite(ServiceManagerTests)])