[Checkins] SVN: zope.testbrowser/branches/jinty-webtest2/src/zope/testbrowser/ Move test setup code out of the test itself

[Brian Sutherland]

Log message for revision 119627:
  Move test setup code out of the test itself

Changed:
  U   zope.testbrowser/branches/jinty-webtest2/src/zope/testbrowser/cookies.txt
  U   zope.testbrowser/branches/jinty-webtest2/src/zope/testbrowser/tests.py

-=-
Modified: zope.testbrowser/branches/jinty-webtest2/src/zope/testbrowser/cookies.txt
===================================================================
--- zope.testbrowser/branches/jinty-webtest2/src/zope/testbrowser/cookies.txt	2011-01-17 16:31:10 UTC (rev 119626)
+++ zope.testbrowser/branches/jinty-webtest2/src/zope/testbrowser/cookies.txt	2011-01-18 01:18:36 UTC (rev 119627)
@@ -311,11 +311,6 @@
     >>> sorted(browser.cookies.keys())
     ['foo', 'max', 'sha', 'va', 'wow']
 
-    >>> import zope.site.folder
-    >>> getRootFolder()['inner'] = zope.site.folder.Folder()
-    >>> getRootFolder()['inner']['path'] = zope.site.folder.Folder()
-    >>> import transaction
-    >>> transaction.commit()
     >>> browser.open('http://localhost/inner/get_cookie.html')
     >>> print browser.contents # has gewgaw
     foo: bar

Modified: zope.testbrowser/branches/jinty-webtest2/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/branches/jinty-webtest2/src/zope/testbrowser/tests.py	2011-01-17 16:31:10 UTC (rev 119626)
+++ zope.testbrowser/branches/jinty-webtest2/src/zope/testbrowser/tests.py	2011-01-18 01:18:36 UTC (rev 119627)
@@ -491,8 +491,15 @@
         checker=checker, globs=globals)
     readme.layer = TestBrowserLayer
 
+    def setUp(test):
+        folder = test.globs['getRootFolder']()
+        import zope.site.folder
+        folder['inner'] = zope.site.folder.Folder()
+        folder['inner']['path'] = zope.site.folder.Folder()
+        import transaction
+        transaction.commit()
     cookies = FunctionalDocFileSuite('cookies.txt', optionflags=flags,
-        checker=checker, globs=globals)
+        checker=checker, globs=globals, setUp=setUp)
     cookies.layer = TestBrowserLayer
 
     fixed_bugs = FunctionalDocFileSuite('fixed-bugs.txt', optionflags=flags,
@@ -511,13 +518,8 @@
     readme = doctest.DocFileSuite('README.txt', optionflags=flags,
         checker=checker, globs=globals)
 
-    def setUp(test):
-        root = {}
-        def fakeGetRootFolder():
-            return root
-        test.globs['getRootFolder'] = fakeGetRootFolder
     cookies = doctest.DocFileSuite('cookies.txt', optionflags=flags,
-        checker=checker, globs=globals, setUp=setUp)
+        checker=checker, globs=globals)
 
     fixed_bugs = doctest.DocFileSuite('fixed-bugs.txt', optionflags=flags,
         globs=globals)