[Erp5-report] r19105 - /erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Feb  6 16:31:16 2008
New Revision: 19105

URL: http://svn.erp5.org?rev=19105&view=rev
Log:
Avoid Clear Activities in tearDown, Perform test

Modified:
    erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py

Modified: erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py?rev=19105&r1=19104&r2=19105&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py (original)
+++ erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py Wed Feb  6 16:31:16 2008
@@ -76,8 +76,8 @@
                     self.getCategoryTool().region,
                     self.getCategoryTool().group ]:
       module.manage_delObjects(list(module.objectIds()))
-    self.getPortal().portal_activities.manageClearActivities()
-    get_transaction().commit()
+    get_transaction().commit()
+    self.tic()
 
   def login(self):
     uf = self.getPortal().acl_users
@@ -1621,6 +1621,7 @@
     ob1 = folder.newContent(title='Object Title')
     ob1.manage_permission('View', ['Member'], 1)
     ob2 = folder.newContent(title='Object Title')
+    ob2_id = ob2.getId()
     ob2.manage_addLocalRoles('bob', ['Assignee'])
     get_transaction().commit()
     self.tic()
@@ -1665,12 +1666,17 @@
 
     #Test if bob can't see object even if Assignee role (without View permission) is defined on object
     ob1.manage_addLocalRoles('bob', ['Assignee'])
-    get_transaction().commit()
-    self.tic()
-    ob1.immediateReindexObject()
-    self.assertEquals(1,
-                len(ctool.searchResults(title='Object Title',
-                                        local_roles='Assignee')))
+    ob1.manage_permission('View', ['Assignor'], 0)
+    ob1.reindexObject()
+    get_transaction().commit()
+    self.tic()
+    from AccessControl import getSecurityManager
+    user = getSecurityManager().getUser()
+    self.assertFalse(user.has_permission('View', ob1))
+    self.assertTrue(user.has_role('Assignee', ob1))
+    result_list = [r.getId() for r in ctool(title='Object Title', local_roles='Assignee')]
+    self.assertEquals(1, len(result_list))
+    self.assertEquals([ob2_id], result_list)
     self.assertEquals(1,
                 ctool.countResults(title='Object Title',
                                    local_roles='Assignee')[0][0])