[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Container/Views/Browser/tests - AdderBaseTests.py:1.1.2.5

[Gary Poster]

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

Modified Files:
      Tag: Zope-3x-branch
	AdderBaseTests.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/Container/Views/Browser/tests/AdderBaseTests.py 1.1.2.4 => 1.1.2.5 ===
 from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
 import Zope.Configuration.name
+from Zope.ComponentArchitecture import getService
 
 class Foo: pass
 class Bar: pass
@@ -59,18 +60,18 @@
         addables = self._TestAdderView__registry()
 
         for datum in data:
-            apply(addables.provideAddable, datum, {} )
+            apply(getService(None,addables).provideAddable, datum, {} )
         container = self._TestView__newContext()
         fa = self._TestView__newView( container )
         info_list = fa.listAddableInfo()
         self.assertEquals( len( info_list ), len( data ) )
 
-        id_list = map( lambda x: x.id(), info_list )
+        id_list = map( lambda x: x.id, info_list )
         self.assert_( 'foo' in id_list )
         self.assert_( 'bar' in id_list )
         self.assert_( 'baz' in id_list )
 
-        title_list = map( lambda x: x.title(), info_list )
+        title_list = map( lambda x: x.title, info_list )
         self.assert_( 'Foo' in title_list )
         self.assert_( 'Bar' in title_list )
         self.assert_( 'Baz' in title_list )