[Zope3-checkins] SVN: Zope3/trunk/src/zope/ move a test to a more appropriate place (breaks a test dependency in

[Benji York]

Log message for revision 72951:
  move a test to a more appropriate place (breaks a test dependency in
  zope.configuration on zope.app)
  

Changed:
  U   Zope3/trunk/src/zope/app/testing/tests.py
  U   Zope3/trunk/src/zope/configuration/tests/test_xmlconfig.py

-=-
Modified: Zope3/trunk/src/zope/app/testing/tests.py
===================================================================
--- Zope3/trunk/src/zope/app/testing/tests.py	2007-03-01 18:00:04 UTC (rev 72950)
+++ Zope3/trunk/src/zope/app/testing/tests.py	2007-03-01 21:57:02 UTC (rev 72951)
@@ -126,6 +126,7 @@
   <BLANKLINE>
 '''
 
+
 class FunctionalHTTPDocTest(unittest.TestCase):
 
     def test_dochttp(self):
@@ -181,20 +182,22 @@
         self.assert_(IRequest.implementedBy(request_class))
         self.assert_(IPublication.implementedBy(publication_class))
 
+
 class DummyCookiesResponse(object):
     # Ugh, this simulates the *internals* of a HTTPResponse object
     # TODO: expand the IHTTPResponse interface to give access to all cookies
     _cookies = None
-    
+
     def __init__(self, cookies=None):
         if not cookies:
             cookies = {}
         self._cookies = cookies
-        
+
+
 class CookieHandlerTestCase(unittest.TestCase):
     def setUp(self):
         self.handler = functional.CookieHandler()
-    
+
     def test_saveCookies(self):
         response = DummyCookiesResponse(dict(
             spam=dict(value='eggs', path='/foo', comment='rest is ignored'),
@@ -205,7 +208,7 @@
                          'spam=eggs; Path=/foo;')
         self.assertEqual(self.handler.cookies['monty'].OutputString(),
                          'monty=python;')
-        
+
     def test_httpCookie(self):
         cookies = self.handler.cookies
         cookies['spam'] = 'eggs'
@@ -213,29 +216,56 @@
         cookies['bar'] = 'baz'
         cookies['bar']['path'] = '/foo/baz'
         cookies['monty'] = 'python'
-        
+
         cookieHeader = self.handler.httpCookie('/foo/bar')
         parts = cookieHeader.split('; ')
         parts.sort()
         self.assertEqual(parts, ['monty=python', 'spam=eggs'])
-        
+
         cookieHeader = self.handler.httpCookie('/foo/baz')
         parts = cookieHeader.split('; ')
         parts.sort()
         self.assertEqual(parts, ['bar=baz', 'monty=python', 'spam=eggs'])
-        
+
     # There is no test for CookieHandler.loadCookies because it that method
-    # only passes the arguments on to Cookie.BaseCookie.load, which the 
+    # only passes the arguments on to Cookie.BaseCookie.load, which the
     # standard library has tests for (we hope).
 
+
+def test_include_of_zope_app():
+    """
+    >>> from zope.configuration import xmlconfig, config
+    >>> context = config.ConfigurationMachine()
+    >>> xmlconfig.registerCommonDirectives(context)
+    >>> import zope.app
+
+    >>> import warnings
+    >>> showwarning = warnings.showwarning
+    >>> warnings.showwarning = lambda *a, **k: None
+
+    >>> xmlconfig.include(context, package=zope.app)
+
+    >>> xmlconfig.include(context, 'configure.zcml', zope.app)
+    >>> xmlconfig.include(context, 'ftesting.zcml', zope.app)
+    >>> xmlconfig.include(context, 'menus.zcml', zope.app)
+    >>> xmlconfig.include(context, 'meta.zcml', zope.app)
+    >>> xmlconfig.include(context, 'file_not_exists.zcml', zope.app) #doctest: +ELLIPSIS
+    Traceback (most recent call last):
+    ...
+    IOError: ...
+
+    >>> warnings.showwarning = showwarning
+    """
+
+
 def test_suite():
     return unittest.TestSuite((
         unittest.makeSuite(FunctionalHTTPDocTest),
         unittest.makeSuite(AuthHeaderTestCase),
         unittest.makeSuite(HTTPCallerTestCase),
         unittest.makeSuite(CookieHandlerTestCase),
+        DocTestSuite(),
         ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
-

Modified: Zope3/trunk/src/zope/configuration/tests/test_xmlconfig.py
===================================================================
--- Zope3/trunk/src/zope/configuration/tests/test_xmlconfig.py	2007-03-01 18:00:04 UTC (rev 72950)
+++ Zope3/trunk/src/zope/configuration/tests/test_xmlconfig.py	2007-03-01 21:57:02 UTC (rev 72951)
@@ -271,30 +271,6 @@
     ['tests/samplepackage/foo.zcml.in']
     """
 
-def test_include_of_zope_app():
-    """
-    >>> context = config.ConfigurationMachine()
-    >>> xmlconfig.registerCommonDirectives(context)
-    >>> import zope.app
-
-    >>> import warnings
-    >>> showwarning = warnings.showwarning
-    >>> warnings.showwarning = lambda *a, **k: None
-
-    >>> xmlconfig.include(context, package=zope.app)
-
-    >>> xmlconfig.include(context, 'configure.zcml', zope.app)
-    >>> xmlconfig.include(context, 'ftesting.zcml', zope.app)
-    >>> xmlconfig.include(context, 'menus.zcml', zope.app)
-    >>> xmlconfig.include(context, 'meta.zcml', zope.app)
-    >>> xmlconfig.include(context, 'file_not_exists.zcml', zope.app) #doctest: +ELLIPSIS
-    Traceback (most recent call last):
-    ...
-    IOError: ...
-
-    >>> warnings.showwarning = showwarning
-    """
-
 def test_include_by_file_glob():
     """
     >>> context = config.ConfigurationMachine()