[Checkins] SVN: Products.CMFUid/trunk/Products/CMFUid/ - finished converting tools into local utilities
Yvo Schubbe
y.2011 at wcm-solutions.de
Mon Sep 26 03:51:44 EST 2011
Log message for revision 122942:
- finished converting tools into local utilities
Changed:
UU Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py
U Products.CMFUid/trunk/Products/CMFUid/UniqueIdHandlerTool.py
U Products.CMFUid/trunk/Products/CMFUid/tests/test_uidannotation.py
U Products.CMFUid/trunk/Products/CMFUid/tests/test_uidgeneration.py
U Products.CMFUid/trunk/Products/CMFUid/tests/test_uidhandling.py
-=-
Modified: Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py 2011-09-26 08:51:28 UTC (rev 122941)
+++ Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py 2011-09-26 08:51:44 UTC (rev 122942)
@@ -13,8 +13,6 @@
"""Unique Id Annotation Tool
Provides support for managing unique id annotations.
-
-$Id$
"""
from AccessControl.SecurityInfo import ClassSecurityInfo
@@ -28,11 +26,11 @@
from zope.container.interfaces import IObjectAddedEvent
from zope.interface import implements
-from Products.CMFCore.utils import getToolByName
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
from Products.CMFUid.interfaces import IUniqueIdAnnotation
from Products.CMFUid.interfaces import IUniqueIdAnnotationManagement
+from Products.CMFUid.interfaces import IUniqueIdHandler
from Products.CMFUid.interfaces import UniqueIdError
@@ -75,38 +73,38 @@
if IObjectAddedEvent.providedBy(event):
if event.newParent is not None:
anno_tool = queryUtility(IUniqueIdAnnotationManagement)
- uid_handler = getToolByName(ob, 'portal_uidhandler', None)
+ uidtool = queryUtility(IUniqueIdHandler)
if anno_tool is not None:
- remove_on_add = anno_tool.getProperty('remove_on_add',False)
- remove_on_clone = anno_tool.getProperty('remove_on_clone',False)
- assign_on_add = anno_tool.getProperty('assign_on_add',False)
+ remove_on_add = anno_tool.getProperty('remove_on_add', False)
+ remove_on_clone = anno_tool.getProperty('remove_on_clone', False)
+ assign_on_add = anno_tool.getProperty('assign_on_add', False)
if (remove_on_add and remove_on_clone) or assign_on_add:
try:
- uid_handler.unregister(ob)
+ uidtool.unregister(ob)
except UniqueIdError:
# did not have one
pass
if assign_on_add:
# assign new uid
- uid_handler.register(ob)
-
+ uidtool.register(ob)
+
elif IObjectClonedEvent.providedBy(event):
anno_tool = queryUtility(IUniqueIdAnnotationManagement)
- uid_handler = getToolByName(ob, 'portal_uidhandler', None)
+ uidtool = queryUtility(IUniqueIdHandler)
if anno_tool is not None:
remove_on_clone = anno_tool.getProperty('remove_on_clone', False)
assign_on_clone = anno_tool.getProperty('assign_on_clone', False)
if remove_on_clone or assign_on_clone:
try:
- uid_handler.unregister(ob)
+ uidtool.unregister(ob)
except UniqueIdError:
# did not have one
pass
if assign_on_clone:
# assign new uid
- uid_handler.register(ob)
+ uidtool.register(ob)
class UniqueIdAnnotationTool(UniqueObject, SimpleItem, PropertyManager):
Property changes on: Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Products.CMFUid/trunk/Products/CMFUid/UniqueIdHandlerTool.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/UniqueIdHandlerTool.py 2011-09-26 08:51:28 UTC (rev 122941)
+++ Products.CMFUid/trunk/Products/CMFUid/UniqueIdHandlerTool.py 2011-09-26 08:51:44 UTC (rev 122942)
@@ -30,6 +30,7 @@
from Products.CMFCore.interfaces import ICatalogTool
from Products.CMFCore.permissions import ManagePortal
+from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
from Products.CMFUid.interfaces import IUniqueIdAnnotationManagement
from Products.CMFUid.interfaces import IUniqueIdBrainQuery
@@ -40,7 +41,7 @@
UID_ATTRIBUTE_NAME = 'cmf_uid'
-_wwwdir = os.path.join( package_home( globals() ), 'www' )
+_wwwdir = os.path.join(package_home(globals()), 'www')
class UniqueIdHandlerTool(UniqueObject, SimpleItem):
@@ -52,7 +53,7 @@
id = 'portal_uidhandler'
- manage_options = ( ({'label': 'Query',
+ manage_options = (({'label': 'Query',
'action': 'manage_queryObject'},)
+ SimpleItem.manage_options
)
@@ -248,3 +249,4 @@
manage_queryObject = PageTemplateFile('queryUID.pt', _wwwdir)
InitializeClass(UniqueIdHandlerTool)
+registerToolInterface('portal_uidhandler', IUniqueIdHandler)
Modified: Products.CMFUid/trunk/Products/CMFUid/tests/test_uidannotation.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/tests/test_uidannotation.py 2011-09-26 08:51:28 UTC (rev 122941)
+++ Products.CMFUid/trunk/Products/CMFUid/tests/test_uidannotation.py 2011-09-26 08:51:44 UTC (rev 122942)
@@ -17,6 +17,7 @@
import Testing
import transaction
+from AccessControl import SecurityManager
from AccessControl.SecurityManagement import newSecurityManager
from Acquisition import Implicit
from OFS.Folder import Folder
@@ -30,7 +31,6 @@
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.CMFUid.interfaces import IUniqueIdAnnotationManagement
from Products.CMFUid.interfaces import IUniqueIdHandler
from Products.CMFUid.interfaces import UniqueIdError
from Products.CMFUid.testing import UidEventZCMLLayer
@@ -51,9 +51,11 @@
self.counter = 0
def register(self, ob):
+ from Products.CMFUid.interfaces import IUniqueIdAnnotationManagement
+
uid_assigner = getUtility(IUniqueIdAnnotationManagement)
annotation = uid_assigner(ob, UID_ATTRNAME)
- annotation.setUid( self.counter )
+ annotation.setUid(self.counter)
self.counter += 1
def unregister(self, ob):
@@ -73,29 +75,30 @@
return UniqueIdAnnotationTool
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
+
def setUp(self):
+ from Products.CMFUid.interfaces import IUniqueIdAnnotationManagement
+
SecurityTest.setUp(self)
- self.root._setObject('portal_uidannotation', self._getTargetClass()())
- self.root._setObject('portal_uidhandler', DummyUniqueIdHandlerTool())
-
+ self.uidannotation = self._makeOne()
sm = getSiteManager()
- sm.registerUtility( self.root.portal_uidannotation
- , IUniqueIdAnnotationManagement
- )
+ sm.registerUtility(self.uidannotation, IUniqueIdAnnotationManagement)
+ sm.registerUtility(DummyUniqueIdHandlerTool(), IUniqueIdHandler)
- self.root._setObject('dummy', DummyContent(id='dummy'))
- self.root._setObject('site', Folder('site'))
+ self.app._setObject('dummy', DummyContent(id='dummy'))
+ self.app._setObject('site', Folder('site'))
transaction.savepoint(optimistic=True)
- def _initPolicyAndUser( self
+ def _initPolicyAndUser(self
, a_lambda=None
, v_lambda=None
, c_lambda=None
):
- from AccessControl import SecurityManager
- def _promiscuous( *args, **kw ):
+ def _promiscuous(*args, **kw):
return 1
if a_lambda is None:
@@ -107,9 +110,9 @@
if c_lambda is None:
c_lambda = _promiscuous
- scp = _SensitiveSecurityPolicy( v_lambda, c_lambda )
- SecurityManager.setSecurityPolicy( scp )
- newSecurityManager( None
+ scp = _SensitiveSecurityPolicy(v_lambda, c_lambda)
+ SecurityManager.setSecurityPolicy(scp)
+ newSecurityManager(None
, _AllowedUser(a_lambda).__of__(self.app.acl_users))
def test_interfaces(self):
@@ -122,8 +125,8 @@
verifyClass(IUniqueIdAnnotation, UniqueIdAnnotation)
def test_setAndGetUid(self):
- dummy = self.root.dummy
- annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
+ dummy = self.app.dummy
+ annotation = self.uidannotation(dummy, UID_ATTRNAME)
self.assertEqual(annotation(), None)
annotation.setUid(13)
@@ -145,8 +148,8 @@
def test_simulateItemAddAssigningUid(self):
# an annotated object is set in place
dummy = DummyContent(id='dummycontent')
- self.root.portal_uidannotation.assign_on_add = True
- self.root._setObject('dummycontent', dummy)
+ self.uidannotation.assign_on_add = True
+ self.app._setObject('dummycontent', dummy)
annotation = getattr(dummy, UID_ATTRNAME, None)
@@ -155,26 +158,26 @@
def test_simulateItemAddRemovingUid(self):
# an annotated object is set in place
dummy = DummyContent(id='dummycontent')
- annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
- self.root._setObject('dummycontent', dummy)
+ self.uidannotation(dummy, UID_ATTRNAME)
+ self.app._setObject('dummycontent', dummy)
self.assertRaises(AttributeError, getattr, dummy, UID_ATTRNAME)
def test_simulateItemAddAssignsNewUid(self):
# an annotated object is set in place
dummy = DummyContent(id='dummycontent')
- annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
- self.root.portal_uidannotation.assign_on_add = True
- self.root._setObject('dummycontent', dummy)
+ annotation = self.uidannotation(dummy, UID_ATTRNAME)
+ self.uidannotation.assign_on_add = True
+ self.app._setObject('dummycontent', dummy)
- self.failIf( getattr(dummy, UID_ATTRNAME)()==annotation() )
+ self.failIf(getattr(dummy, UID_ATTRNAME)() == annotation())
def test_simulateItemAddDoesNotTouchUid(self):
# an annotated object is set in place
dummy = DummyContent(id='dummycontent')
- annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
- self.root.portal_uidannotation.remove_on_add = False
- self.root._setObject('dummycontent', dummy)
+ annotation = self.uidannotation(dummy, UID_ATTRNAME)
+ self.uidannotation.remove_on_add = False
+ self.app._setObject('dummycontent', dummy)
self.assertEqual(getattr(dummy, UID_ATTRNAME), annotation)
@@ -182,9 +185,9 @@
# an object is set in place, annotated and then renamed
self._initPolicyAndUser() # allow copy/paste operations
dummy = TheClass('dummy')
- site = self.root.site
+ site = self.app.site
site._setObject('dummy', dummy)
- annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
+ annotation = self.uidannotation(dummy, UID_ATTRNAME)
transaction.savepoint(optimistic=True)
@@ -196,84 +199,84 @@
# an object is set in place, annotated and then copied
self._initPolicyAndUser() # allow copy/paste operations
dummy = TheClass('dummy')
- site = self.root.site
+ site = self.app.site
site._setObject('dummy', dummy)
- annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
- self.root._setObject('folder1', Folder('folder1'))
+ self.uidannotation(dummy, UID_ATTRNAME)
+ self.app._setObject('folder1', Folder('folder1'))
transaction.savepoint(optimistic=True)
cookie = site.manage_copyObjects(ids=['dummy'])
- self.root.folder1.manage_pasteObjects( cookie )
+ self.app.folder1.manage_pasteObjects(cookie)
- self.assertRaises(AttributeError, getattr, self.root.folder1.dummy, UID_ATTRNAME)
+ self.assertRaises(AttributeError, getattr, self.app.folder1.dummy, UID_ATTRNAME)
def test_simulateItemCloneRemovingUid2(self):
# an object is set in place, annotated and then copied
self._initPolicyAndUser() # allow copy/paste operations
dummy = TheClass('dummy')
- site = self.root.site
+ site = self.app.site
site._setObject('dummy', dummy)
- annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
- self.root.portal_uidannotation.remove_on_add = False
- self.root._setObject('folder1', Folder('folder1'))
+ self.uidannotation(dummy, UID_ATTRNAME)
+ self.uidannotation.remove_on_add = False
+ self.app._setObject('folder1', Folder('folder1'))
transaction.savepoint(optimistic=True)
cookie = site.manage_copyObjects(ids=['dummy'])
- self.root.folder1.manage_pasteObjects( cookie )
+ self.app.folder1.manage_pasteObjects(cookie)
- self.assertRaises(AttributeError, getattr, self.root.folder1.dummy, UID_ATTRNAME)
+ self.assertRaises(AttributeError, getattr, self.app.folder1.dummy, UID_ATTRNAME)
def test_simulateItemCloneDoesNotTouchUid(self):
# an object is set in place, annotated, and then copied
self._initPolicyAndUser() # allow copy/paste operations
dummy = TheClass('dummy')
- site = self.root.site
+ site = self.app.site
site._setObject('dummy', dummy)
- annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
- self.root.portal_uidannotation.remove_on_clone = False
- self.root._setObject('folder1', Folder('folder1'))
+ annotation = self.uidannotation(dummy, UID_ATTRNAME)
+ self.uidannotation.remove_on_clone = False
+ self.app._setObject('folder1', Folder('folder1'))
transaction.savepoint(optimistic=True)
cookie = site.manage_copyObjects(ids=['dummy'])
- self.root.folder1.manage_pasteObjects( cookie )
- new_annotation = getattr(self.root.folder1.dummy, UID_ATTRNAME)
+ self.app.folder1.manage_pasteObjects(cookie)
+ new_annotation = getattr(self.app.folder1.dummy, UID_ATTRNAME)
- self.assertEqual(annotation(), new_annotation() )
+ self.assertEqual(annotation(), new_annotation())
def test_simulateItemCloneAssignsNewUid(self):
# an object is set in place, annotated, and then copied
self._initPolicyAndUser() # allow copy/paste operations
dummy = TheClass('dummy')
- site = self.root.site
+ site = self.app.site
site._setObject('dummy', dummy)
- annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
- self.root.portal_uidannotation.assign_on_clone = True
- self.root._setObject('folder1', Folder('folder1'))
+ annotation = self.uidannotation(dummy, UID_ATTRNAME)
+ self.uidannotation.assign_on_clone = True
+ self.app._setObject('folder1', Folder('folder1'))
transaction.savepoint(optimistic=True)
cookie = site.manage_copyObjects(ids=['dummy'])
- self.root.folder1.manage_pasteObjects( cookie )
- new_annotation = getattr(self.root.folder1.dummy, UID_ATTRNAME)
+ self.app.folder1.manage_pasteObjects(cookie)
+ new_annotation = getattr(self.app.folder1.dummy, UID_ATTRNAME)
- self.failIf( annotation() == new_annotation() )
+ self.failIf(annotation() == new_annotation())
def test_simulateNestedFolderCloneRemovingUid1(self):
self._initPolicyAndUser() # allow copy/paste operations
- self.root.site._setObject( 'foo', Folder(id='foo') )
- self.root.site._setObject( 'foo2', Folder(id='foo2') )
- foo = self.root.site.foo
- foo._setObject( 'sub1', Folder(id='sub1') )
- foo.sub1._setObject( 'sub2', Folder(id='sub2') )
- foo.sub1.sub2._setObject( 'baz', DummyContent(id='baz', catalog=1) )
+ self.app.site._setObject('foo', Folder(id='foo'))
+ self.app.site._setObject('foo2', Folder(id='foo2'))
+ foo = self.app.site.foo
+ foo._setObject('sub1', Folder(id='sub1'))
+ foo.sub1._setObject('sub2', Folder(id='sub2'))
+ foo.sub1.sub2._setObject('baz', DummyContent(id='baz', catalog=1))
baz = foo.sub1.sub2.baz
- annotation = self.root.portal_uidannotation(baz, UID_ATTRNAME)
- self.assertEqual( getattr(baz, UID_ATTRNAME), annotation )
+ annotation = self.uidannotation(baz, UID_ATTRNAME)
+ self.assertEqual(getattr(baz, UID_ATTRNAME), annotation)
transaction.savepoint(optimistic=True)
- cookie = self.root.site.manage_copyObjects(ids='foo')
- self.root.site.foo2.manage_pasteObjects(cookie)
+ cookie = self.app.site.manage_copyObjects(ids='foo')
+ self.app.site.foo2.manage_pasteObjects(cookie)
- self.assertRaises(AttributeError, getattr, self.root.site.foo2.foo.sub1.sub2.baz, UID_ATTRNAME)
+ self.assertRaises(AttributeError, getattr, self.app.site.foo2.foo.sub1.sub2.baz, UID_ATTRNAME)
def test_suite():
Modified: Products.CMFUid/trunk/Products/CMFUid/tests/test_uidgeneration.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/tests/test_uidgeneration.py 2011-09-26 08:51:28 UTC (rev 122941)
+++ Products.CMFUid/trunk/Products/CMFUid/tests/test_uidgeneration.py 2011-09-26 08:51:44 UTC (rev 122942)
@@ -30,9 +30,8 @@
return UniqueIdGeneratorTool
- def setUp(self):
- SecurityTest.setUp(self)
- self.root._setObject('portal_uidgenerator', self._getTargetClass()())
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
def test_interfaces(self):
from Products.CMFUid.interfaces import IUniqueIdGenerator
@@ -40,14 +39,14 @@
verifyClass(IUniqueIdGenerator, self._getTargetClass())
def test_returnedUidsAreValidAndDifferent(self):
- generator = self.root.portal_uidgenerator
+ generator = self._makeOne()
uid1 = generator()
uid2 = generator()
self.failIfEqual(uid1, uid2)
self.failIfEqual(uid1, None)
def test_converter(self):
- generator = self.root.portal_uidgenerator
+ generator = self._makeOne()
uid = generator()
str_uid = str(uid)
result = generator.convert(str_uid)
@@ -57,7 +56,7 @@
# For backwards compatibility with CMF 1.5.0 and 1.5.1, check if
# the generator correctly replaces a ``BTree.Length.Length`` object
# to an integer.
- generator = self.root.portal_uidgenerator
+ generator = self._makeOne()
uid1 = generator()
generator._uid_counter = Length(uid1)
self.failUnless(isinstance(generator._uid_counter, Length))
Modified: Products.CMFUid/trunk/Products/CMFUid/tests/test_uidhandling.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/tests/test_uidhandling.py 2011-09-26 08:51:28 UTC (rev 122941)
+++ Products.CMFUid/trunk/Products/CMFUid/tests/test_uidhandling.py 2011-09-26 08:51:44 UTC (rev 122942)
@@ -50,26 +50,31 @@
return UniqueIdHandlerTool
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
+
def setUp(self):
from Products.CMFCore.CatalogTool import CatalogTool
+ from Products.CMFUid.interfaces import IUniqueIdHandler
from Products.CMFUid.UniqueIdAnnotationTool \
import UniqueIdAnnotationTool
from Products.CMFUid.UniqueIdGeneratorTool \
import UniqueIdGeneratorTool
SecurityTest.setUp(self)
- self.app._setObject('portal_uidhandler', self._getTargetClass()())
self.app._setObject('dummy', DummyContent(id='dummy'))
self.app._setObject('dummy2', DummyContent(id='dummy2'))
+ self.ctool = CatalogTool().__of__(self.app)
+ self.uidhandler = self._makeOne()
sm = getSiteManager()
- self.ctool = CatalogTool().__of__(self.app)
sm.registerUtility(self.ctool, ICatalogTool)
+ sm.registerUtility(self.uidhandler, IUniqueIdHandler)
sm.registerUtility(UniqueIdAnnotationTool(),
IUniqueIdAnnotationManagement)
sm.registerUtility(UniqueIdGeneratorTool(), IUniqueIdGenerator)
# Make sure we have our indices/columns
- uid_name = self.app.portal_uidhandler.UID_ATTRIBUTE_NAME
+ uid_name = self.uidhandler.UID_ATTRIBUTE_NAME
self.ctool.addIndex(uid_name, 'FieldIndex')
self.ctool.addColumn(uid_name)
@@ -87,16 +92,16 @@
verifyClass(IUniqueIdUnrestrictedQuery, self._getTargetClass())
def test_getUidOfNotYetRegisteredObject(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
UniqueIdError = handler.UniqueIdError
self.assertEqual(handler.queryUid(dummy, None), None)
self.assertRaises(UniqueIdError, handler.getUid, dummy)
def test_getInvalidUid(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
UniqueIdError = handler.UniqueIdError
self.assertEqual(handler.queryObject(100, None), None)
@@ -105,29 +110,29 @@
self.assertRaises(UniqueIdError, handler.unrestrictedGetObject, 100)
uid = handler.register(dummy)
- self.assertEqual(handler.queryObject(uid+1, None), None)
- self.assertRaises(UniqueIdError, handler.getObject, uid+1)
- self.assertEqual(handler.unrestrictedQueryObject(uid+1, None), None)
- self.assertRaises(UniqueIdError, handler.unrestrictedGetObject, uid+1)
+ self.assertEqual(handler.queryObject(uid + 1, None), None)
+ self.assertRaises(UniqueIdError, handler.getObject, uid + 1)
+ self.assertEqual(handler.unrestrictedQueryObject(uid + 1, None), None)
+ self.assertRaises(UniqueIdError, handler.unrestrictedGetObject, uid + 1)
def test_getUidOfRegisteredObject(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
uid = handler.register(dummy)
self.assertEqual(handler.getUid(dummy), uid)
def test_getRegisteredObjectByUid(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
uid = handler.register(dummy)
self.assertEqual(handler.getObject(uid), dummy)
self.assertEqual(handler.unrestrictedGetObject(uid), dummy)
def test_getUnregisteredObject(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
UniqueIdError = handler.UniqueIdError
uid = handler.register(dummy)
@@ -138,18 +143,18 @@
self.assertRaises(UniqueIdError, handler.unrestrictedGetObject, uid)
def test_getUidOfUnregisteredObject(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
UniqueIdError = handler.UniqueIdError
- uid = handler.register(dummy)
+ handler.register(dummy)
handler.unregister(dummy)
self.assertEqual(handler.queryUid(dummy, None), None)
self.assertRaises(UniqueIdError, handler.getUid, dummy)
def test_reregisterObject(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
uid1_reg = handler.register(dummy)
uid1_get = handler.getUid(dummy)
@@ -160,15 +165,15 @@
self.assertEqual(uid1_reg, uid1_get)
def test_unregisterObjectWithoutUid(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
UniqueIdError = handler.UniqueIdError
self.assertRaises(UniqueIdError, handler.unregister, dummy)
def test_setNewUidByHandWithCheck(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
# registering and unregisterung a object just to get a free uid
unused_uid = handler.register(dummy)
@@ -180,8 +185,8 @@
self.assertEqual(unused_uid, result)
def test_setSameUidOnSameObjectWithCheck(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
uid = handler.register(dummy)
@@ -192,21 +197,21 @@
self.assertEqual(uid, result)
def test_setExistingUidOnDifferentObjectWithCheckRaisesException(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
- dummy2 = self.root.dummy2
+ handler = self.uidhandler
+ dummy = self.app.dummy
+ dummy2 = self.app.dummy2
UniqueIdError = handler.UniqueIdError
# registering and unregisterung a object just to get a free uid
uid1_reg = handler.register(dummy)
- uid2_reg = handler.register(dummy2)
+ handler.register(dummy2)
self.assertRaises(UniqueIdError, handler.setUid, dummy2, uid1_reg)
def test_setExistingUidOnDifferentObjectWithoutCheck(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
- dummy2 = self.root.dummy2
+ handler = self.uidhandler
+ dummy = self.app.dummy
+ dummy2 = self.app.dummy2
UniqueIdError = handler.UniqueIdError
# registering and unregisterung a object just to get a free uid
@@ -226,20 +231,19 @@
self.assertRaises(UniqueIdError, handler.getBrain, uid2_reg)
def test_setNoneAsUidRaisesException(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
+ handler = self.uidhandler
+ dummy = self.app.dummy
UniqueIdError = handler.UniqueIdError
- uid = handler.register(dummy)
+ handler.register(dummy)
self.assertRaises(UniqueIdError, handler.setUid, dummy, None)
def test_setArbitraryKindOfUidRaisesException(self):
- handler = self.root.portal_uidhandler
- dummy = self.root.dummy
- UniqueIdError = handler.UniqueIdError
+ handler = self.uidhandler
+ dummy = self.app.dummy
- uid = handler.register(dummy)
+ handler.register(dummy)
# As we don't know what kind of exception the implementation
# throws lets check for all exceptions!
@@ -247,19 +251,19 @@
self.assertRaises(Exception, handler.setUid, dummy, DummyUid())
def test_UidCataloging(self):
- handler = self.root.portal_uidhandler
+ handler = self.uidhandler
catalog = self.ctool
- dummy = self.root.dummy
+ dummy = self.app.dummy
uid = handler.register(dummy)
brains = catalog(cmf_uid=uid)
self.assertEqual(len(brains), 1)
def test_UidCatalogingDoesNotAcquireUid(self):
- handler = self.root.portal_uidhandler
+ handler = self.uidhandler
catalog = self.ctool
- self.root._setObject('folder', DummyFolder('folder'))
- folder = self.root.folder
+ self.app._setObject('folder', DummyFolder('folder'))
+ folder = self.app.folder
uid = handler.register(folder)
brains = catalog(cmf_uid=uid)
@@ -273,13 +277,13 @@
self.assertEqual(len(brains), 1)
def test_UidCatalogingDoesNotCatalogPortalRoot(self):
- handler = self.root.portal_uidhandler
+ handler = self.uidhandler
catalog = self.ctool
- dummy = self.root.dummy
-
+ dummy = self.app.dummy
+
# mock the portal root, which has empty indexing attributes
dummy.reindexObject = lambda: None
-
+
uid = handler.register(dummy)
brains = catalog(cmf_uid=uid)
self.assertEqual(len(brains), 0)
More information about the checkins
mailing list