From 3374f22a1e250ae7eaf01c5e3a61c733e6dd7cb7 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby <nicolas@nexedi.com> Date: Thu, 15 Nov 2007 17:27:27 +0000 Subject: [PATCH] Add confirm step on deliveries according to r17571. Remove TestOrderMixin Class git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17640 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/tests/testImmobilisation.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/product/ERP5/tests/testImmobilisation.py b/product/ERP5/tests/testImmobilisation.py index 5a1ca9b0ab..c62a4508e2 100644 --- a/product/ERP5/tests/testImmobilisation.py +++ b/product/ERP5/tests/testImmobilisation.py @@ -33,7 +33,6 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from DateTime import DateTime from zLOG import LOG -from testOrder import TestOrderMixin from Products.ERP5.Document.ImmobilisationMovement import UNIMMOBILISING_METHOD, NO_CHANGE_METHOD try: @@ -41,7 +40,7 @@ try: except ImportError: pass -class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): +class TestImmobilisationMixin(ERP5TypeTestCase): run_all_test = 1 # Different variables used for this test item_portal_type = 'Apparel Fabric Item' @@ -62,6 +61,7 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): no_amortisation_method = 'eu/no_amortisation' diverged = 'diverged' solved = 'solved' + datetime = DateTime() id_transaction = 0 id_simulation = 0 reindex_done = 0 @@ -420,6 +420,9 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): item_id = 'item%i' % i item_module.newContent(id=item_id, reference='%i' % i) + def stepTic(self, sequence=None, sequence_list=None, **kw): + self.tic() + def stepPdb(self, sequence=None, sequence_list=None, **kw): import pdb;pdb.set_trace() @@ -465,6 +468,12 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): self.tic() #self.workflow_tool.doActionFor(pl, 'deliver_action', wf_id='packing_list_workflow') + def stepConfirmAmortisationTransaction(self, sequence=None, sequence_list=None, **kw): + for transaction in self.getAccountingModule().objectValues(): + self.workflow_tool.doActionFor(transaction, + 'confirm_action', + wf_id='accounting_workflow') + def stepTestItemValidationState(self, sequence=None, sequence_list=None, **kw): item = self.getItemModule()['item1'] self.assertEquals(item.getValidationState(), 'exploited') @@ -3764,6 +3773,8 @@ class TestImmobilisation(TestImmobilisationMixin): Tic \ BuildAccounting \ Tic \ + ConfirmAmortisationTransaction \ + Tic \ TestSimpleAccountingBuild \ ChangeAccountingPrice \ Tic \ -- 2.30.9