ERP5TypeTestCase.py: move workflow reassignment into conversion function.

product/ERP5Type/tests/ERP5TypeTestCase.py

@@ -930,9 +930,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
       # Converting DCWorkflow dynamically
       workflow_tool = self.getWorkflowTool()
       type_tool = self.getTypesTool()
-      type_value_list = []
       if workflow_tool:
-        type_workflow_dict = workflow_tool.getChainsByType()
         for workflow_id in workflow_tool.objectIds():
           # Do not convert workflow's live test related workflows.
           if workflow_id in ['testing_workflow', 'testing_interaction_workflow',\
@@ -941,28 +939,12 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
           workflow = workflow_tool._getOb(workflow_id)
           if workflow.getPortalType() not in ['Workflow', 'Interaction Workflow', 'Configuration Workflow']:
             new_workflow = workflow_tool.dc_workflow_asERP5Object(workflow_tool, workflow, temp=0)
-            for ptype_id in type_workflow_dict:
-              ptype = type_tool._getOb(ptype_id, None)
-              if ptype is not None and workflow_id in type_workflow_dict[ptype_id]:
-                # 1. clean DC workflow assignement:
-                workflow_tool.delTypeCBT(ptype_id, workflow_id)
-                # 2. assign ERP5 Workflow to portal type:
-                if workflow_id not in ptype.getTypeWorkflowList():
-                  ptype.addTypeWorkflowList(workflow_id)
-                if ptype not in type_value_list:
-                  type_value_list.append(ptype)
         # force convert edit_workflow: Why have to load edit_workflow this way?
         edit_workflow = workflow_tool._getOb('edit_workflow', None)
         if edit_workflow is not None:
           new_workflow = workflow_tool.dc_workflow_asERP5Object(workflow_tool, edit_workflow, temp=0)
-          for ptype_id in type_workflow_dict:
-            ptype = type_tool._getOb(ptype_id, None)
-            if ptype is not None and 'edit_workflow' in workflow_tool.getChainsByType()[ptype_id]:
-              workflow_tool.delTypeCBT(ptype_id, 'edit_workflow')
-              if 'edit_workflow' not in ptype.getTypeWorkflowList():
-                ptype.addTypeWorkflowList('edit_workflow')
         # Reset the original workflows assignement order.
-        for type_value in sorted(type_value_list):
+        for type_value in sorted(type_tool.objectValues()):
           type_value.workflow_list = tuple(reversed(type_value.workflow_list))
           LOG(" | Portal Type: '%s': '%s'"%(type_value.getId(), type_value.workflow_list), 0, "")
         self.commit()