[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_ - small test refactoring
Yvo Schubbe
y.2011 at wcm-solutions.de
Fri Sep 16 07:17:23 EST 2011
Log message for revision 122819:
- small test refactoring
Changed:
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cookieauth.py
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_mailhost.py
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_memberdata.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py 2011-09-16 02:19:25 UTC (rev 122818)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_actions.py 2011-09-16 12:17:22 UTC (rev 122819)
@@ -25,6 +25,7 @@
from Products.CMFCore.ActionProviderBase import ActionProviderBase
from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IActionsTool
+from Products.CMFCore.interfaces import IMembershipTool
from Products.CMFCore.testing import ExportImportZCMLLayer
from Products.CMFCore.tests.base.dummy import DummySite
from Products.GenericSetup.testing import BodyAdapterTestCase
@@ -354,14 +355,13 @@
class _ActionSetup(BaseRegistryTests):
def _initSite(self, foo=2, bar=2):
- self.root.site = DummySite('site')
- site = self.root.site
- site.portal_membership = DummyMembershipTool()
+ site = DummySite('site')
+ sm = getSiteManager()
+ sm.registerUtility(DummyMembershipTool(), IMembershipTool)
+ atool = DummyActionsTool()
+ atool.addActionProvider('portal_actions')
+ sm.registerUtility(atool, IActionsTool)
- self.atool = DummyActionsTool()
- getSiteManager().registerUtility(self.atool, IActionsTool)
- self.atool.addActionProvider('portal_actions')
-
if foo > 0:
site.portal_foo = DummyTool()
@@ -373,7 +373,7 @@
permission=(),
category='dummy',
visible=1)
- self.atool.addActionProvider('portal_foo')
+ atool.addActionProvider('portal_foo')
if bar > 0:
site.portal_bar = DummyTool()
@@ -386,9 +386,9 @@
permission=('Manage portal',),
category='dummy',
visible=0)
- self.atool.addActionProvider('portal_bar')
+ atool.addActionProvider('portal_bar')
- return site
+ return site, atool
class exportActionProvidersTests(_ActionSetup):
@@ -399,7 +399,7 @@
from Products.CMFCore.exportimport.actions \
import exportActionProviders
- site = self._initSite(0, 0)
+ site, _atool = self._initSite(0, 0)
context = DummyExportContext(site)
exportActionProviders(context)
@@ -413,15 +413,15 @@
from Products.CMFCore.exportimport.actions \
import exportActionProviders
- site = self._initSite()
+ site, atool = self._initSite()
# Set up an old action for added difficulty
- self.atool.addAction(id='baz',
- name='Baz',
- action='baz',
- condition='python:1',
- permission=(),
- category='dummy',
- visible=1)
+ atool.addAction(id='baz',
+ name='Baz',
+ action='baz',
+ condition='python:1',
+ permission=(),
+ category='dummy',
+ visible=1)
context = DummyExportContext(site)
exportActionProviders(context)
@@ -441,8 +441,7 @@
from Products.CMFCore.exportimport.actions \
import importActionProviders
- site = self._initSite(2, 0)
- atool = self.atool
+ site, atool = self._initSite(2, 0)
self.assertEqual(len(atool.listActionProviders()), 2)
self.failUnless('portal_foo' in atool.listActionProviders())
@@ -461,8 +460,7 @@
from Products.CMFCore.exportimport.actions \
import importActionProviders
- site = self._initSite(2, 0)
- atool = self.atool
+ site, atool = self._initSite(2, 0)
self.assertEqual(len(atool.listActionProviders()), 2)
self.failUnless('portal_foo' in atool.listActionProviders())
@@ -481,8 +479,7 @@
from Products.CMFCore.exportimport.actions \
import importActionProviders
- site = self._initSite(2, 0)
- atool = self.atool
+ site, atool = self._initSite(2, 0)
self.assertEqual(len(atool.listActionProviders()), 2)
self.failUnless('portal_foo' in atool.listActionProviders())
@@ -502,8 +499,7 @@
from Products.CMFCore.exportimport.actions \
import importActionProviders
- site = self._initSite(1, 1)
- atool = self.atool
+ site, atool = self._initSite(1, 1)
foo = site.portal_foo
bar = site.portal_bar
@@ -549,8 +545,7 @@
from Products.CMFCore.exportimport.actions \
import importActionProviders
- site = self._initSite(0, 0)
- atool = self.atool
+ site, atool = self._initSite(0, 0)
context = DummyImportContext(site)
context._files['actions.xml'] = _I18N_IMPORT
@@ -575,8 +570,7 @@
from Products.CMFCore.exportimport.actions \
import importActionProviders
- site = self._initSite(0, 0)
- atool = self.atool
+ site, atool = self._initSite(0, 0)
context = DummyImportContext(site)
context._files['actions.xml'] = _NEWSYTLE_EXPORT
@@ -600,8 +594,7 @@
from Products.CMFCore.exportimport.actions \
import importActionProviders
- site = self._initSite(2, 2)
- atool = self.atool
+ site, atool = self._initSite(2, 2)
self.assertEqual(atool.listActionProviders(),
['portal_actions', 'portal_foo', 'portal_bar'])
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cookieauth.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cookieauth.py 2011-09-16 02:19:25 UTC (rev 122818)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_cookieauth.py 2011-09-16 12:17:22 UTC (rev 122819)
@@ -102,8 +102,7 @@
class _CookieCrumblerSetup(BaseRegistryTests):
def _initSite(self, use_changed=False):
- self.root.site = Folder(id='site')
- site = self.root.site
+ site = Folder(id='site').__of__(self.app)
cc = CookieCrumbler()
getSiteManager().registerUtility(cc, ICookieCrumbler)
@@ -116,7 +115,7 @@
cc.pw_cookie = 'value5'
cc.local_cookie_path = 1
- return site
+ return site, cc
class exportCookieCrumblerTests(_CookieCrumblerSetup):
@@ -127,7 +126,7 @@
from Products.CMFCore.exportimport.cookieauth \
import exportCookieCrumbler
- site = self._initSite(use_changed=False)
+ site, _cc = self._initSite(use_changed=False)
context = DummyExportContext(site)
exportCookieCrumbler(context)
@@ -141,7 +140,7 @@
from Products.CMFCore.exportimport.cookieauth \
import exportCookieCrumbler
- site = self._initSite(use_changed=True)
+ site, _cc = self._initSite(use_changed=True)
context = DummyExportContext(site)
exportCookieCrumbler(context)
@@ -160,39 +159,37 @@
from Products.CMFCore.exportimport.cookieauth \
import importCookieCrumbler
- site = self._initSite()
- cc = getSiteManager().getUtility(ICookieCrumbler)
+ site, cc = self._initSite()
context = DummyImportContext(site)
context._files['cookieauth.xml'] = _CHANGED_EXPORT
importCookieCrumbler(context)
- self.assertEqual( cc.auth_cookie, 'value1' )
- self.assertEqual( cc.cache_header_value, 'value2' )
- self.assertEqual( cc.name_cookie, 'value3' )
- self.assertEqual( cc.log_username, 0 )
- self.assertEqual( cc.persist_cookie, 'value4' )
- self.assertEqual( cc.pw_cookie, 'value5' )
- self.assertEqual( cc.local_cookie_path, 1 )
+ self.assertEqual(cc.auth_cookie, 'value1')
+ self.assertEqual(cc.cache_header_value, 'value2')
+ self.assertEqual(cc.name_cookie, 'value3')
+ self.assertEqual(cc.log_username, 0)
+ self.assertEqual(cc.persist_cookie, 'value4')
+ self.assertEqual(cc.pw_cookie, 'value5')
+ self.assertEqual(cc.local_cookie_path, 1)
def test_migration(self):
from Products.CMFCore.exportimport.cookieauth \
import importCookieCrumbler
- site = self._initSite()
- cc = getSiteManager().getUtility(ICookieCrumbler)
+ site, cc = self._initSite()
context = DummyImportContext(site)
context._files['cookieauth.xml'] = _CMF22_IMPORT
importCookieCrumbler(context)
- self.assertEqual( cc.auth_cookie, 'value1' )
- self.assertEqual( cc.cache_header_value, 'value2' )
- self.assertEqual( cc.name_cookie, 'value3' )
- self.assertEqual( cc.log_username, 0 )
- self.assertEqual( cc.persist_cookie, 'value4' )
- self.assertEqual( cc.pw_cookie, 'value5' )
- self.assertEqual( cc.local_cookie_path, 1 )
+ self.assertEqual(cc.auth_cookie, 'value1')
+ self.assertEqual(cc.cache_header_value, 'value2')
+ self.assertEqual(cc.name_cookie, 'value3')
+ self.assertEqual(cc.log_username, 0)
+ self.assertEqual(cc.persist_cookie, 'value4')
+ self.assertEqual(cc.pw_cookie, 'value5')
+ self.assertEqual(cc.local_cookie_path, 1)
def test_suite():
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_mailhost.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_mailhost.py 2011-09-16 02:19:25 UTC (rev 122818)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_mailhost.py 2011-09-16 12:17:22 UTC (rev 122819)
@@ -45,18 +45,17 @@
def _initSite(self, use_changed=False):
from Products.MailHost.MailHost import MailHost
- self.root.site = Folder(id='site')
- site = self.root.site
+ site = Folder(id='site').__of__(self.app)
mh = MailHost('MailHost')
getSiteManager().registerUtility(mh, IMailHost)
-
+
if use_changed:
- mh.smtp_port='1'
- mh.smtp_pwd="value1"
- mh.smtp_host="value2"
- mh.smtp_uid="value3"
+ mh.smtp_port = '1'
+ mh.smtp_pwd = "value1"
+ mh.smtp_host = "value2"
+ mh.smtp_uid = "value3"
- return site
+ return site, mh
class exportMailHostTests(_MailHostSetup):
@@ -66,7 +65,7 @@
def test_unchanged(self):
from Products.CMFCore.exportimport.mailhost import exportMailHost
- site = self._initSite(use_changed=False)
+ site, _mh = self._initSite(use_changed=False)
context = DummyExportContext(site)
exportMailHost(context)
@@ -79,7 +78,7 @@
def test_changed(self):
from Products.CMFCore.exportimport.mailhost import exportMailHost
- site = self._initSite(use_changed=True)
+ site, _mh = self._initSite(use_changed=True)
context = DummyExportContext(site)
exportMailHost(context)
@@ -97,17 +96,16 @@
def test_normal(self):
from Products.CMFCore.exportimport.mailhost import importMailHost
- site = self._initSite()
- mh = getSiteManager().getUtility(IMailHost)
+ site, mh = self._initSite()
context = DummyImportContext(site)
context._files['mailhost.xml'] = _CHANGED_EXPORT
importMailHost(context)
- self.assertEqual( mh.smtp_pwd, 'value1' )
- self.assertEqual( mh.smtp_host, 'value2' )
- self.assertEqual( mh.smtp_uid, 'value3' )
- self.assertEqual( mh.smtp_port, 1 )
+ self.assertEqual(mh.smtp_pwd, 'value1')
+ self.assertEqual(mh.smtp_host, 'value2')
+ self.assertEqual(mh.smtp_uid, 'value3')
+ self.assertEqual(mh.smtp_port, 1)
def test_suite():
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_memberdata.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_memberdata.py 2011-09-16 02:19:25 UTC (rev 122818)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_memberdata.py 2011-09-16 12:17:22 UTC (rev 122819)
@@ -85,8 +85,7 @@
class _MemberDataToolSetup(BaseRegistryTests):
def _initSite(self, use_changed=False):
- self.root.site = Folder(id='site')
- site = self.root.site
+ site = Folder(id='site').__of__(self.app)
mdtool = MemberDataTool()
getSiteManager().registerUtility(mdtool, IMemberDataTool)
@@ -99,7 +98,7 @@
mdtool._updateProperty('fullname', 'value3')
mdtool.manage_addProperty('home_page', '', 'string')
- return site
+ return site, mdtool
class exportMemberDataToolTests(_MemberDataToolSetup):
@@ -110,7 +109,7 @@
from Products.CMFCore.exportimport.memberdata \
import exportMemberDataTool
- site = self._initSite(use_changed=False)
+ site, _mdtool = self._initSite(use_changed=False)
context = DummyExportContext(site)
exportMemberDataTool(context)
@@ -124,7 +123,7 @@
from Products.CMFCore.exportimport.memberdata \
import exportMemberDataTool
- site = self._initSite(use_changed=True)
+ site, _mdtool = self._initSite(use_changed=True)
context = DummyExportContext(site)
exportMemberDataTool(context)
@@ -143,8 +142,7 @@
from Products.CMFCore.exportimport.memberdata \
import importMemberDataTool
- site = self._initSite()
- mdtool = getSiteManager().getUtility(IMemberDataTool)
+ site, mdtool = self._initSite()
context = DummyImportContext(site)
context._files['memberdata.xml'] = _CHANGED_EXPORT
More information about the checkins
mailing list