[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/Publisher/Browser/tests - testDirectives.py:1.14 testGlobalBrowserMenuServiceDirectives.py:1.6 testIconDirective.py:1.7

[R. David Murray]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Publisher/Browser/tests
In directory cvs.zope.org:/tmp/cvs-serv9374/tests

Modified Files:
	testDirectives.py testGlobalBrowserMenuServiceDirectives.py 
	testIconDirective.py 
Log Message:
Port the (very limited) docs from the docs/zcml directory into
a reformatted meta.zcml file.  Adjust the tests to handle the
new-style meta.zcml file.


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testDirectives.py 1.13 => 1.14 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/tests/testDirectives.py:1.13	Mon Oct 28 13:41:18 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/tests/testDirectives.py	Fri Nov  8 14:56:31 2002
@@ -14,6 +14,7 @@
 
 import os
 import unittest
+from cStringIO import StringIO
 
 from Zope.Configuration.xmlconfig import xmlconfig, XMLConfig
 from Zope.Configuration.Exceptions import ConfigurationError
@@ -23,7 +24,7 @@
 from Zope.App.tests.PlacelessSetup import PlacelessSetup
 from Zope.Security.Proxy import ProxyFactory
 from Zope.Proxy.ProxyIntrospection import removeAllProxies
-from cStringIO import StringIO
+import Zope.Configuration
 
 from Zope.ComponentArchitecture.tests.Request import Request
 
@@ -61,6 +62,7 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
+        XMLConfig('metameta.zcml', Zope.Configuration)()
         XMLConfig('meta.zcml', Zope.App.Publisher.Browser)()
 
         from Zope.ComponentArchitecture.GlobalAdapterService \


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testGlobalBrowserMenuServiceDirectives.py 1.5 => 1.6 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/tests/testGlobalBrowserMenuServiceDirectives.py:1.5	Fri Oct  4 14:37:23 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/tests/testGlobalBrowserMenuServiceDirectives.py	Fri Nov  8 14:56:31 2002
@@ -25,6 +25,7 @@
 from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher
 from Zope.Publisher.Browser.BrowserRequest import TestRequest
 from Zope.App.tests.PlacelessSetup import PlacelessSetup
+import Zope.Configuration
 
 import Zope.App.Publisher.Browser
 
@@ -38,6 +39,7 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
+        XMLConfig('metameta.zcml', Zope.Configuration)()
         XMLConfig('meta.zcml', Zope.App.Publisher.Browser)()
         
     def test(self):


=== Zope3/lib/python/Zope/App/Publisher/Browser/tests/testIconDirective.py 1.6 => 1.7 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/tests/testIconDirective.py:1.6	Mon Oct 28 13:41:18 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/tests/testIconDirective.py	Fri Nov  8 14:56:31 2002
@@ -30,6 +30,7 @@
 from Zope.ComponentArchitecture import queryView, getView, getResource
 from Zope.Security.Proxy import ProxyFactory
 from Zope.Configuration.Exceptions import ConfigurationError
+import Zope.Configuration
 
 import Zope.App.Publisher.Browser
 
@@ -59,6 +60,7 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
+        XMLConfig('metameta.zcml', Zope.Configuration)()
         XMLConfig('meta.zcml', Zope.App.Publisher.Browser)()
         defineCheckers()