Commit 3adbd785 authored by Łukasz Nowak's avatar Łukasz Nowak

- simplify test code


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45129 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d7bd9cd8
...@@ -5877,28 +5877,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -5877,28 +5877,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
self.assertNotEqual(new_bt, newer_bt) self.assertNotEqual(new_bt, newer_bt)
self.assertEqual(newer_bt.getRevision(), second_revision) self.assertEqual(newer_bt.getRevision(), second_revision)
def stepCreateCustomAnotherWorkflow(self, sequence=None, sequence_list=None, **kw):
"""
Create a custom workflow
"""
wf_id = 'custom_another_geek_workflow'
pw = self.getWorkflowTool()
addWorkflowByType(pw, WORKFLOW_TYPE, wf_id)
workflow = pw._getOb(wf_id, None)
self.failUnless(workflow is not None)
sequence.edit(workflow_id=workflow.getId())
cbt = pw._chains_by_type
props = {}
if cbt is not None:
for id, wf_ids in cbt.items():
props['chain_%s' % id] = ','.join(wf_ids)
key = 'chain_Geek Object'
if props.has_key(key):
props[key] = '%s,%s' % (props[key], wf_id)
else:
props[key] = wf_id
pw.manage_changeWorkflows('', props=props)
def stepCreateCustomWorkflow(self, sequence=None, sequence_list=None, **kw): def stepCreateCustomWorkflow(self, sequence=None, sequence_list=None, **kw):
""" """
Create a custom workflow Create a custom workflow
...@@ -5935,22 +5913,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -5935,22 +5913,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
description='custom bt for unit_test') description='custom bt for unit_test')
sequence.edit(export_bt=template) sequence.edit(export_bt=template)
def stepCheckCustomAnotherWorkflowChain(self, sequence=None, sequence_list=None, **kw):
"""
Check custom workflow chain
"""
present = 0
pw = self.getWorkflowTool()
cbt = pw._chains_by_type
if cbt is not None:
for id, wf_ids in cbt.items():
if id == "Geek Object":
present = 1
self.assertEqual(present, 1)
self.assertSameSet(cbt['Geek Object'],
('geek_workflow', 'custom_geek_workflow',
'custom_another_geek_workflow'))
def stepCheckCustomWorkflowChain(self, sequence=None, sequence_list=None, **kw): def stepCheckCustomWorkflowChain(self, sequence=None, sequence_list=None, **kw):
""" """
Check custom workflow chain Check custom workflow chain
...@@ -6176,9 +6138,9 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -6176,9 +6138,9 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
"""Check that chains are correctly removed during update """Check that chains are correctly removed during update
When previous business template defined that object is associated When previous business template defined that object is associated
with workflows A, B, C and that new one says that only A and B with workflows A, B and that new one says that only A association
associations are required check that after installing only A and B is required check that after installing only A will be on workflow
will be on workflow chains.""" chains."""
sequence_list = SequenceList() sequence_list = SequenceList()
sequence_string = '\ sequence_string = '\
CreatePortalType \ CreatePortalType \
...@@ -6214,8 +6176,8 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -6214,8 +6176,8 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
\ \
CreateCustomWorkflow \ CreateCustomWorkflow \
CheckCustomWorkflowChain \ CheckCustomWorkflowChain \
AddWorkflowToBusinessTemplate \ AppendWorkflowToBusinessTemplate \
AddWorkflowChainToBusinessTemplate \ AppendWorkflowChainToBusinessTemplate \
BuildBusinessTemplate \ BuildBusinessTemplate \
SaveBusinessTemplate \ SaveBusinessTemplate \
RemoveWorkflow \ RemoveWorkflow \
...@@ -6231,22 +6193,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -6231,22 +6193,6 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
\ \
CopyBusinessTemplate \ CopyBusinessTemplate \
Tic \ Tic \
CreateCustomAnotherWorkflow \
CheckCustomAnotherWorkflowChain \
AppendWorkflowToBusinessTemplate \
AppendWorkflowChainToBusinessTemplate \
BuildBusinessTemplate \
SaveBusinessTemplate \
RemoveWorkflow \
CheckCustomWorkflowChain \
RemoveBusinessTemplate \
RemoveAllTrashBins \
ImportBusinessTemplate \
UseImportBusinessTemplate \
InstallBusinessTemplate \
Tic \
\
CheckCustomAnotherWorkflowChain \
\ \
RemoveWorkflowFromBusinessTemplate \ RemoveWorkflowFromBusinessTemplate \
RemoveWorkflowChainFromBusinessTemplate \ RemoveWorkflowChainFromBusinessTemplate \
...@@ -6258,7 +6204,7 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor): ...@@ -6258,7 +6204,7 @@ class TestBusinessTemplate(ERP5TypeTestCase, LogInterceptor):
UseImportBusinessTemplate \ UseImportBusinessTemplate \
InstallBusinessTemplate \ InstallBusinessTemplate \
Tic \ Tic \
CheckCustomWorkflowChain \ CheckOriginalWorkflowChain \
CheckWorkflowChainExists \ CheckWorkflowChainExists \
' '
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
......
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