Commit c6f913cc authored by Aurel's avatar Aurel

fit to last workflow changes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15381 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 51743f8a
...@@ -230,8 +230,6 @@ class TestERP5BankingMoneyDepositMixin: ...@@ -230,8 +230,6 @@ class TestERP5BankingMoneyDepositMixin:
self.assertNotEqual(self.money_deposit.getSourceReference(), None) self.assertNotEqual(self.money_deposit.getSourceReference(), None)
self.assertNotEqual(self.money_deposit.getSourceReference(), '') self.assertNotEqual(self.money_deposit.getSourceReference(), '')
def stepMoneyDepositSendToCounter(self, sequence=None, sequence_list=None, **kwd): def stepMoneyDepositSendToCounter(self, sequence=None, sequence_list=None, **kwd):
""" """
Send the check payment to the counter Send the check payment to the counter
...@@ -240,10 +238,14 @@ class TestERP5BankingMoneyDepositMixin: ...@@ -240,10 +238,14 @@ class TestERP5BankingMoneyDepositMixin:
""" """
self.workflow_tool.doActionFor(self.money_deposit, 'confirm_action', wf_id='money_deposit_workflow') self.workflow_tool.doActionFor(self.money_deposit, 'confirm_action', wf_id='money_deposit_workflow')
self.assertEqual(self.money_deposit.getSimulationState(), 'confirmed') self.assertEqual(self.money_deposit.getSimulationState(), 'confirmed')
self.assertEqual(self.money_deposit.getSourceTotalAssetPrice(), 20000.0) self.assertEqual(self.money_deposit.getSourceTotalAssetPrice(), 20000.0)
def stepSendToValidation(self, sequence=None, sequence_list=None, **kwd):
"""
"""
self.workflow_tool.doActionFor(self.money_deposit, 'order_action', wf_id='money_deposit_workflow')
self.assertEqual(self.money_deposit.getSimulationState(), 'ordered')
self.assertEqual(self.money_deposit.getSourceTotalAssetPrice(), 20000.0)
def stepMoneyDepositInputCashDetails(self, sequence=None, sequence_list=None, **kwd): def stepMoneyDepositInputCashDetails(self, sequence=None, sequence_list=None, **kwd):
""" """
...@@ -261,8 +263,6 @@ class TestERP5BankingMoneyDepositMixin: ...@@ -261,8 +263,6 @@ class TestERP5BankingMoneyDepositMixin:
{self.variation_list[1] : 2}) {self.variation_list[1] : 2})
self.assertEqual(self.money_deposit.line_2.getPrice(), 5000) self.assertEqual(self.money_deposit.line_2.getPrice(), 5000)
def stepCheckConfirmedInventory(self, sequence=None, sequence_list=None, **kwd): def stepCheckConfirmedInventory(self, sequence=None, sequence_list=None, **kwd):
""" """
Check the inventoryinb state confirmed Check the inventoryinb state confirmed
...@@ -281,9 +281,6 @@ class TestERP5BankingMoneyDepositMixin: ...@@ -281,9 +281,6 @@ class TestERP5BankingMoneyDepositMixin:
self.assertEqual(self.simulation_tool.getCurrentInventory(payment=self.bank_account_1.getRelativeUrl()), 100000) self.assertEqual(self.simulation_tool.getCurrentInventory(payment=self.bank_account_1.getRelativeUrl()), 100000)
self.assertEqual(self.simulation_tool.getFutureInventory(payment=self.bank_account_1.getRelativeUrl()), 120000) self.assertEqual(self.simulation_tool.getFutureInventory(payment=self.bank_account_1.getRelativeUrl()), 120000)
def stepDeliverMoneyDeposit(self, sequence=None, sequence_list=None, **kwd): def stepDeliverMoneyDeposit(self, sequence=None, sequence_list=None, **kwd):
self.assertEqual(self.money_deposit.getSourceTotalAssetPrice(), self.assertEqual(self.money_deposit.getSourceTotalAssetPrice(),
...@@ -294,7 +291,6 @@ class TestERP5BankingMoneyDepositMixin: ...@@ -294,7 +291,6 @@ class TestERP5BankingMoneyDepositMixin:
self.assertEqual(self.money_deposit.getSourceTotalAssetPrice(), 20000.0) self.assertEqual(self.money_deposit.getSourceTotalAssetPrice(), 20000.0)
self.assertEqual(20000.0, self.money_deposit.getTotalPrice(portal_type = 'Cash Delivery Cell')) self.assertEqual(20000.0, self.money_deposit.getTotalPrice(portal_type = 'Cash Delivery Cell'))
def stepCheckFinalInventory(self, sequence=None, sequence_list=None, **kwd): def stepCheckFinalInventory(self, sequence=None, sequence_list=None, **kwd):
""" """
Check the initial inventory before any operations Check the initial inventory before any operations
...@@ -314,15 +310,12 @@ class TestERP5BankingMoneyDepositMixin: ...@@ -314,15 +310,12 @@ class TestERP5BankingMoneyDepositMixin:
self.assertEqual(self.simulation_tool.getCurrentInventory(payment=self.bank_account_1.getRelativeUrl(),resource=self.currency_1.getRelativeUrl()), 120000) self.assertEqual(self.simulation_tool.getCurrentInventory(payment=self.bank_account_1.getRelativeUrl(),resource=self.currency_1.getRelativeUrl()), 120000)
self.assertEqual(self.simulation_tool.getFutureInventory(payment=self.bank_account_1.getRelativeUrl(),resource=self.currency_1.getRelativeUrl()), 120000) self.assertEqual(self.simulation_tool.getFutureInventory(payment=self.bank_account_1.getRelativeUrl(),resource=self.currency_1.getRelativeUrl()), 120000)
def stepDelMoneyDeposit(self, sequence=None, sequence_list=None, **kwd): def stepDelMoneyDeposit(self, sequence=None, sequence_list=None, **kwd):
""" """
Delete the invalid vault_transfer line previously create Delete the invalid vault_transfer line previously create
""" """
self.money_deposit_module.deleteContent('money_deposit_1') self.money_deposit_module.deleteContent('money_deposit_1')
################################## ##################################
## Tests ## Tests
################################## ##################################
...@@ -342,7 +335,8 @@ class TestERP5BankingMoneyDeposit(TestERP5BankingMoneyDepositMixin, ...@@ -342,7 +335,8 @@ class TestERP5BankingMoneyDeposit(TestERP5BankingMoneyDepositMixin,
sequence_list = SequenceList() sequence_list = SequenceList()
# define the sequence # define the sequence
sequence_string = 'Tic CheckObjects Tic CheckInitialInventory ' \ sequence_string = 'Tic CheckObjects Tic CheckInitialInventory ' \
+ 'CreateMoneyDeposit ' \ + 'CreateMoneyDeposit Tic ' \
+ 'SendToValidation Tic ' \
+ 'MoneyDepositSendToCounter Tic ' \ + 'MoneyDepositSendToCounter Tic ' \
+ 'MoneyDepositInputCashDetails ' \ + 'MoneyDepositInputCashDetails ' \
+ 'CheckConfirmedInventory Tic ' \ + 'CheckConfirmedInventory 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