[Zope3-checkins] SVN: Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/ Move doctests around, and provide a little backwards compatibility for zope.app.session.tests

Brian Sutherland jinty at web.de
Mon Apr 9 19:11:34 EDT 2007


Log message for revision 74072:
  Move doctests around, and provide a little backwards compatibility for zope.app.session.tests

Changed:
  U   Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/__init__.py
  A   Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/test_bootstrap.py
  U   Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/test_doctest.py

-=-
Modified: Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/__init__.py
===================================================================
--- Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/__init__.py	2007-04-09 23:07:21 UTC (rev 74071)
+++ Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/__init__.py	2007-04-09 23:11:33 UTC (rev 74072)
@@ -0,0 +1,2 @@
+# used in older zope.app.session.tests
+from zope.app.appsetup.tests.test_bootstrap import EventStub, TestBootstrapSubscriber

Added: Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/test_bootstrap.py
===================================================================
--- Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/test_bootstrap.py	2007-04-09 23:07:21 UTC (rev 74071)
+++ Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/test_bootstrap.py	2007-04-09 23:11:33 UTC (rev 74072)
@@ -0,0 +1,161 @@
+##############################################################################
+#
+# Copyright (c) 2003, 2004 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.
+#
+##############################################################################
+"""Bootstrap tests
+
+$Id: test_doctest.py 74061 2007-04-09 21:10:32Z jinty $
+"""
+import unittest
+import transaction
+
+from ZODB.tests.util import DB
+from zope.traversing.api import traverse
+
+from zope.app import zapi
+from zope.app.component import hooks
+from zope.app.component.testing import PlacefulSetup
+from zope.app.error.error import ErrorReportingUtility
+from zope.app.error.interfaces import IErrorReportingUtility
+from zope.app.folder import rootFolder, Folder
+from zope.app.folder.interfaces import IRootFolder
+from zope.app.publication.zopepublication import ZopePublication
+from zope.app.component.site import LocalSiteManager
+
+
+from zope.app.appsetup.bootstrap import bootStrapSubscriber
+from zope.app.appsetup.bootstrap import getInformationFromEvent, \
+     ensureObject, ensureUtility
+
+class EventStub(object):
+
+    def __init__(self, db):
+        self.database = db
+
+#
+# TODO: some methods from the boostap modue are not tested
+#
+
+class TestBootstrapSubscriber(PlacefulSetup, unittest.TestCase):
+
+    def setUp(self):
+        PlacefulSetup.setUp(self)
+        self.db = DB()
+
+    def tearDown(self):
+        transaction.abort()
+        PlacefulSetup.tearDown(self)
+        self.db.close()
+
+    def createRootFolder(self):
+        cx = self.db.open()
+        root = cx.root()
+        self.root_folder = rootFolder()
+        root[ZopePublication.root_name] = self.root_folder
+        transaction.commit()
+        cx.close()
+
+    def createRFAndSM(self):
+        cx = self.db.open()
+        root = cx.root()
+        self.root_folder = rootFolder()
+        root[ZopePublication.root_name] = self.root_folder
+        self.site_manager = LocalSiteManager(self.root_folder)
+        self.root_folder.setSiteManager(self.site_manager)
+
+        sub_folder = Folder()
+        self.root_folder["sub_folder"] = sub_folder
+        sub_site_manager = LocalSiteManager(sub_folder)
+        sub_folder.setSiteManager(sub_site_manager)
+
+        transaction.commit()
+        cx.close()
+
+    def test_notify(self):
+        for setup in (lambda: None), self.createRootFolder, self.createRFAndSM:
+            setup()
+        bootStrapSubscriber(EventStub(self.db))
+        cx = self.db.open()
+        root = cx.root()
+        root_folder = root.get(ZopePublication.root_name, None)
+        self.assert_(IRootFolder.providedBy(root_folder))
+        package_name = '/++etc++site/default'
+        package = traverse(root_folder, package_name)
+        cx.close()
+
+    def test_ensureUtilityForSubSite(self):
+        self.createRFAndSM()
+
+        db, connection, root, root_folder = getInformationFromEvent(
+            EventStub(self.db))
+
+        sub_folder = root_folder['sub_folder']
+        ensureUtility(sub_folder, IErrorReportingUtility,
+                     'ErrorReporting', ErrorReportingUtility,
+                     'ErrorReporting', asObject=True)
+
+        # Make sure it was created on the sub folder, not the root folder
+        got_utility = zapi.getUtility(IErrorReportingUtility, name='ErrorReporting',
+                context=sub_folder)
+        got_path = zapi.getPath(got_utility)
+        self.assertEquals("/sub_folder/++etc++site/default/ErrorReporting", got_path)
+
+    def test_ensureUtility(self):
+        self.createRFAndSM()
+
+        db, connection, root, root_folder = getInformationFromEvent(
+            EventStub(self.db))
+
+        # TODO: check EventSub
+        root_folder = self.root_folder
+        for i in range(2):
+            cx = self.db.open()
+            utility = ensureUtility(root_folder, IErrorReportingUtility,
+                                    'ErrorReporting', ErrorReportingUtility,
+                                    'ErrorReporting', asObject=True)
+            utility2 = ensureUtility(root_folder, IErrorReportingUtility,
+                                     'ErrorReporting2', ErrorReportingUtility,
+                                     'ErrorReporting2', asObject=True)
+            if utility != None:
+                name = utility.__name__
+                name2 = utility2.__name__
+            else:
+                name = None
+                name2 = None
+            if i == 0:
+                self.assertEqual(name, 'ErrorReporting')
+                self.assertEqual(name2, 'ErrorReporting2')
+            else:
+                self.assertEqual(name, None)
+                self.assertEqual(name2, None)
+
+            root = cx.root()
+            root_folder = root[ZopePublication.root_name]
+
+            package_name = '/++etc++site/default'
+            package = traverse(self.root_folder, package_name)
+
+            self.assert_(IErrorReportingUtility.providedBy(
+                traverse(package, 'ErrorReporting')))
+            self.assert_(IErrorReportingUtility.providedBy(
+                traverse(package, 'ErrorReporting2')))
+            transaction.commit()
+
+        cx.close()
+
+def bootstraptearDown(test):
+    test.globs['db'].close()
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestBootstrapSubscriber))
+    return suite


Property changes on: Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/test_bootstrap.py
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/test_doctest.py
===================================================================
--- Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/test_doctest.py	2007-04-09 23:07:21 UTC (rev 74071)
+++ Zope3/branches/jinty-zodbless/src/zope/app/appsetup/tests/test_doctest.py	2007-04-09 23:11:33 UTC (rev 74072)
@@ -11,154 +11,18 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Bootstrap tests
+"""Doctest tests
 
 $Id$
 """
 import unittest
-import transaction
 
-from ZODB.tests.util import DB
 from zope.interface import implements
 from zope.testing import doctest
-from zope.traversing.api import traverse
+from zope.app.testing import placelesssetup
 
-from zope.app import zapi
-from zope.app.component import hooks
-from zope.app.component.testing import PlacefulSetup
-from zope.app.error.error import ErrorReportingUtility
-from zope.app.error.interfaces import IErrorReportingUtility
-from zope.app.folder import rootFolder, Folder
-from zope.app.folder.interfaces import IRootFolder
-from zope.app.publication.zopepublication import ZopePublication
-from zope.app.component.site import LocalSiteManager
-
 from zope.app.appsetup.interfaces import IApplicationFactory
-from zope.app.appsetup.bootstrap import bootStrapSubscriber
-from zope.app.appsetup.bootstrap import getInformationFromEvent, \
-     ensureObject, ensureUtility
 
-from zope.app.testing import placelesssetup
-
-class EventStub(object):
-
-    def __init__(self, db):
-        self.database = db
-
-#
-# TODO: some methods from the boostap modue are not tested
-#
-
-class TestBootstrapSubscriber(PlacefulSetup, unittest.TestCase):
-
-    def setUp(self):
-        PlacefulSetup.setUp(self)
-        self.db = DB()
-
-    def tearDown(self):
-        transaction.abort()
-        PlacefulSetup.tearDown(self)
-        self.db.close()
-
-    def createRootFolder(self):
-        cx = self.db.open()
-        root = cx.root()
-        self.root_folder = rootFolder()
-        root[ZopePublication.root_name] = self.root_folder
-        transaction.commit()
-        cx.close()
-
-    def createRFAndSM(self):
-        cx = self.db.open()
-        root = cx.root()
-        self.root_folder = rootFolder()
-        root[ZopePublication.root_name] = self.root_folder
-        self.site_manager = LocalSiteManager(self.root_folder)
-        self.root_folder.setSiteManager(self.site_manager)
-
-        sub_folder = Folder()
-        self.root_folder["sub_folder"] = sub_folder
-        sub_site_manager = LocalSiteManager(sub_folder)
-        sub_folder.setSiteManager(sub_site_manager)
-
-        transaction.commit()
-        cx.close()
-
-    def test_notify(self):
-        for setup in (lambda: None), self.createRootFolder, self.createRFAndSM:
-            setup()
-        bootStrapSubscriber(EventStub(self.db))
-        cx = self.db.open()
-        root = cx.root()
-        root_folder = root.get(ZopePublication.root_name, None)
-        self.assert_(IRootFolder.providedBy(root_folder))
-        package_name = '/++etc++site/default'
-        package = traverse(root_folder, package_name)
-        cx.close()
-
-    def test_ensureUtilityForSubSite(self):
-        self.createRFAndSM()
-
-        db, connection, root, root_folder = getInformationFromEvent(
-            EventStub(self.db))
-
-        sub_folder = root_folder['sub_folder']
-        ensureUtility(sub_folder, IErrorReportingUtility,
-                     'ErrorReporting', ErrorReportingUtility,
-                     'ErrorReporting', asObject=True)
-    
-        # Make sure it was created on the sub folder, not the root folder
-        got_utility = zapi.getUtility(IErrorReportingUtility, name='ErrorReporting',
-                context=sub_folder)
-        got_path = zapi.getPath(got_utility)
-        self.assertEquals("/sub_folder/++etc++site/default/ErrorReporting", got_path)
-
-    def test_ensureUtility(self):
-        self.createRFAndSM()
-
-        db, connection, root, root_folder = getInformationFromEvent(
-            EventStub(self.db))
-
-        # TODO: check EventSub
-        root_folder = self.root_folder
-        for i in range(2):
-            cx = self.db.open()
-            utility = ensureUtility(root_folder, IErrorReportingUtility,
-                                    'ErrorReporting', ErrorReportingUtility,
-                                    'ErrorReporting', asObject=True)
-            utility2 = ensureUtility(root_folder, IErrorReportingUtility,
-                                     'ErrorReporting2', ErrorReportingUtility,
-                                     'ErrorReporting2', asObject=True)
-            if utility != None:
-                name = utility.__name__
-                name2 = utility2.__name__
-            else:
-                name = None
-                name2 = None
-            if i == 0:
-                self.assertEqual(name, 'ErrorReporting')
-                self.assertEqual(name2, 'ErrorReporting2')
-            else:
-                self.assertEqual(name, None)
-                self.assertEqual(name2, None)
-
-            root = cx.root()
-            root_folder = root[ZopePublication.root_name]
-
-            package_name = '/++etc++site/default'
-            package = traverse(self.root_folder, package_name)
-
-            self.assert_(IErrorReportingUtility.providedBy(
-                traverse(package, 'ErrorReporting')))
-            self.assert_(IErrorReportingUtility.providedBy(
-                traverse(package, 'ErrorReporting2')))
-            transaction.commit()
-
-        cx.close()
-
-def bootstraptearDown(test):
-    test.globs['db'].close()
-
 class ApplicationFactoryStub:
 
     implements(IApplicationFactory)
@@ -171,7 +35,6 @@
 
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestBootstrapSubscriber))
     suite.addTest(doctest.DocTestSuite(
         'zope.app.appsetup.appsetup',
         setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown))



More information about the Zope3-Checkins mailing list