Skip to content

erp5
erp5
Commit a81d5b6c authored by iv's avatar iv Committed by iv
Browse files
Options

ERP5Workflow: test refactoring 

- erp5_test_workflow
  *  add testWorklowMixin test case for inheritance purpose,
  *  move testWorklist ERP5 test to portal_component
parent fde6505a
Hide whitespace changes
Inline Side-by-side
Showing with 391 additions and 199 deletions
bt5/erp5_workflow_test/PortalTypeTemplateItem/portal_types/Workflow%20Test%20Document.xml
View file @ a81d5b6c
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
<tuple> <tuple>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>comment</string>
<string>reference</string> <string>reference</string>
<string>short_title</string> <string>short_title</string>
</tuple> </tuple>
......
bt5/erp5_workflow_test/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.py
View file @ a81d5b6c
import unittest import unittest
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from erp5.component.test.testWorkflowMixin import testWorkflowMixin
from Products.DCWorkflow.DCWorkflow import ValidationFailed from Products.DCWorkflow.DCWorkflow import ValidationFailed
from DateTime import DateTime from DateTime import DateTime
class TestERP5WorkflowMixin(ERP5TypeTestCase): class TestERP5WorkflowMixin(testWorkflowMixin, object):
initial_dc_workflow_id = "testing_initial_dc_workflow" initial_dc_workflow_id = "testing_initial_dc_workflow"
initial_dc_interaction_workflow_id = "testing_initial_dc_interaction_workflow" initial_dc_interaction_workflow_id = "testing_initial_dc_interaction_workflow"
...@@ -43,21 +43,6 @@ class TestERP5WorkflowMixin(ERP5TypeTestCase): ...@@ -43,21 +43,6 @@ class TestERP5WorkflowMixin(ERP5TypeTestCase):
def doActionFor(self, document, action): def doActionFor(self, document, action):
self.portal.portal_workflow.doActionFor(document, action, wf_id=self.workflow_id) self.portal.portal_workflow.doActionFor(document, action, wf_id=self.workflow_id)
def getWorklistDocumentCountFromActionName(self, action_name):
self.assertEqual(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 checkWorklist(self, action_list, name, count):
entry_list = [x for x in action_list if x['name'].startswith(name)
and 'workflow_id' in x
and x['workflow_id'] == self.workflow_id]
self.assertEqual(len(entry_list), count and 1)
if count:
self.assertEqual(count,
self.getWorklistDocumentCountFromActionName(entry_list[0]['name']))
def clearCache(self): def clearCache(self):
self.portal.portal_caches.clearAllCache() self.portal.portal_caches.clearAllCache()
...@@ -186,7 +171,7 @@ class TestERP5WorkflowMixin(ERP5TypeTestCase): ...@@ -186,7 +171,7 @@ class TestERP5WorkflowMixin(ERP5TypeTestCase):
self.tic() # reindexing for security self.tic() # reindexing for security
self.clearCache() self.clearCache()
result = workflow_tool.listActions(object=new_object) result = workflow_tool.listActions(object=new_object)
self.checkWorklist(result, 'Document', 1) self.checkWorklist(result, 'Document', 1, workflow_id=self.workflow_id)
def test_11_testValidationInteraction(self): def test_11_testValidationInteraction(self):
""" """
......
bt5/erp5_workflow_test/TestTemplateItem/portal_components/test.erp5.testWorkflowMixin.py 0 → 100644
View file @ a81d5b6c
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
class testWorkflowMixin(ERP5TypeTestCase):
def getWorklistDocumentCountFromActionName(self, action_name):
self.assertEqual(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 checkWorklist(self, action_list, name, count, url_parameter_dict=None, workflow_id=None):
entry_list = [
x for x in action_list if x['name'].startswith(name)
and (
workflow_id is None
or 'workflow_id' in x
and x['workflow_id'] == workflow_id
)
]
self.assertEqual(len(entry_list), count and 1)
if count:
self.assertEqual(count,
self.getWorklistDocumentCountFromActionName(entry_list[0]['name']))
if entry_list and url_parameter_dict:
url = entry_list[0].get('url')
self.assertTrue(url, 'Can not check url parameters without url')
url = '%s%s' % (self.portal.getId(), url[len(self.portal.absolute_url()):])
# Touch URL to save worklist parameters in listbox selection
self.publish(url, 'manager:') # XXX: troubles running live test, returns HTTP error 500
self.commit()
selection_parameter_dict = self.portal.portal_selections.getSelectionParamsFor(
self.module_selection_name)
for parameter, value in url_parameter_dict.iteritems():
self.assertIn(parameter, selection_parameter_dict)
self.assertEqual(value, selection_parameter_dict[parameter])
def clearCache(self):
self.portal.portal_caches.clearAllCache()
\ No newline at end of file
bt5/erp5_workflow_test/TestTemplateItem/portal_components/test.erp5.testWorkflowMixin.xml 0 → 100644
View file @ a81d5b6c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Test Component" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>testWorkflowMixin</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>test.erp5.testWorkflowMixin</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Test Component</string> </value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>text_content_error_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>erp5</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate</string> </value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>validated</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
product/ERP5/tests/testWorklist.py → bt5/erp5_workflow_test/TestTemplateItem/portal_components/test.erp5.testWorklist.py
View file @ a81d5b6c
##############################################################################
#
# Copyright (c) 2007 Nexedi SA and Contributors.
# All Rights Reserved.
# Romain Courteaud <romain@nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# garantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import re
import unittest import unittest
from zLOG import LOG, INFO, WARNING from erp5.component.test.testWorkflowMixin import testWorkflowMixin
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Testing.ZopeTestCase.PortalTestCase import PortalTestCase
class TestWorklist(ERP5TypeTestCase): class TestWorklist(testWorkflowMixin):
run_all_test = 1 run_all_test = 1
quiet = 1 quiet = 1
login = PortalTestCase.login
checked_portal_type = 'Organisation' checked_portal_type = 'Organisation'
module_selection_name = 'organisation_module_selection' module_selection_name = 'organisation_module_selection'
...@@ -59,53 +27,62 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -59,53 +27,62 @@ class TestWorklist(ERP5TypeTestCase):
int_catalogued_variable_id = 'int_index' int_catalogued_variable_id = 'int_index'
int_value = 1 int_value = 1
user_dict = {
'foo': [None, None],
'bar': [None, None],
}
def getTitle(self): def getTitle(self):
return "Worklist" return "Worklist"
def clearModule(self, module): def cleanUp(self):
module.manage_delObjects(list(module.objectIds())) # delete all objects of some modules
for module in [self.portal.organisation_module, self.portal.portal_categories.region,
self.portal.portal_categories.role]:
module.manage_delObjects(list(module.objectIds()))
# delete "person" objects
module = self.portal.person_module
for person in self.user_dict.keys():
if person in list(module.objectIds()):
module.manage_delObjects([person])
self.tic() self.tic()
def beforeTearDown(self): def afterSetUp(self):
self.clearModule(self.portal.person_module) self.cleanUp()
self.clearModule(self.portal.organisation_module) self.logMessage("Create users")
self.clearModule(self.portal.portal_categories.region) self.createERP5Users()
self.clearModule(self.portal.portal_categories.role) self.clearCache()
self.tic()
def getBusinessTemplateList(self):
"""
Return list of bt5 to install
"""
return ('erp5_base',)
def getUserFolder(self): def beforeTearDown(self):
""" self.cleanUp()
Return the user folder
"""
return getattr(self.getPortal(), 'acl_users', None)
def createManagerAndLogin(self): def createManagerAndLogin(self):
""" """
Create a simple user in user_folder with manager rights. Create a simple user in user_folder with manager rights.
This user will be used to initialize data in the method afterSetup This user will be used to initialize data in the method afterSetup
""" """
self.getUserFolder()._doAddUser('manager', '', ['Manager'], []) acl_user_folder = getattr(self.getPortal(), 'acl_users', None)
acl_user_folder._doAddUser('manager', '', ['Manager'], [])
self.login('manager') self.login('manager')
def createERP5Users(self, user_dict): def createERP5Users(self):
""" """
Create all ERP5 users needed for the test. Create all ERP5 users needed for the test.
ERP5 user = Person object + Assignment object in erp5 person_module. ERP5 user = Person object + Assignment object in erp5 person_module.
""" """
portal = self.getPortal() portal = self.getPortal()
module = portal.getDefaultModule("Person") module = portal.getDefaultModule("Person")
# Create the Person. # Create the Person.
for user_login, user_data in user_dict.items(): for user_login, user_data in self.user_dict.items():
# Create the Person. # Create the Person.
self.logMessage("Create user: %s" % user_login) self.logMessage("Create user: %s" % user_login)
person = module.newContent( person = module.newContent(
portal_type='Person', portal_type='Person',
reference=user_login, reference=user_login,
id=user_login,
password='hackme', password='hackme',
) )
# Create the Assignment. # Create the Assignment.
...@@ -120,22 +97,6 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -120,22 +97,6 @@ class TestWorklist(ERP5TypeTestCase):
# Reindexing is required for the security to work # Reindexing is required for the security to work
self.tic() self.tic()
def createUsers(self):
"""
Create all users needed for the test
"""
self.createERP5Users(self.getUserDict())
def getUserDict(self):
"""
Return dict of users needed for the test
"""
user_dict = {
'foo': [None, None],
'bar': [None, None],
}
return user_dict
def createDocument(self, **kw): def createDocument(self, **kw):
module = self.getPortal().getDefaultModule(self.checked_portal_type) module = self.getPortal().getDefaultModule(self.checked_portal_type)
result = module.newContent(portal_type=self.checked_portal_type, **kw) result = module.newContent(portal_type=self.checked_portal_type, **kw)
...@@ -143,93 +104,76 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -143,93 +104,76 @@ class TestWorklist(ERP5TypeTestCase):
assert result.getValidationState() == self.checked_validation_state assert result.getValidationState() == self.checked_validation_state
return result return result
def getWorklistDocumentCountFromActionName(self, action_name):
self.assertEqual(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 associatePropertySheet(self): def associatePropertySheet(self):
self._addPropertySheet(self.checked_portal_type, 'SortIndex') self._addPropertySheet(self.checked_portal_type, 'SortIndex')
def addWorkflowCataloguedVariable(self, workflow_id, variable_id): def addWorkflowCataloguedVariable(self, workflow_id, variable_id):
# add new workflow compatibility # Add new workflow compatibility
# Will otherwise add dynamic variable in worklist.
workflow_value = self.getWorkflowTool()[workflow_id] workflow_value = self.getWorkflowTool()[workflow_id]
if workflow_value.__class__.__name__ == 'Workflow': if workflow_value.__class__.__name__ != 'Workflow':
# Will add dynamic variable in worklist.
pass
else:
variables = workflow_value.variables variables = workflow_value.variables
variables.addVariable(variable_id) if not getattr(variables, variable_id, None):
variables.addVariable(variable_id)
variable_value = variables[variable_id] variable_value = variables[variable_id]
assert variable_value.for_catalog == 1 assert variable_value.for_catalog == 1
def createWorklist(self, workflow_id, worklist_id, actbox_name, def createWorklist(self, workflow_id, worklist_id, actbox_name,
actbox_url=None, **kw): actbox_url=None, **kw):
# add new workflow compatibility
tales_re = re.compile(r'(\w+:)?(.*)')
workflow_value = self.getWorkflowTool()[workflow_id] workflow_value = self.getWorkflowTool()[workflow_id]
actbox_name='%s (%%(count)s)' % actbox_name
# add new workflow compatibility
if workflow_value.__class__.__name__ == 'Workflow': if workflow_value.__class__.__name__ == 'Workflow':
if getattr(workflow_value, worklist_id, None):
workflow_value.manage_delObjects([worklist_id])
worklist_value = workflow_value.newContent(portal_type='Worklist') worklist_value = workflow_value.newContent(portal_type='Worklist')
worklist_value.setReference(worklist_id) worklist_value.setReference(worklist_id)
# Configure new workflow:
actbox_name='%s (%%(count)s)' % actbox_name objectAndMethodToApplyArgumentTo = [
worklist_value.setActboxName(str(actbox_name)) (worklist_value, 'setActboxName', actbox_name),
worklist_value.setActboxUrl(str(actbox_url)) (worklist_value, 'setActboxUrl', str(actbox_url)),
worklist_value.setActboxCategory(str('global')) (worklist_value, 'setActboxCategory', 'global'),
(worklist_value, 'setMatchedPortalTypeList', kw.get('portal_type')),
props={k if k.startswith('guard_') else 'variable_' + k: v (worklist_value, 'setMatchedValidationState', '' if not kw.get('validation_state') \
for k, v in kw.iteritems()} else 'state_' + kw.get('validation_state'))
if 'variable_portal_type' in props: ]
v = props.get('variable_portal_type', None)
if v: for (kw_key, method) in [(self.int_catalogued_variable_id, 'setInitialValue'),
worklist_value.setMatchedPortalTypeList(v) ('region_uid', 'setDefaultExpr'),
if 'variable_validation_state' in props: ('base_category_id', 'setInitialValue')]:
v = props.get('variable_validation_state', None) var_value = kw.get(kw_key, None)
if v: var_object = None
worklist_value.setMatchedValidationState('state_'+v) # Create variable for worklist if not exists:
if 'variable_' + self.int_catalogued_variable_id in props: if var_value is not None:
variable_ref = self.int_catalogued_variable_id var_object = worklist_value._getOb(kw_key, None)
v = props.get('variable_'+self.int_catalogued_variable_id, None) if var_object is None:
if v: var_object = worklist_value.newContent(portal_type='Worklist Variable')
# Add a local worklist variable: var_object.setReference(kw_key)
variable_value = worklist_value._getOb('variable_' + self.int_catalogued_variable_id, None) objectAndMethodToApplyArgumentTo.append(var_object, method, var_value)
if variable_value is None:
variable_value = worklist_value.newContent(portal_type='Worklist Variable') guard_roles_string = kw.get('guard_roles', '')
variable_value.setReference(variable_ref) guard_role_list = [ var.strip() for var in guard_roles_string.split(';') ]
variable_value.setInitialValue(str(v)) objectAndMethodToApplyArgumentTo += [
# test04 related key (worklist_value, 'setRoleList', guard_role_list),
if 'variable_region_uid' in props: (worklist_value, 'setExpression', kw.get('guard_expr'))
v = props.get('variable_region_uid', None) ]
if v:
variable_value = worklist_value._getOb('variable_region_uid', None) # Configure new worklist:
if variable_value is None: for (obj, method_name, argument) in objectAndMethodToApplyArgumentTo:
variable_value = worklist_value.newContent(portal_type='Worklist Variable') method = (getattr(obj, method_name, None))
variable_value.setReference('region_uid') if method is not None and argument not in [None, '']:
variable_value.setDefaultExpr(v) method(argument)
if 'variable_base_category_id' in props:
variable_value = worklist_value._getOb('variable_base_category_id', None)
v = props.get('variable_base_category_id', None)
if variable_value is None:
variable_value = worklist_value.newContent(portal_type='Worklist Variable')
variable_value.setReference('base_category_id')
variable_value.setInitialValue(v)
# Update guard configuration for view and guard value.
if 'guard_roles' in props:
v = props.get('guard_roles', '')
if v:
worklist_value.setRoleList([ var.strip() for var in v.split(';') ])
if 'guard_expr' in props:
v = props.get('guard_expr', '')
if v:
worklist_value.setExpression(v)
worklist_value.getGuard() worklist_value.getGuard()
else: else:
worklists = workflow_value.worklists worklists = workflow_value.worklists
if worklists._getOb(worklist_id, None):
worklists.deleteWorklists([worklist_id])
worklists.addWorklist(worklist_id) worklists.addWorklist(worklist_id)
worklist_value = worklists._getOb(worklist_id) worklist_value = worklists._getOb(worklist_id)
worklist_value.setProperties('', worklist_value.setProperties('',
actbox_name='%s (%%(count)s)' % actbox_name, actbox_url=actbox_url, actbox_name=actbox_name, actbox_url=actbox_url,
props={k if k.startswith('guard_') else 'var_match_' + k: v props={k if k.startswith('guard_') else 'var_match_' + k: v
for k, v in kw.iteritems()}) for k, v in kw.iteritems()})
...@@ -275,28 +219,16 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -275,28 +219,16 @@ class TestWorklist(ERP5TypeTestCase):
self.worklist_int_variable_id, self.worklist_int_variable_id,
]) ])
def clearCache(self): def createCategories(self):
self.portal.portal_caches.clearAllCache() category_tool = self.getCategoryTool()
for base_category, category_list in (
('region', ('somewhere', 'elsewhere')),
('role', ('client', 'supplier'))):
newContent = category_tool[base_category].newContent
for category in category_list:
if not getattr(category_tool[base_category], category, None):
newContent(portal_type='Category', id=category)
def checkWorklist(self, result, name, count, url_parameter_dict=None):
entry_list = [x for x in result if x['name'].startswith(name)]
self.assertEqual(len(entry_list), count and 1)
if count:
self.assertEqual(count,
self.getWorklistDocumentCountFromActionName(entry_list[0]['name']))
if not entry_list:
return
url = entry_list[0].get('url')
if url_parameter_dict:
self.assertTrue(url, 'Can not check url parameters without url')
url = '%s%s' % (self.portal.getId(), url[len(self.portal.absolute_url()):])
# Touch URL to save worklist parameters in listbox selection
self.publish(url, 'manager:') # XXX which user ?
selection_parameter_dict = self.portal.portal_selections.getSelectionParamsFor(
self.module_selection_name)
for parameter, value in url_parameter_dict.iteritems():
self.assertTrue(parameter in selection_parameter_dict)
self.assertEqual(value, selection_parameter_dict[parameter])
def test_01_permission(self, quiet=0, run=run_all_test): def test_01_permission(self, quiet=0, run=run_all_test):
""" """
...@@ -307,9 +239,8 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -307,9 +239,8 @@ class TestWorklist(ERP5TypeTestCase):
workflow_tool = self.portal.portal_workflow workflow_tool = self.portal.portal_workflow
self.logMessage("Create users")
self.createManagerAndLogin() self.createManagerAndLogin()
self.createUsers()
self.logMessage("Create worklists") self.logMessage("Create worklists")
self.associatePropertySheet() self.associatePropertySheet()
self.addWorkflowCataloguedVariable(self.checked_workflow, self.addWorkflowCataloguedVariable(self.checked_workflow,
...@@ -444,14 +375,10 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -444,14 +375,10 @@ class TestWorklist(ERP5TypeTestCase):
self.createManagerAndLogin() self.createManagerAndLogin()
self.logMessage("Create categories") self.logMessage("Create categories")
for base_category, category_list in ( self.createCategories()
('region', ('somewhere', 'elsewhere')),
('role', ('client', 'supplier'))):
newContent = self.getCategoryTool()[base_category].newContent
for category in category_list:
newContent(portal_type='Category', id=category)
self.logMessage("Create worklists using 'base_category_id' related key") self.logMessage("Create worklists using 'base_category_id' related key")
self.addWorkflowCataloguedVariable(self.checked_workflow, self.addWorkflowCataloguedVariable(self.checked_workflow,
'base_category_id') 'base_category_id')
self.createWorklist(self.checked_workflow, 'region_worklist', 'has_region', self.createWorklist(self.checked_workflow, 'region_worklist', 'has_region',
...@@ -495,7 +422,6 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -495,7 +422,6 @@ class TestWorklist(ERP5TypeTestCase):
workflow_tool = self.getWorkflowTool() workflow_tool = self.getWorkflowTool()
self.createManagerAndLogin() self.createManagerAndLogin()
self.createUsers()
self.logMessage("Create worklists with guard expression") self.logMessage("Create worklists with guard expression")
self.createWorklist(self.checked_workflow, 'guard_expression_worklist', self.createWorklist(self.checked_workflow, 'guard_expression_worklist',
...@@ -540,12 +466,7 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -540,12 +466,7 @@ class TestWorklist(ERP5TypeTestCase):
self.createManagerAndLogin() self.createManagerAndLogin()
self.logMessage("Create categories") self.logMessage("Create categories")
for base_category, category_list in ( self.createCategories()
('region', ('somewhere', 'elsewhere')),
('role', ('client', 'supplier'))):
newContent = self.getCategoryTool()[base_category].newContent
for category in category_list:
newContent(portal_type='Category', id=category)
self.logMessage("Create worklists using 'region_uid' related key"\ self.logMessage("Create worklists using 'region_uid' related key"\
" and TALES Expression") " and TALES Expression")
...@@ -566,8 +487,8 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -566,8 +487,8 @@ class TestWorklist(ERP5TypeTestCase):
self.tic() self.tic()
self.clearCache() self.clearCache()
self.logMessage(" Check no document has region categories defined") self.logMessage(" Check no document has region categories defined")
result = workflow_tool.listActions(object=document) list_action = workflow_tool.listActions(object=document)
self.checkWorklist(result, 'has_semewhere_region', 0) self.checkWorklist(list_action, 'has_semewhere_region', 0)
self.logMessage(" Creates documents with region categories defined") self.logMessage(" Creates documents with region categories defined")
...@@ -577,13 +498,12 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -577,13 +498,12 @@ class TestWorklist(ERP5TypeTestCase):
self.tic() self.tic()
self.clearCache() self.clearCache()
self.logMessage( self.logMessage(" Check there are documents with region categories defined")
" Check there are documents with region categories defined") action_list = workflow_tool.listActions(object=document)
result = workflow_tool.listActions(object=document)
url_parameter_dict = {'region_uid': [str(self.portal.portal_categories.\ url_parameter_dict = {'region_uid': [str(self.portal.portal_categories.\
getCategoryUid("region/somewhere"))], getCategoryUid("region/somewhere"))],
'portal_type': [self.checked_portal_type]} 'portal_type': [self.checked_portal_type]}
self.checkWorklist(result, 'has_semewhere_region', 2, self.checkWorklist(action_list, 'has_semewhere_region', 2,
url_parameter_dict=url_parameter_dict) url_parameter_dict=url_parameter_dict)
finally: finally:
......
bt5/erp5_workflow_test/TestTemplateItem/portal_components/test.erp5.testWorklist.xml 0 → 100644
View file @ a81d5b6c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Test Component" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>testWorklist</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>test.erp5.testWorklist</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Test Component</string> </value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>text_content_error_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>erp5</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate</string> </value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>validated</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
bt5/erp5_workflow_test/bt/description
View file @ a81d5b6c
This template offer simulation data for erp5_workflow. This template offer simulation data for erp5_workflow (old DC workflow, ERP5 workflow, worklist).
\ No newline at end of file \ No newline at end of file
bt5/erp5_workflow_test/bt/template_test_id_list
View file @ a81d5b6c
test.erp5.testWorkflowAndDCWorkflow test.erp5.testWorkflowAndDCWorkflow
\ No newline at end of file test.erp5.testWorkflowMixin
test.erp5.testWorklist
\ No newline at end of file
product/ERP5Type/tests/ERP5TypeLiveTestCase.py
View file @ a81d5b6c
...@@ -68,6 +68,7 @@ class ERP5TypeLiveTestCase(ERP5TypeTestCaseMixin): ...@@ -68,6 +68,7 @@ class ERP5TypeLiveTestCase(ERP5TypeTestCaseMixin):
defined. defined.
""" """
portal = None portal = None
_added_property_sheets = {}
def getPortalName(self): def getPortalName(self):
""" Return the default ERP5 site id. """ Return the default ERP5 site id.
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7