ERP5TypeTestCase.py: deploy gerTypesTool and getWorkflowTool in dynamicWorkflowConversion.

product/ERP5Type/tests/ERP5TypeTestCase.py

@@ -31,7 +31,6 @@ from DateTime import DateTime
 # XXX make sure that get_request works.
 import Products.ERP5Type.Utils
 from Products.ERP5Type import Globals
-from Products.ERP5.Tool.WorkflowTool import WorkflowTool
 
 # store a copy of the original method
 original_get_request = Globals.get_request
@@ -929,12 +928,12 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
 
     def dynamicWorkflowConversion(self):
       # Converting DCWorkflow dynamically
-      workflow_tool = self.portal.portal_workflow
+      workflow_tool = self.getWorkflowTool()
+      type_tool = self.getTypesTool()
       type_value_list = []
-      if workflow_tool and isinstance(workflow_tool, WorkflowTool):
+      if workflow_tool:
         type_workflow_dict = workflow_tool.getChainsByType()
         for workflow_id in workflow_tool.objectIds():
-          start = DateTime()
           # Do not convert workflow's live test related workflows.
           if workflow_id in ['testing_workflow', 'testing_interaction_workflow',\
             'testing_workflow_backup', 'testing_interaction_workflow_backup']:
@@ -943,7 +942,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
           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 = self.portal.portal_types._getOb(ptype_id, None)
+              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)
@@ -957,7 +956,7 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
         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 = getattr(self.portal.portal_types, ptype_id, None)
+            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():