[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ContentDirective/tests - testDirectives.py:1.6 testFactory.py:1.6

[Jim Fulton]

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

Modified Files:
	testDirectives.py testFactory.py 
Log Message:
Finished implementing
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/AddMenuProposalAndEndOfZmiNamespace

Updated the service manager to use a menu.

Ripped out the old adder registry code.



=== Zope3/lib/python/Zope/App/ContentDirective/tests/testDirectives.py 1.5 => 1.6 ===
 from StringIO import StringIO
 
-from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
 from Zope.Configuration.xmlconfig import xmlconfig, XMLConfig
 from Zope.Configuration.xmlconfig import ZopeXMLConfigurationError
+from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
 
+import Zope.App.ComponentArchitecture
 import Zope.App.Security
-
 import Zope.App.ContentDirective
 
 # explicitly import ExampleClass and IExample using full paths
@@ -41,8 +41,9 @@
       </zopeConfigure>
       """ % s)
 
-class TestContentDirective(CleanUp, unittest.TestCase):
+class TestContentDirective(PlacelessSetup, unittest.TestCase):
     def setUp(self):
+        PlacelessSetup.setUp(self)
         XMLConfig('meta.zcml', Zope.App.ContentDirective)()
         XMLConfig('meta.zcml', Zope.App.Security)()
         
@@ -95,13 +96,10 @@
                        """)
         xmlconfig(f)
         
-        
-from Zope.App.OFS.Services.AddableService.tests.AddableSetup \
-    import AddableSetup
 
-class TestFactorySubdirective(AddableSetup, CleanUp, unittest.TestCase):
+class TestFactorySubdirective(PlacelessSetup, unittest.TestCase):
     def setUp(self):
-        AddableSetup.setUp(self)
+        PlacelessSetup.setUp(self)
         XMLConfig('meta.zcml', Zope.App.ContentDirective)()
         XMLConfig('meta.zcml', Zope.App.Security)()
 


=== Zope3/lib/python/Zope/App/ContentDirective/tests/testFactory.py 1.5 => 1.6 ===
 from Zope.Configuration.xmlconfig import xmlconfig, ZopeXMLConfigurationError
 from Zope.Configuration.xmlconfig import XMLConfig
-
-from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
+from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
 
 import Zope.App.Security
 from Zope.App.Security.Exceptions import UndefinedPermissionError
 
-from Zope.App.OFS.Services.AddableService.tests.AddableSetup \
-    import AddableSetup
-
 import Zope.App.ContentDirective
 from Zope.App.ContentDirective.tests.ExampleClass \
     import ExampleClass, IExample, IExampleContainer
@@ -40,9 +36,9 @@
       </zopeConfigure>
       """ % s)
 
-class Test(AddableSetup, CleanUp, unittest.TestCase):
+class Test(PlacelessSetup, unittest.TestCase):
     def setUp(self):
-        AddableSetup.setUp(self)
+        PlacelessSetup.setUp(self)
         XMLConfig('meta.zcml', Zope.App.ContentDirective)()
         XMLConfig('meta.zcml', Zope.App.Security)()