Commit 3374f22a authored by Nicolas Delaby's avatar Nicolas Delaby

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
parent e566f194
...@@ -33,7 +33,6 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase ...@@ -33,7 +33,6 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.Sequence import SequenceList from Products.ERP5Type.tests.Sequence import SequenceList
from DateTime import DateTime from DateTime import DateTime
from zLOG import LOG from zLOG import LOG
from testOrder import TestOrderMixin
from Products.ERP5.Document.ImmobilisationMovement import UNIMMOBILISING_METHOD, NO_CHANGE_METHOD from Products.ERP5.Document.ImmobilisationMovement import UNIMMOBILISING_METHOD, NO_CHANGE_METHOD
try: try:
...@@ -41,7 +40,7 @@ try: ...@@ -41,7 +40,7 @@ try:
except ImportError: except ImportError:
pass pass
class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): class TestImmobilisationMixin(ERP5TypeTestCase):
run_all_test = 1 run_all_test = 1
# Different variables used for this test # Different variables used for this test
item_portal_type = 'Apparel Fabric Item' item_portal_type = 'Apparel Fabric Item'
...@@ -62,6 +61,7 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): ...@@ -62,6 +61,7 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase):
no_amortisation_method = 'eu/no_amortisation' no_amortisation_method = 'eu/no_amortisation'
diverged = 'diverged' diverged = 'diverged'
solved = 'solved' solved = 'solved'
datetime = DateTime()
id_transaction = 0 id_transaction = 0
id_simulation = 0 id_simulation = 0
reindex_done = 0 reindex_done = 0
...@@ -420,6 +420,9 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): ...@@ -420,6 +420,9 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase):
item_id = 'item%i' % i item_id = 'item%i' % i
item_module.newContent(id=item_id, reference='%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): def stepPdb(self, sequence=None, sequence_list=None, **kw):
import pdb;pdb.set_trace() import pdb;pdb.set_trace()
...@@ -465,6 +468,12 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): ...@@ -465,6 +468,12 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase):
self.tic() self.tic()
#self.workflow_tool.doActionFor(pl, 'deliver_action', wf_id='packing_list_workflow') #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): def stepTestItemValidationState(self, sequence=None, sequence_list=None, **kw):
item = self.getItemModule()['item1'] item = self.getItemModule()['item1']
self.assertEquals(item.getValidationState(), 'exploited') self.assertEquals(item.getValidationState(), 'exploited')
...@@ -3764,6 +3773,8 @@ class TestImmobilisation(TestImmobilisationMixin): ...@@ -3764,6 +3773,8 @@ class TestImmobilisation(TestImmobilisationMixin):
Tic \ Tic \
BuildAccounting \ BuildAccounting \
Tic \ Tic \
ConfirmAmortisationTransaction \
Tic \
TestSimpleAccountingBuild \ TestSimpleAccountingBuild \
ChangeAccountingPrice \ ChangeAccountingPrice \
Tic \ Tic \
......
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