diff --git a/bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testerp5anddcworkflow.py b/bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.py similarity index 95% rename from bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testerp5anddcworkflow.py rename to bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.py index dd861c6be9de087fe6016eb2175b94688578bb61..2f211f82987cafa8fa1a5275c6cafeb536a3a790 100644 --- a/bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testerp5anddcworkflow.py +++ b/bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.py @@ -6,8 +6,7 @@ class TestERP5WorkflowMixin(ERP5TypeTestCase): def getTestObject(self): self.portal = self.getPortal() - type_test_object = self.portal.portal_types._getOb('ERP5Workflow Test Object') - test_object = self.portal.erp5workflow_test_module.newContent(portal_type='ERP5Workflow Test Object') + test_object = self.portal.erp5workflow_test_module.newContent(portal_type='ERP5Workflow Test Document') return test_object def doActionFor(): @@ -82,10 +81,10 @@ class TestERP5Workflow(TestERP5WorkflowMixin): """ def afterSetUp(self): self.portal = self.getPortal() - self.getWorkflowTool().setChainForPortalTypes(['ERP5Workflow Test Object'], ()) + self.getWorkflowTool().setChainForPortalTypes(['ERP5Workflow Test Document'], ()) self.workflow_module = self.portal.workflow_module self.wf = self.workflow_module._getOb('erp5_validation_workflow') - type_test_object = self.portal.portal_types._getOb('ERP5Workflow Test Object') + type_test_object = self.portal.portal_types._getOb('ERP5Workflow Test Document') type_test_object.edit(type_base_category_list=('validation_state',)) type_test_object.edit(type_erp5workflow_list=('erp5_validation_workflow',)) self.resetComponentTool() @@ -95,6 +94,7 @@ class TestERP5Workflow(TestERP5WorkflowMixin): # check dc_test_workflow is not in use self.assertFalse('dc_test_workflow' in self.getWorkflowTool().getChainFor(document.getTypeInfo().getId())) getattr(document, convertToMixedCase(action))() + #self.wf.doActionFor(document, action) def getStateFor(self, document): return getattr(document, 'getValidationState')() @@ -107,9 +107,9 @@ class TestDCWorkflow(TestERP5WorkflowMixin): # make sure erp5 workflow list is empty self.portal = self.getPortal() self.workflow_module = self.portal.portal_workflow - self.getWorkflowTool().setChainForPortalTypes(['ERP5Workflow Test Object'], ('dc_test_workflow')) + self.getWorkflowTool().setChainForPortalTypes(['ERP5Workflow Test Document'], ('dc_test_workflow')) self.wf = self.workflow_module._getOb('dc_test_workflow') - type_test_object = self.portal.portal_types._getOb('ERP5Workflow Test Object') + type_test_object = self.portal.portal_types._getOb('ERP5Workflow Test Document') type_test_object.edit(type_base_category_list=()) type_test_object.edit(type_erp5workflow_list=()) self.resetComponentTool() diff --git a/bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testerp5anddcworkflow.xml b/bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.xml similarity index 95% rename from bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testerp5anddcworkflow.xml rename to bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.xml index 286dd7103da221a79e5f7d9e4d355dcaa97adaac..4505aac1aee7caf6df50435e8c2651e9f1289934 100644 --- a/bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testerp5anddcworkflow.xml +++ b/bt5/erp5_workflow/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.xml @@ -14,7 +14,7 @@ </item> <item> <key> <string>default_reference</string> </key> - <value> <string>testERP5andDCWorkflow</string> </value> + <value> <string>testWorkflowAndDCWorkflow</string> </value> </item> <item> <key> <string>description</string> </key> @@ -24,7 +24,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>test.erp5.testerp5anddcworkflow</string> </value> + <value> <string>test.erp5.testWorkflowAndDCWorkflow</string> </value> </item> <item> <key> <string>portal_type</string> </key> diff --git a/bt5/erp5_workflow/bt/template_test_id_list b/bt5/erp5_workflow/bt/template_test_id_list index 8c904378acfe16560fb3d42827729422dcb9f8b6..57d5aa3810f150a636a21aec94ccf88a5acc039c 100644 --- a/bt5/erp5_workflow/bt/template_test_id_list +++ b/bt5/erp5_workflow/bt/template_test_id_list @@ -1,2 +1,2 @@ test.erp5.testWorkflow5Method -test.erp5.testerp5anddcworkflow \ No newline at end of file +test.erp5.testWorkflowAndDCWorkflow \ No newline at end of file