[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/tests/test_ - replaced old 'SecurityRequestTest' alias
Yvo Schubbe
y.2010 at wcm-solutions.de
Sun Dec 26 05:31:02 EST 2010
Log message for revision 119116:
- replaced old 'SecurityRequestTest' alias
- some related cleanup
Changed:
U Products.CMFCore/trunk/Products/CMFCore/tests/test_ActionProviderBase.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_ActionsTool.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_CMFCatalogAware.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalContent.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_ActionProviderBase.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_ActionProviderBase.py 2010-12-26 09:56:33 UTC (rev 119115)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_ActionProviderBase.py 2010-12-26 10:31:01 UTC (rev 119116)
@@ -21,7 +21,7 @@
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyTool
-from Products.CMFCore.tests.base.testcase import SecurityRequestTest
+from Products.CMFCore.tests.base.testcase import SecurityTest
from Products.CMFCore.tests.base.testcase import WarningInterceptor
#
@@ -59,18 +59,18 @@
)
-class ActionProviderBaseTests(SecurityRequestTest, WarningInterceptor):
+class ActionProviderBaseTests(SecurityTest, WarningInterceptor):
def setUp(self):
self._trap_warning_output()
- SecurityRequestTest.setUp(self)
+ SecurityTest.setUp(self)
self.site = DummySite('site').__of__(self.root)
utool = self.site._setObject( 'portal_url', DummyTool() )
mtool = self.site._setObject( 'portal_membership', DummyTool() )
def tearDown(self):
cleanUp()
- SecurityRequestTest.tearDown(self)
+ SecurityTest.tearDown(self)
self._free_warning_output()
def _makeProvider( self, dummy=0 ):
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_ActionsTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_ActionsTool.py 2010-12-26 09:56:33 UTC (rev 119115)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_ActionsTool.py 2010-12-26 10:31:01 UTC (rev 119116)
@@ -26,7 +26,7 @@
from Products.CMFCore.Expression import Expression
from Products.CMFCore.interfaces import ISiteRoot
from Products.CMFCore.MembershipTool import MembershipTool
-from Products.CMFCore.tests.base.testcase import SecurityRequestTest
+from Products.CMFCore.tests.base.testcase import SecurityTest
from Products.CMFCore.tests.base.testcase import WarningInterceptor
from Products.CMFCore.URLTool import URLTool
@@ -112,7 +112,7 @@
self.assertRaises(ValueError, tool.getActionObject, 'wrong_format')
-class ActionsToolSecurityRequestTests(SecurityRequestTest):
+class ActionsToolSecurityTests(SecurityTest):
def _getTargetClass(self):
from Products.CMFCore.ActionsTool import ActionsTool
@@ -123,7 +123,7 @@
return self._getTargetClass()(*args, **kw)
def setUp(self):
- SecurityRequestTest.setUp(self)
+ SecurityTest.setUp(self)
root = self.root
sm = getSiteManager()
@@ -173,11 +173,11 @@
def tearDown(self):
cleanUp()
- SecurityRequestTest.tearDown(self)
+ SecurityTest.tearDown(self)
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(ActionsToolTests),
- unittest.makeSuite(ActionsToolSecurityRequestTests),
+ unittest.makeSuite(ActionsToolSecurityTests),
))
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_CMFCatalogAware.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_CMFCatalogAware.py 2010-12-26 09:56:33 UTC (rev 119115)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_CMFCatalogAware.py 2010-12-26 10:31:01 UTC (rev 119116)
@@ -20,7 +20,6 @@
from AccessControl.SecurityManagement import newSecurityManager
from OFS.Folder import Folder
from OFS.SimpleItem import SimpleItem
-
from zope.interface import implements
from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
@@ -28,10 +27,10 @@
from Products.CMFCore.interfaces import IContentish
from Products.CMFCore.testing import EventZCMLLayer
from Products.CMFCore.testing import TraversingZCMLLayer
+from Products.CMFCore.tests.base.testcase import LogInterceptor
+from Products.CMFCore.tests.base.testcase import SecurityTest
from Products.CMFCore.tests.test_PortalFolder import _AllowedUser
from Products.CMFCore.tests.test_PortalFolder import _SensitiveSecurityPolicy
-from Products.CMFCore.tests.base.testcase import LogInterceptor
-from Products.CMFCore.tests.base.testcase import SecurityRequestTest
CMF_SECURITY_INDEXES = CMFCatalogAware._cmf_security_indexes
@@ -215,7 +214,7 @@
# FIXME: more tests needed
-class CMFCatalogAware_CopySupport_Tests(SecurityRequestTest):
+class CMFCatalogAware_CopySupport_Tests(SecurityTest):
layer = EventZCMLLayer
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py 2010-12-26 09:56:33 UTC (rev 119115)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py 2010-12-26 10:31:01 UTC (rev 119116)
@@ -37,7 +37,7 @@
from Products.CMFCore.tests.base.dummy import DummyObject
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyTool
-from Products.CMFCore.tests.base.testcase import SecurityRequestTest
+from Products.CMFCore.tests.base.testcase import SecurityTest
from Products.CMFCore.tests.base.tidata import FTIDATA_CMF
from Products.CMFCore.TypesTool import FactoryTypeInformation as FTI
from Products.CMFCore.TypesTool import TypesTool
@@ -146,10 +146,10 @@
self.assertEqual( r.response.base, '/foo/' )
-class DynamicTypeSecurityTests(SecurityRequestTest):
+class DynamicTypeSecurityTests(SecurityTest):
def setUp(self):
- SecurityRequestTest.setUp(self)
+ SecurityTest.setUp(self)
self.site = DummySite('site').__of__(self.root)
self.site._setObject( 'portal_membership', DummyTool() )
self.site._setObject( 'portal_types', TypesTool() )
@@ -160,7 +160,7 @@
def tearDown(self):
cleanUp()
- SecurityRequestTest.tearDown(self)
+ SecurityTest.tearDown(self)
def test_getTypeInfo(self):
foo = self.site.foo
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalContent.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalContent.py 2010-12-26 09:56:33 UTC (rev 119115)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalContent.py 2010-12-26 10:31:01 UTC (rev 119116)
@@ -29,7 +29,7 @@
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyTool
from Products.CMFCore.tests.base.dummy import DummyUserFolder
-from Products.CMFCore.tests.base.testcase import SecurityRequestTest
+from Products.CMFCore.tests.base.testcase import SecurityTest
class PortalContentTests(unittest.TestCase):
@@ -81,7 +81,7 @@
self.assertEqual( ob(), 'dummy' )
-class TestContentCopyPaste(SecurityRequestTest):
+class TestContentCopyPaste(SecurityTest):
# Tests related to http://www.zope.org/Collectors/CMF/205
# Copy/pasting a content item must set ownership to pasting user
@@ -89,7 +89,7 @@
layer = TraversingEventZCMLLayer
def setUp(self):
- SecurityRequestTest.setUp(self)
+ SecurityTest.setUp(self)
self.root._setObject('site', DummySite('site'))
self.site = self.root.site
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py 2010-12-26 09:56:33 UTC (rev 119115)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_PortalFolder.py 2010-12-26 10:31:01 UTC (rev 119116)
@@ -29,8 +29,8 @@
from zope.interface import implements
from zope.interface.verify import verifyClass
+from Products.CMFCore.exceptions import BadRequest
from Products.CMFCore.interfaces import ICatalogTool
-from Products.CMFCore.exceptions import BadRequest
from Products.CMFCore.interfaces import ITypesTool
from Products.CMFCore.testing import ConformsToFolder
from Products.CMFCore.testing import FunctionalZCMLLayer
@@ -39,14 +39,12 @@
from Products.CMFCore.tests.base.dummy import DummyFactoryDispatcher
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyUserFolder
-from Products.CMFCore.tests.base.testcase import SecurityRequestTest
from Products.CMFCore.tests.base.testcase import SecurityTest
from Products.CMFCore.tests.base.tidata import FTIDATA_CMF
from Products.CMFCore.tests.base.tidata import FTIDATA_DUMMY
from Products.CMFCore.TypesTool import FactoryTypeInformation as FTI
from Products.CMFCore.TypesTool import TypesTool
from Products.CMFCore.WorkflowTool import WorkflowTool
-from types import TupleType
def extra_meta_types():
return [{'name': 'Dummy', 'action': 'manage_addFolder',
@@ -74,7 +72,7 @@
return len(self.paths)
def has_path(catalog, path):
- if type(path) is TupleType:
+ if isinstance(path, tuple):
path = '/'.join(path)
return path in catalog.paths
@@ -140,8 +138,21 @@
self.assertRaises(ValueError, f.invokeFactory, 'Dummy Content', 'foo')
-class PortalFolderTests(ConformsToFolder, SecurityTest):
+class PortalFolderTests(ConformsToFolder, unittest.TestCase):
+ def _getTargetClass(self):
+ from Products.CMFCore.PortalFolder import PortalFolder
+
+ return PortalFolder
+
+ def test_interfaces(self):
+ from OFS.interfaces import IOrderedContainer
+
+ verifyClass(IOrderedContainer, self._getTargetClass())
+
+
+class PortalFolderSecurityTests(SecurityTest):
+
layer = FunctionalZCMLLayer
def _getTargetClass(self):
@@ -157,11 +168,6 @@
SecurityTest.setUp(self)
self.site = DummySite('site').__of__(self.root)
- def test_interfaces(self):
- from OFS.interfaces import IOrderedContainer
-
- verifyClass(IOrderedContainer, self._getTargetClass())
-
def test_contents_methods(self):
ttool = self.site._setObject( 'portal_types', TypesTool() )
f = self._makeOne('foo')
@@ -922,7 +928,7 @@
return self._lambdas[ 0 ]( object, object_roles )
-class PortalFolderCopySupportTests(SecurityRequestTest):
+class PortalFolderCopySupportTests(SecurityTest):
layer = FunctionalZCMLLayer
@@ -1304,6 +1310,7 @@
return unittest.TestSuite((
unittest.makeSuite(PortalFolderFactoryTests),
unittest.makeSuite(PortalFolderTests),
+ unittest.makeSuite(PortalFolderSecurityTests),
unittest.makeSuite(PortalFolderMoveTests),
unittest.makeSuite(ContentFilterTests),
unittest.makeSuite(PortalFolderCopySupportTests),
More information about the checkins
mailing list