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

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	testFolderAdder.py testFolderContents.py 
	testLoadedFolderContents.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/Content/Folder/Views/Browser/tests/testFolderAdder.py 1.1.4.1 => 1.1.4.2 ===
 
     def _TestView__newView(self, container):
-        from Zope.App.OFS.Content.Folder.Views.Browser.FolderAdder import FolderAdder
-        return FolderAdder(container)
+        from Zope.App.OFS.Content.Folder.Views.Browser.FolderAdder \
+             import FolderAdder
+        return FolderAdder(container, None)
 
     def _TestAdderView__registry(self):
         return 'AddableContent'


=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/tests/testFolderContents.py 1.1.4.1 => 1.1.4.2 ===
 
     def _TestView__newView(self, container):
-        return FolderContents(container)
+        return FolderContents(container, None)
 
     def testAddServiceManager(self):
         folder = Folder()
-        fc = FolderContents(folder)
+        fc = FolderContents(folder, None)
         fc.addServiceManager()
         self.failUnless(folder.hasServiceManager())
         self.assertRaises('HasServiceManager', fc.addServiceManager)


=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/tests/testLoadedFolderContents.py 1.1.4.1 => 1.1.4.2 ===
 
     def _TestView__newView(self, container):
-        return LoadedFolderContents(container)
+        return LoadedFolderContents(container, None)
 
     def testAddServiceManager(self):
         folder = LoadedFolder()
-        fc = LoadedFolderContents(folder)
+        fc = LoadedFolderContents(folder, None)
         fc.addServiceManager()
         self.failUnless(folder.hasServiceManager())
         self.assertRaises('HasServiceManager', fc.addServiceManager)