[Checkins] SVN: zope.testbrowser/trunk/src/zope/testbrowser/ checkpoint reorganization of tests

[Benji York]

Log message for revision 75585:
  checkpoint reorganization of tests
  

Changed:
  U   zope.testbrowser/trunk/src/zope/testbrowser/README.txt
  D   zope.testbrowser/trunk/src/zope/testbrowser/ftests/testdoc.py
  U   zope.testbrowser/trunk/src/zope/testbrowser/tests.py

-=-
Modified: zope.testbrowser/trunk/src/zope/testbrowser/README.txt
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/README.txt	2007-05-06 20:05:28 UTC (rev 75584)
+++ zope.testbrowser/trunk/src/zope/testbrowser/README.txt	2007-05-06 20:12:31 UTC (rev 75585)
@@ -137,7 +137,7 @@
 The headers can be accessed as a string:
 
     >>> print browser.headers
-    Status: 200 OK
+    Status: 200 Ok
     Content-Length: ...
     Content-Type: text/html;charset=utf-8
     X-Powered-By: Zope (www.zope.org), Python (www.python.org)

Deleted: zope.testbrowser/trunk/src/zope/testbrowser/ftests/testdoc.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/ftests/testdoc.py	2007-05-06 20:05:28 UTC (rev 75584)
+++ zope.testbrowser/trunk/src/zope/testbrowser/ftests/testdoc.py	2007-05-06 20:12:31 UTC (rev 75585)
@@ -1,38 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Test Browser Tests
-
-$Id$
-"""
-import os
-import unittest
-import doctest
-from zope.app.testing.functional import FunctionalDocFileSuite
-from zope.app.testing import functional
-
-TestBrowserLayer = functional.ZCMLLayer(
-    os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
-    __name__, 'TestBrowserLayer', allow_teardown=True)
-
-def test_suite():
-    flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
-    readme = FunctionalDocFileSuite('../README.txt', optionflags=flags)
-    readme.layer = TestBrowserLayer 
-    wire = FunctionalDocFileSuite('../over_the_wire.txt', optionflags=flags)
-    wire.level = 2
-    wire.layer = TestBrowserLayer 
-    return unittest.TestSuite((readme, wire))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

Modified: zope.testbrowser/trunk/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/tests.py	2007-05-06 20:05:28 UTC (rev 75584)
+++ zope.testbrowser/trunk/src/zope/testbrowser/tests.py	2007-05-06 20:12:31 UTC (rev 75585)
@@ -16,18 +16,20 @@
 $Id$
 """
 
-import unittest
+from cStringIO import StringIO
+from zope.app.testing import functional
+from zope.app.testing.functional import FunctionalDocFileSuite
+from zope.testbrowser import browser
+from zope.testing import renormalizing, doctest
 import httplib
+import mechanize
+import os
 import re
+import unittest
+import unittest
 import urllib2
-from cStringIO import StringIO
 
-import mechanize
 
-from zope.testbrowser import browser
-from zope.testing import renormalizing, doctest
-
-
 def set_next_response(body, headers=None, status='200', reason='OK'):
     global next_response_body
     global next_response_headers
@@ -362,11 +364,20 @@
     (re.compile('Status: 200 O[Kk]'), 'Status: 200 OK'),
     ])
 
+TestBrowserLayer = functional.ZCMLLayer(
+    os.path.join(os.path.split(__file__)[0], 'ftests/ftesting.zcml'),
+    __name__, 'TestBrowserLayer', allow_teardown=True)
+
 def test_suite():
     from zope.testing import doctest
-    return unittest.TestSuite((
-        doctest.DocTestSuite(checker=checker),
-        ))
+    flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
+    readme = FunctionalDocFileSuite('README.txt', optionflags=flags)
+    readme.layer = TestBrowserLayer
+    wire = FunctionalDocFileSuite('over_the_wire.txt', optionflags=flags)
+    wire.level = 2
+    wire.layer = TestBrowserLayer
+    this_file = doctest.DocTestSuite(checker=checker)
+    return unittest.TestSuite((this_file, readme, wire))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')