Commit 6656fddb authored by Vincent Pelletier's avatar Vincent Pelletier

Add a check for worklist's advertised number of documents (so automaticaly...

Add a check for worklist's advertised number of documents (so automaticaly advertise the number of documents).


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17085 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2199ab29
...@@ -128,6 +128,12 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -128,6 +128,12 @@ class TestWorklist(ERP5TypeTestCase):
module = self.getPortal().getDefaultModule(self.checked_portal_type) module = self.getPortal().getDefaultModule(self.checked_portal_type)
return module.newContent(portal_type=self.checked_portal_type) return module.newContent(portal_type=self.checked_portal_type)
def getWorklistDocumentCountFromActionName(self, action_name):
self.assertEquals(action_name[-1], ')')
left_parenthesis_offset = action_name.rfind('(')
self.assertNotEquals(left_parenthesis_offset, -1)
return int(action_name[left_parenthesis_offset + 1:-1])
def createWorklist(self): def createWorklist(self):
workflow = self.getWorkflowTool()[self.checked_workflow] workflow = self.getWorkflowTool()[self.checked_workflow]
worklists = workflow.worklists worklists = workflow.worklists
...@@ -137,7 +143,8 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -137,7 +143,8 @@ class TestWorklist(ERP5TypeTestCase):
(self.worklist_owner_id, self.actbox_owner_name, 'Owner')]: (self.worklist_owner_id, self.actbox_owner_name, 'Owner')]:
worklists.addWorklist(worklist_id) worklists.addWorklist(worklist_id)
worklist_definition = worklists._getOb(worklist_id) worklist_definition = worklists._getOb(worklist_id)
worklist_definition.setProperties('', actbox_name=actbox_name, worklist_definition.setProperties('',
actbox_name='%s (%%(count)s)' % (actbox_name, ),
props={'guard_roles': role, props={'guard_roles': role,
'var_match_portal_type': self.checked_portal_type}) 'var_match_portal_type': self.checked_portal_type})
...@@ -170,11 +177,15 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -170,11 +177,15 @@ class TestWorklist(ERP5TypeTestCase):
self.login(user_id) self.login(user_id)
result = workflow_tool.listActions(object=document) result = workflow_tool.listActions(object=document)
self.logMessage("Check %s worklist as Assignor" % user_id) self.logMessage("Check %s worklist as Assignor" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_assignor_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_assignor_name)]
self.assertEquals(len(entry_list), 0) self.assertEquals(len(entry_list), 0)
self.logMessage("Check %s worklist as Owner" % user_id) self.logMessage("Check %s worklist as Owner" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_owner_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_owner_name)]
self.assertEquals(len(entry_list), 1) self.assertEquals(len(entry_list), 1)
self.assertEquals(
self.getWorklistDocumentCountFromActionName(entry_list[0]['name']), 1)
self.logout() self.logout()
for user_id in ('foo', 'bar'): for user_id in ('foo', 'bar'):
self.logMessage("Check %s worklist" % user_id) self.logMessage("Check %s worklist" % user_id)
...@@ -197,30 +208,40 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -197,30 +208,40 @@ class TestWorklist(ERP5TypeTestCase):
self.login(user_id) self.login(user_id)
result = workflow_tool.listActions(object=document) result = workflow_tool.listActions(object=document)
self.logMessage("Check %s worklist as Assignor" % user_id) self.logMessage("Check %s worklist as Assignor" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_assignor_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_assignor_name)]
self.assertEquals(len(entry_list), 0) self.assertEquals(len(entry_list), 0)
self.logMessage("Check %s worklist as Owner" % user_id) self.logMessage("Check %s worklist as Owner" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_owner_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_owner_name)]
self.assertEquals(len(entry_list), 1) self.assertEquals(len(entry_list), 1)
self.assertEquals(
self.getWorklistDocumentCountFromActionName(entry_list[0]['name']), 1)
self.logout() self.logout()
for user_id in ('bar', ): for user_id in ('bar', ):
self.login(user_id) self.login(user_id)
result = workflow_tool.listActions(object=document) result = workflow_tool.listActions(object=document)
self.logMessage("Check %s worklist as Assignor" % user_id) self.logMessage("Check %s worklist as Assignor" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_assignor_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_assignor_name)]
self.assertEquals(len(entry_list), 0) self.assertEquals(len(entry_list), 0)
self.logMessage("Check %s worklist as Owner" % user_id) self.logMessage("Check %s worklist as Owner" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_owner_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_owner_name)]
self.assertEquals(len(entry_list), 0) self.assertEquals(len(entry_list), 0)
self.logout() self.logout()
for user_id in ('foo', ): for user_id in ('foo', ):
self.login(user_id) self.login(user_id)
result = workflow_tool.listActions(object=document) result = workflow_tool.listActions(object=document)
self.logMessage("Check %s worklist as Assignor" % user_id) self.logMessage("Check %s worklist as Assignor" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_assignor_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_assignor_name)]
self.assertEquals(len(entry_list), 1) self.assertEquals(len(entry_list), 1)
self.assertTrue(
self.getWorklistDocumentCountFromActionName(entry_list[0]['name']), 1)
self.logMessage("Check %s worklist as Owner" % user_id) self.logMessage("Check %s worklist as Owner" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_owner_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_owner_name)]
self.assertEquals(len(entry_list), 0) self.assertEquals(len(entry_list), 0)
self.logout() self.logout()
...@@ -241,30 +262,40 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -241,30 +262,40 @@ class TestWorklist(ERP5TypeTestCase):
self.login(user_id) self.login(user_id)
result = workflow_tool.listActions(object=document) result = workflow_tool.listActions(object=document)
self.logMessage("Check %s worklist as Assignor" % user_id) self.logMessage("Check %s worklist as Assignor" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_assignor_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_assignor_name)]
self.assertEquals(len(entry_list), 0) self.assertEquals(len(entry_list), 0)
self.logMessage("Check %s worklist as Owner" % user_id) self.logMessage("Check %s worklist as Owner" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_owner_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_owner_name)]
self.assertEquals(len(entry_list), 1) self.assertEquals(len(entry_list), 1)
self.assertTrue(
self.getWorklistDocumentCountFromActionName(entry_list[0]['name']), 1)
self.logout() self.logout()
for user_id in ('bar', ): for user_id in ('bar', ):
self.login(user_id) self.login(user_id)
result = workflow_tool.listActions(object=document) result = workflow_tool.listActions(object=document)
self.logMessage("Check %s worklist as Assignor" % user_id) self.logMessage("Check %s worklist as Assignor" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_assignor_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_assignor_name)]
self.assertEquals(len(entry_list), 0) self.assertEquals(len(entry_list), 0)
self.logMessage("Check %s worklist as Owner" % user_id) self.logMessage("Check %s worklist as Owner" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_owner_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_owner_name)]
self.assertEquals(len(entry_list), 0) self.assertEquals(len(entry_list), 0)
self.logout() self.logout()
for user_id in ('foo', ): for user_id in ('foo', ):
self.login(user_id) self.login(user_id)
result = workflow_tool.listActions(object=document) result = workflow_tool.listActions(object=document)
self.logMessage("Check %s worklist as Assignor" % user_id) self.logMessage("Check %s worklist as Assignor" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_assignor_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_assignor_name)]
self.assertEquals(len(entry_list), 1) self.assertEquals(len(entry_list), 1)
self.assertTrue(
self.getWorklistDocumentCountFromActionName(entry_list[0]['name']), 1)
self.logMessage("Check %s worklist as Owner" % user_id) self.logMessage("Check %s worklist as Owner" % user_id)
entry_list = [x for x in result if x['name'] == self.actbox_owner_name] entry_list = [x for x in result \
if x['name'].startswith(self.actbox_owner_name)]
self.assertEquals(len(entry_list), 0) self.assertEquals(len(entry_list), 0)
self.logout() self.logout()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment