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

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	testAdder.py testBindings.py testContents.py 
Log Message:
Merging in Zope3InWonderland-branch, which implemented the following
proposals (see
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/OldProposals): 
- RenameAllowToRequire

- GroupClassRelatedDirectivesInClassDirective

- ViewInterfaceAndSimplification

- ConsistentUseOfSpacesAsDelimitersInZCMLAttributes

- TwoArgumentViewConstructors

- ImplementsInZCML

- SimpleViewCreationInZCML

- RemoveGetView

- ReplaceProtectWithAllow

- ViewMethodsAsViews

- MergeProtectionAndComponentDefinitions

There were also various security fixes resulting of better integration
of security with components.


=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Views/Browser/tests/testAdder.py 1.1.4.1 => 1.1.4.2 ===
 
     def _TestView__newContext(self):
-        from Zope.App.OFS.Services.ServiceManager.ServiceManager import ServiceManager
+        from Zope.App.OFS.Services.ServiceManager.ServiceManager \
+             import ServiceManager
         return ServiceManager()
 
     def _TestView__newView(self, container):
-        from Zope.App.OFS.Services.ServiceManager.Views.Browser.Adder import Adder 
-        return Adder(container)
+        from Zope.App.OFS.Services.ServiceManager.Views.Browser.Adder \
+             import Adder 
+        return Adder(container, None)
 
     def _TestAdderView__registry(self):
         return 'AddableServices'


=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Views/Browser/tests/testBindings.py 1.1.4.1 => 1.1.4.2 ===
 
     def testGetServicesTable(self):
-        view = Bindings(self.sm)
+        view = Bindings(self.sm, None)
         self.assertEqual(len(view.getServicesTable()), 8) #that is, 2+6
 
     def testServiceTableBound(self):
-        view = Bindings(self.sm)
+        view = Bindings(self.sm, None)
         services = view.getServicesTable()
         serviceMap = None
         for sMap in services:
@@ -84,7 +84,7 @@
 ## service2 provided globally?
 ##        
     def testServiceTableNone(self):
-        view = Bindings(self.sm)
+        view = Bindings(self.sm, None)
         services = view.getServicesTable()
         serviceMap = None
         for sMap in services:


=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Views/Browser/tests/testContents.py 1.1.4.1 => 1.1.4.2 ===
 
     def _TestView__newView(self, container):
-        return ServiceManagerContents(container)
+        return ServiceManagerContents(container, None)
 
-    def testExtractContents( self ):
+    def testExtractContents(self):
         """ Does _extractContents return the correct information? """
 
-        smc = ServiceManagerContents( None )
-        info = smc._extractContentInfo( ('dummy', Dummy(),) )
+        smc = ServiceManagerContents(None , None)
+        info = smc._extractContentInfo(('dummy', Dummy(),))
 
-        self.assert_( 'IDummy' in info['interfaces'] )
+        self.assert_('IDummy' in info['interfaces'])
 
-    def testInfo( self ):
+    def testInfo(self):
         """ Do we get the correct information back from
             ServiceManagerContents?
         """
 
         sm = ServiceManager()
         dummy = Dummy()
-        sm.setObject( 'dummy', dummy )
+        sm.setObject('dummy', dummy)
 
-        smc = ServiceManagerContents( sm )
+        smc = ServiceManagerContents(sm, None)
         info_list = smc.listContentInfo()
 
-        self.assertEquals( len( info_list ), 1 )
+        self.assertEquals(len(info_list), 1)
 
         interfaces = [ x['interfaces'] for x in info_list ]
-        self.assert_( 'IDummy' in interfaces[0] )
+        self.assert_('IDummy' in interfaces[0])
 
 def test_suite():
     loader = unittest.TestLoader()
-    return loader.loadTestsFromTestCase( Test )
+    return loader.loadTestsFromTestCase(Test)
 
 if __name__=='__main__':
     unittest.main()