diff --git a/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py b/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py index bbbe51b0e00930ae7623872cbf2598fcb48b3809..4a18b22b6ad6afb3f7d7bb485ee5f5d5bbb4824a 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py @@ -220,6 +220,7 @@ class TestERP5BankingCheckDeposit(TestERP5BankingMixin, ERP5TypeTestCase): quantity_unit_value=self.unit) self.assertNotEqual(self.check_operation_line_1, None) self.assertEqual(len(self.check_deposit.objectIds()), 1) + import pdb; pdb.set_trace() def stepAddWrongCheckOperationLine(self, sequence=None, sequence_list=None, **kwd): @@ -319,6 +320,9 @@ class TestERP5BankingCheckDeposit(TestERP5BankingMixin, ERP5TypeTestCase): if hasattr(self, 'check_deposit'): self.check_deposit_module.manage_delObjects([self.check_deposit.getId(),]) + def stepCheckWorklist(self, **kw): + self.checkWorklist(self.check_deposit) + def test_01_ERP5BankingCheckDeposit(self, quiet=QUIET, run=RUN_ALL_TEST): """ Define the sequence of step that will be play @@ -328,8 +332,12 @@ class TestERP5BankingCheckDeposit(TestERP5BankingMixin, ERP5TypeTestCase): # define the sequence sequence_string1 = 'Tic CheckObjects Tic CheckInitialInventory ' \ + 'CreateCheckDepositOperation Tic ' \ + + 'CheckWorklist Tic ' \ + 'AddCheckOperationLine Tic ' \ - + 'PlanCheckDepositOperation Tic OrderCheckDepositOperation ' \ + + 'PlanCheckDepositOperation Tic ' \ + + 'CheckWorklist Tic ' \ + + 'OrderCheckDepositOperation Tic ' \ + + 'CheckWorklist Tic ' \ + 'Tic DeliverCheckDepositOperation Tic ' \ + 'CheckBankAccountInventoryAfterCheckDepositDelivered' # one to test reject diff --git a/product/ERP5Banking/tests/testERP5BankingCheckPayment.py b/product/ERP5Banking/tests/testERP5BankingCheckPayment.py index c15b6a98652154ca2a1f2dcefbce3239af46d740..e1473f9d0e98ffda5863c9a26ca7a001b191b677 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckPayment.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckPayment.py @@ -492,6 +492,9 @@ class TestERP5BankingCheckPaymentMixin: wf_id='check_workflow') self.assertEquals(check.getSimulationState(), 'confirmed') + def stepCheckWorklist(self, **kw): + self.checkWorklist(self.check_payment) + class TestERP5BankingCheckPayment(TestERP5BankingCheckPaymentMixin, TestERP5BankingMixin, ERP5TypeTestCase): @@ -508,11 +511,14 @@ class TestERP5BankingCheckPayment(TestERP5BankingCheckPaymentMixin, # define the sequence sequence_string = 'Tic CheckObjects Tic CheckInitialInventory ' \ 'CreateCheckPayment Tic ' \ + 'Tic CheckWorklist ' \ 'CheckConsistency Tic ' \ + 'Tic CheckWorklist ' \ 'stepValidateAnotherCheckPaymentWorks Tic ' \ 'SendToCounter ' \ 'stepValidateAnotherCheckPaymentFails Tic ' \ 'CheckConfirmedInventory ' \ + 'Tic CheckWorklist ' \ 'stepValidateAnotherCheckPaymentFailsAgain Tic ' \ 'InputCashDetails Tic ' \ 'ResetInventory Tic ' \ diff --git a/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py b/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py index 50c46b0585ef7504d537c006eb4cc92d8caa94a4..35cf5bd6154a902429414472b5d831198e712d76 100755 --- a/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py +++ b/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py @@ -510,6 +510,9 @@ class TestERP5BankingClassificationSurvey(TestERP5BankingMixin, ERP5TypeTestCase 'classification_survey_workflow','deliver_action') self.failUnless(message.find('Insufficient balance')>=0) + def stepCheckWorklist(self, **kw): + self.checkWorklist(self.classification_survey) + ################################## ## Tests ################################## @@ -526,6 +529,7 @@ class TestERP5BankingClassificationSurvey(TestERP5BankingMixin, ERP5TypeTestCase + 'CreateTwoValidIncomingLine CheckSubTotal ' \ + 'CreateValidOutgoingLineForInternalBanknote ' \ + 'CreateValidOutgoingLineForExternalBanknote ' \ + + 'Tic CheckWorklist ' \ + 'Tic CheckTotal ' \ + 'CheckSource CheckDestination ' \ + 'ConfirmClassificationSurvey Tic ' \ @@ -533,6 +537,7 @@ class TestERP5BankingClassificationSurvey(TestERP5BankingMixin, ERP5TypeTestCase + 'ResetSourceInventory Tic ' \ + 'DeliverClassificationSurveyFails Tic ' \ + 'DeleteResetInventory Tic ' \ + + 'Tic CheckWorklist ' \ + 'DeliverClassificationSurvey Tic ' \ + 'CheckSourceDebit CheckDestinationCredit ' sequence_list.addSequenceString(sequence_string) diff --git a/product/ERP5Banking/tests/testERP5BankingCounterRendering.py b/product/ERP5Banking/tests/testERP5BankingCounterRendering.py index 87940d40ec406e0264b71f00330d26449ca52196..c3dd277c65a5a2ef815e613bccdaf6db3cbaae62 100644 --- a/product/ERP5Banking/tests/testERP5BankingCounterRendering.py +++ b/product/ERP5Banking/tests/testERP5BankingCounterRendering.py @@ -498,6 +498,8 @@ class TestERP5BankingCounterRendering(TestERP5BankingMixin, ERP5TypeTestCase): 'counter_rendering_workflow','deliver_action') self.failUnless(message.find('Insufficient balance')>=0) + def stepCheckWorklist(self, **kw): + self.checkWorklist(self.counter_rendering) ################################## ## Tests @@ -519,12 +521,14 @@ class TestERP5BankingCounterRendering(TestERP5BankingMixin, ERP5TypeTestCase): + 'CreateInvalidLine ' \ + 'TryConfirmCounterRenderingWithBadInventory ' \ + 'DelInvalidLine Tic CheckTotal ' \ + + 'Tic CheckWorklist ' \ + 'ConfirmCounterRendering ' \ + 'Tic CheckSourceDebitPlanned CheckDestinationCreditPlanned ' \ + 'CheckSourceDebitPlanned CheckDestinationCreditPlanned ' \ + 'ResetInventory Tic ' \ + 'DeliverFails ' \ + 'DeleteResetInventory Tic ' \ + + 'Tic CheckWorklist ' \ + 'DeliverCounterRendering ' \ + 'CheckSourceDebit CheckDestinationCredit ' sequence_list.addSequenceString(sequence_string) diff --git a/product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py b/product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py index a8463cd443049fe90d13c98532df1daefc02ff67..3588abb394c3ad7826e06c60b704f56c40f2eb8e 100644 --- a/product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py +++ b/product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py @@ -433,6 +433,9 @@ class TestERP5BankingDestructionSurvey(TestERP5BankingMixin, ERP5TypeTestCase): 'destruction_survey_workflow','deliver_action') self.failUnless(message.find('Insufficient balance')>=0) + def stepCheckWorklist(self, **kw): + self.checkWorklist(self.destruction_survey) + ################################## ## Tests ################################## @@ -452,10 +455,12 @@ class TestERP5BankingDestructionSurvey(TestERP5BankingMixin, ERP5TypeTestCase): + 'CreateInvalidLine ' \ + 'TryConfirmDestructionSurveyWithBadInventory ' \ + 'DelInvalidLine Tic CheckTotal ' \ + + 'Tic CheckWorklist ' \ + 'ConfirmDestructionSurvey ' \ + 'ResetSourceInventory Tic ' \ + 'DeliverDestructionSurveyFails Tic ' \ + 'DeleteResetInventory Tic ' \ + + 'Tic CheckWorklist ' \ + 'DeliverDestructionSurvey ' \ + 'CheckSourceFinal CheckDestinationFinal ' sequence_list.addSequenceString(sequence_string) diff --git a/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py b/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py index 6df9ea36e51958c0c41002b81977c41267dc796b..e4934e8737fc12dc1c911d2d3fdf724f357c2070 100755 --- a/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py +++ b/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py @@ -357,6 +357,9 @@ class TestERP5BankingForeignCashReception(TestERP5BankingMixin, ERP5TypeTestCase self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.reception.getRelativeUrl(), resource = self.usd_billet_20.getRelativeUrl()), 5.0) self.assertEqual(self.simulation_tool.getFutureInventory(node=self.reception.getRelativeUrl(), resource = self.usd_billet_20.getRelativeUrl()), 5.0) + def stepCheckWorklist(self, **kw): + self.checkWorklist(self.foreign_cash_reception) + ################################## ## Tests ################################## @@ -375,8 +378,10 @@ class TestERP5BankingForeignCashReception(TestERP5BankingMixin, ERP5TypeTestCase + 'CreateValidLine2 Tic ' \ + 'CheckValidLine1 ' \ + 'CheckValidLine2 ' \ + + 'Tic CheckWorklist ' \ + 'ConfirmForeignCashReception Tic ' \ + 'CheckConfirmedInventory ' \ + + 'Tic CheckWorklist ' \ + 'DeliverForeignCashReception Tic ' \ + 'CheckFinalInventory' sequence_list.addSequenceString(sequence_string) diff --git a/product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py b/product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py index a194b190aa1047d4ce54a791222f8c478a6f6c37..2540e81521cb60844f55104c30a01b16b29f4d29 100644 --- a/product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py +++ b/product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py @@ -178,7 +178,6 @@ class TestERP5BankingInternalMoneyDeposit(TestERP5BankingMixin, ERP5TypeTestCase self.internal_money_deposit = self.internal_money_deposit_module.newContent( id='internal_money_deposit', portal_type='Internal Money Deposit', - destination_value=self.bi_counter, resource_value = self.currency_1, source_total_asset_price=20000.0, grouping_reference="lettering", @@ -264,7 +263,8 @@ class TestERP5BankingInternalMoneyDeposit(TestERP5BankingMixin, ERP5TypeTestCase """ self.internal_money_deposit_module.deleteContent('internal_money_deposit_1') - + def stepCheckWorklist(self, **kw): + self.checkWorklist(self.internal_money_deposit) ################################## ## Tests @@ -280,6 +280,7 @@ class TestERP5BankingInternalMoneyDeposit(TestERP5BankingMixin, ERP5TypeTestCase sequence_string = 'Tic CheckObjects Tic CheckInitialInventory ' \ + 'CreateInternalMoneyDeposit ' \ + 'InputCashDetails Tic ' \ + + 'Tic CheckWorklist ' \ + 'DeliverInternalMoneyDeposit Tic ' \ + 'CheckFinalInventory' sequence_list.addSequenceString(sequence_string) diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py b/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py index e797dea478eae00f7121f0763293c5eca4f32f16..58a1bce857950270e14dd63f8a4e061109b64d2a 100644 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py @@ -792,6 +792,9 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) 'monetary_destruction_workflow','deliver_action') self.failUnless(message.find('Insufficient balance')>=0) + def stepCheckWorklist(self, **kw): + self.checkWorklist(self.monetary_destruction) + ################################## ## Tests ################################## @@ -812,11 +815,13 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) + 'TryPlannedMonetaryDestructionWithBadInventory ' \ + 'DelInvalidLine Tic CheckTotal ' \ + 'SetMonetaryDestructionSourceTotalAssetPrice ' \ + + 'Tic CheckWorklist ' \ + 'PlannedMonetaryDestruction ' \ + 'CheckSourceDebitPlanned ' \ + 'ResetInventory Tic ' \ + 'ValidateFails ' \ + 'DeleteResetInventory Tic ' \ + + 'Tic CheckWorklist ' \ + 'ValidateMonetaryDestruction ' \ + 'CheckSourceDebit ' \ + 'Tic DelMonetaryDestruction Tic'