[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - set up vocabulary registry for all functional tests
Yvo Schubbe
cvs-admin at zope.org
Mon Jul 16 09:25:49 UTC 2012
Log message for revision 127346:
- set up vocabulary registry for all functional tests
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_btreefolder.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_document.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py
D Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py
U Products.CMFDefault/trunk/Products/CMFDefault/testing.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_btreefolder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_btreefolder.py 2012-07-16 09:24:24 UTC (rev 127345)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_btreefolder.py 2012-07-16 09:25:46 UTC (rev 127346)
@@ -16,18 +16,12 @@
import unittest
from Testing import ZopeTestCase
-from Products.CMFDefault.browser.content.tests.utils import clearVocabulary
-from Products.CMFDefault.browser.content.tests.utils import setupVocabulary
from Products.CMFDefault.testing import FunctionalLayer
-ftest_suite = ZopeTestCase.FunctionalDocFileSuite('btreefolder.txt',
- setUp=setupVocabulary,
- tearDown=clearVocabulary
- )
-ftest_suite.layer = FunctionalLayer
-
def test_suite():
- return unittest.TestSuite((
- ftest_suite,
- ))
+ suite = unittest.TestSuite()
+ s = ZopeTestCase.FunctionalDocFileSuite('btreefolder.txt')
+ s.layer = FunctionalLayer
+ suite.addTest(s)
+ return suite
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_document.py 2012-07-16 09:24:24 UTC (rev 127345)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_document.py 2012-07-16 09:25:46 UTC (rev 127346)
@@ -16,19 +16,12 @@
import unittest
from Testing import ZopeTestCase
-from Products.CMFDefault.browser.content.tests.utils import clearVocabulary
-from Products.CMFDefault.browser.content.tests.utils import setupVocabulary
from Products.CMFDefault.testing import FunctionalLayer
-ftest_suite = ZopeTestCase.FunctionalDocFileSuite(
- 'document.txt',
- setUp=setupVocabulary,
- tearDown=clearVocabulary,
- )
-ftest_suite.layer = FunctionalLayer
-
def test_suite():
- return unittest.TestSuite((
- ftest_suite,
- ))
+ suite = unittest.TestSuite()
+ s = ZopeTestCase.FunctionalDocFileSuite('document.txt')
+ s.layer = FunctionalLayer
+ suite.addTest(s)
+ return suite
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py 2012-07-16 09:24:24 UTC (rev 127345)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py 2012-07-16 09:25:46 UTC (rev 127346)
@@ -31,8 +31,6 @@
from Products.CMFCore.tests.base.dummy import DummyTool
from Products.CMFDefault.browser.content.folder import ContentsView
from Products.CMFDefault.browser.content.folder import FolderView
-from Products.CMFDefault.browser.content.tests.utils import clearVocabulary
-from Products.CMFDefault.browser.content.tests.utils import setupVocabulary
from Products.CMFDefault.testing import FunctionalLayer
@@ -167,16 +165,11 @@
self.assertFalse(view.has_local())
-ftest_suite = ZopeTestCase.FunctionalDocFileSuite('folder.txt',
- setUp=setupVocabulary,
- tearDown=clearVocabulary,
- )
-
-ftest_suite.layer = FunctionalLayer
-
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(FolderContentsViewTests))
suite.addTest(unittest.makeSuite(FolderViewTests))
- suite.addTest(unittest.TestSuite((ftest_suite,)))
+ s = ZopeTestCase.FunctionalDocFileSuite('folder.txt')
+ s.layer = FunctionalLayer
+ suite.addTest(s)
return suite
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py 2012-07-16 09:24:24 UTC (rev 127345)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py 2012-07-16 09:25:46 UTC (rev 127346)
@@ -1,24 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2009 Zope Foundation and Contributors.
-#
-# 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.
-#
-##############################################################################
-""" Shared utility functions for browser view tests
-"""
-
-from Zope2.App.schema import Zope2VocabularyRegistry
-
-def setupVocabulary(testcase):
- from zope.schema.vocabulary import setVocabularyRegistry
- setVocabularyRegistry(Zope2VocabularyRegistry())
-
-def clearVocabulary(testcase):
- from zope.schema.vocabulary import _clear
- _clear()
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py 2012-07-16 09:24:24 UTC (rev 127345)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py 2012-07-16 09:25:46 UTC (rev 127346)
@@ -14,81 +14,14 @@
"""
import unittest
-
-from zope.component.testing import PlacelessSetup
-
-from Products.CMFDefault.browser.content.tests.utils import clearVocabulary
-from Products.CMFDefault.browser.content.tests.utils import setupVocabulary
-
-from Products.CMFDefault.browser.skins.tests.test_ursa import (
- DummyRequest, DummySite, DummyContext,
- DummyPropertiesTool, DummyURLTool, DummyActionsTool
- )
-
-class PreferencesFormTests(unittest.TestCase, PlacelessSetup):
-
- def setUp(self):
- PlacelessSetup.setUp(self)
-
- def tearDown(self):
- PlacelessSetup.tearDown(self)
-
- def _getTargetClass(self):
- from Products.CMFDefault.browser.membership.join import Join
- return Join
-
- def _makeOne(self, site=None):
- if site is None:
- site = self._makeSite()
- request = DummyRequest()
- return self._getTargetClass()(site, request)
-
- def _makeSite(self,):
- from zope.component import getSiteManager
- from Products.CMFCore.interfaces import IPropertiesTool
- site = DummyContext()
- tool = site.portal_properties = DummyPropertiesTool()
- sm = getSiteManager()
- sm.registerUtility(tool, IPropertiesTool)
- site.portal_url = DummyURLTool(site)
- site.portal_membership = DummyMembershipTool()
- site.portal_registration = DummyRegistrationTool()
- site.portal_actions = DummyActionsTool()
- site.absolute_url = lambda: 'http://example.com'
- return site
-
- def test_user_folder(self):
- site = self._makeSite()
- view = self._makeOne(site)
-
-
-class DummyRegistrationTool:
- pass
-
-
-class DummyMembershipTool:
- pass
-
-
-class DummyActionsTool:
- pass
-
-
-class DummySkinsTool:
- pass
-
-#Doctests
from Testing import ZopeTestCase
+
from Products.CMFDefault.testing import FunctionalLayer
-ftest_suite = ZopeTestCase.FunctionalDocFileSuite('preferences.txt',
- setUp=setupVocabulary,
- tearDown=clearVocabulary,
- )
-ftest_suite.layer = FunctionalLayer
-
def test_suite():
- return unittest.TestSuite((
- ftest_suite,
- ))
\ No newline at end of file
+ suite = unittest.TestSuite()
+ s = ZopeTestCase.FunctionalDocFileSuite('preferences.txt')
+ s.layer = FunctionalLayer
+ suite.addTest(s)
+ return suite
Modified: Products.CMFDefault/trunk/Products/CMFDefault/testing.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/testing.py 2012-07-16 09:24:24 UTC (rev 127345)
+++ Products.CMFDefault/trunk/Products/CMFDefault/testing.py 2012-07-16 09:25:46 UTC (rev 127346)
@@ -19,6 +19,7 @@
import transaction
from Zope2.App import zcml
+from Zope2.App.schema import configure_vocabulary_registry
from Products.CMFCore.testing import FunctionalZCMLLayer
from Products.CMFDefault.factory import addConfiguredSite
@@ -33,6 +34,7 @@
zcml.load_config('configure.zcml', Products.CMFDefault)
zcml.load_config('configure.zcml', Products.DCWorkflow)
+ configure_vocabulary_registry()
app = ZopeTestCase.app()
addConfiguredSite(app, 'site', 'Products.CMFDefault:default',
More information about the checkins
mailing list