[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZMI/tests - testAddable.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	testAddable.py 
Log Message:
Refactored addable registry and added separate content and service addables

=== Zope3/lib/python/Zope/App/ZMI/tests/testAddable.py 1.1.2.1 => 1.1.2.2 ===
 import unittest, sys
-from Zope.App.ZMI.Addable import provideAddable, getAddables, _clear, Addable
+from Zope.App.ZMI.Addable import ContentAddables, _clear, Addable
 
 class Test(unittest.TestCase):
 
@@ -9,17 +9,17 @@
 
     def testItAll(self):
 
-        self.assertEqual(getAddables(None), [])
+        self.assertEqual(ContentAddables.getAddables(None), [])
 
-        provideAddable('.Contact', 'Personal Contact', 'blah\nblah')
+        ContentAddables.provideAddable('.Contact', 'Personal Contact', 'blah\nblah')
 
-        self.assertEqual(getAddables(None), [
+        self.assertEqual(ContentAddables.getAddables(None), [
             Addable('.Contact', 'Personal Contact', 'blah\nblah'),
             ])
 
-        provideAddable('.spam', 'junk mail', 'spam\nspam')
+        ContentAddables.provideAddable('.spam', 'junk mail', 'spam\nspam')
 
-        self.assertEqual(getAddables(None), [
+        self.assertEqual(ContentAddables.getAddables(None), [
             Addable('.Contact', 'Personal Contact', 'blah\nblah'),
             Addable('.spam', 'junk mail', 'spam\nspam'),
             ])