From c5c2932666b48330ea3727385d13aaf56db47ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Wisniewski?= <gregory@nexedi.com> Date: Thu, 29 Oct 2009 08:24:09 +0000 Subject: [PATCH] Remove worklists checking as the security is not defined in the generic banking components. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30092 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../ERP5Banking/tests/TestERP5BankingMixin.py | 26 ------------------- .../testERP5BankingCashBalanceRegulation.py | 5 ---- .../testERP5BankingCashClassification.py | 7 +---- .../tests/testERP5BankingCashExchange.py | 4 --- .../tests/testERP5BankingCashMovement.py | 11 -------- .../tests/testERP5BankingCashSorting.py | 5 ---- .../testERP5BankingCashToCurrencyPurchase.py | 4 --- .../testERP5BankingCashToCurrencySale.py | 5 ---- .../tests/testERP5BankingCheckDeposit.py | 13 ---------- .../tests/testERP5BankingCheckPayment.py | 6 ----- .../tests/testERP5BankingCheckbookDelivery.py | 4 --- .../tests/testERP5BankingCheckbookMovement.py | 7 ----- .../testERP5BankingCheckbookReception.py | 5 ---- ...stERP5BankingCheckbookUsualCashTransfer.py | 5 ---- .../testERP5BankingCheckbookVaultTransfer.py | 6 ----- .../testERP5BankingClassificationSurvey.py | 5 ---- .../tests/testERP5BankingCounterRendering.py | 5 ---- .../tests/testERP5BankingDestructionSurvey.py | 5 ---- .../testERP5BankingForeignCashReception.py | 5 ---- .../testERP5BankingInternalMoneyDeposit.py | 4 --- .../testERP5BankingInternalMoneyPayment.py | 4 --- .../testERP5BankingMonetaryDestruction.py | 6 ----- .../tests/testERP5BankingStopPayment.py | 3 --- 23 files changed, 1 insertion(+), 149 deletions(-) diff --git a/product/ERP5Banking/tests/TestERP5BankingMixin.py b/product/ERP5Banking/tests/TestERP5BankingMixin.py index 8501309845..e6d595308d 100644 --- a/product/ERP5Banking/tests/TestERP5BankingMixin.py +++ b/product/ERP5Banking/tests/TestERP5BankingMixin.py @@ -1197,29 +1197,3 @@ class TestERP5BankingMixin: if x.find('reset')>=0] inventory_module.manage_delObjects(ids=to_delete_id_list) - def checkWorklist(self, document): - """ - """ - portal = self.getPortalObject() - portal.portal_caches.clearAllCache() - try: - portal.portal_workflow.refreshWorklistCache() - except AttributeError: - import sys - LOG('TestEERP5Banking.checkWorklist', 0, 'unable to find everything to refresh', - error=sys.exc_info()) - portal_type = document.getPortalType() - state = document.getSimulationState() - workflow_id = '%s_workflow' % portal_type.lower().replace(' ', '_') - actions = portal.portal_actions.listFilteredActionsFor(document) - found = 0 - for action in actions['global']: - if action.get('workflow_id', None) == workflow_id: - url = action.get('url', None) - if url is not None: - if url.find(state)>=0 and url.find(portal_type)>=0: - found = 1 - #if not found: - # import pdb; pdb.set_trace() - self.assertEquals(found, 1) - diff --git a/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py b/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py index f83a1ecee9..0824746762 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py +++ b/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py @@ -721,9 +721,6 @@ class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin, ERP5TypeTestCas - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.cash_balance_regulation) - def stepDelCashBalanceRegulation(self, sequence=None, sequence_list=None, **kwd): """ Delete the invalid vault_transfer line previously create @@ -755,7 +752,6 @@ class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin, ERP5TypeTestCas + 'CreateValidOutgoingLine ' \ + 'Tic CheckTotal ' \ + 'CheckInitialInventory ' \ - + 'Tic CheckWorklist ' \ + 'DeliverCashBalanceRegulation Tic ' \ + 'CheckFinalInventory' sequence_list.addSequenceString(sequence_string) @@ -767,7 +763,6 @@ class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin, ERP5TypeTestCas + 'CreateValidOutgoingLine ' \ + 'Tic CheckTotal ' \ + 'CheckInitialInventoryCaveau ' \ - + 'Tic CheckWorklist ' \ + 'DeliverCashBalanceRegulation Tic ' \ + 'CheckFinalInventoryCaveau' sequence_list.addSequenceString(sequence_caveau) diff --git a/product/ERP5Banking/tests/testERP5BankingCashClassification.py b/product/ERP5Banking/tests/testERP5BankingCashClassification.py index f85f38293d..1c8cdba750 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashClassification.py +++ b/product/ERP5Banking/tests/testERP5BankingCashClassification.py @@ -700,10 +700,7 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase): self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_aux_bm.getRelativeUrl(), resource = self.billet_5000.getRelativeUrl()), 24.0) # check we have 10 coins of 100 self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.encaisse_aux_externe.getRelativeUrl(), resource = self.billet_100.getRelativeUrl()), 10.0) - self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_aux_externe.getRelativeUrl(), resource = self.billet_100.getRelativeUrl()), 10.0) - - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.cash_sorting) + self.assertEqual(self.simulation_tool.getFutureInventory(node=self.encaisse_aux_externe.getRelativeUrl(), resource = self.billet_100.getRelativeUrl()), 10.0 ################################## ## Tests @@ -725,9 +722,7 @@ class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase): + 'CreateValidOutgoingLineForMixed ' \ + 'Tic CheckTotal ' \ + 'CheckSource CheckDestination ' \ - + 'Tic CheckWorklist ' \ + 'ConfirmCashSorting Tic ' \ - + 'Tic CheckWorklist ' \ + 'CheckSourceDebitPlanned CheckDestinationCreditPlanned ' \ + 'DeliverCashSorting Tic ' \ + 'CheckSourceDebit CheckDestinationCredit ' diff --git a/product/ERP5Banking/tests/testERP5BankingCashExchange.py b/product/ERP5Banking/tests/testERP5BankingCashExchange.py index 90705b8af3..de0e94a63b 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashExchange.py +++ b/product/ERP5Banking/tests/testERP5BankingCashExchange.py @@ -496,9 +496,6 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase): 'cash_exchange_workflow','deliver_action') self.failUnless(message.find('Insufficient balance')>=0) - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.cash_exchange) - ################################## ## Tests @@ -521,7 +518,6 @@ class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase): + 'ResetInventory Tic ' \ + 'DeliverFails Tic ' \ + 'DeleteResetInventory Tic ' \ - + 'Tic CheckWorklist ' \ + 'DeliverCashExchange Tic ' \ + 'CheckFinalInventoryGuichet_1 ' \ + 'CheckFinalInventoryGuichet_2' diff --git a/product/ERP5Banking/tests/testERP5BankingCashMovement.py b/product/ERP5Banking/tests/testERP5BankingCashMovement.py index 00b5253014..84186465b9 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashMovement.py +++ b/product/ERP5Banking/tests/testERP5BankingCashMovement.py @@ -634,9 +634,6 @@ class TestERP5BankingCashMovement(TestERP5BankingMixin, ERP5TypeTestCase): 'cash_movement_workflow','start_action') self.failUnless(message.find('Insufficient balance')>=0) - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.cash_movement) - def test_01_ERP5BankingCashMovement(self, quiet=QUIET, run=RUN_ALL_TEST): """ @@ -651,18 +648,14 @@ class TestERP5BankingCashMovement(TestERP5BankingMixin, ERP5TypeTestCase): + 'CreateValidLine2 CheckTotal ' \ + 'CheckInitialInventory ' \ + 'CreateInvalidLine ' \ - + 'Tic CheckWorklist ' \ + 'TryConfirmCashMovementWithBadInventory ' \ + 'DelInvalidLine Tic CheckTotal ' \ + 'ConfirmCashMovement ' \ + 'ResetSourceInventory Tic ' \ - + 'Tic CheckWorklist ' \ + 'StartCashMovementFails DeleteResetInventory Tic ' \ + 'StartCashMovement ' \ - + 'Tic CheckWorklist ' \ + 'CheckSourceDebitStarted CheckDestinationCreditStarted ' \ + 'StopCashMovement ' \ - + 'Tic CheckWorklist ' \ + 'DeliverCashMovement ' \ + 'CheckSourceDebit CheckDestinationCredit ' @@ -677,15 +670,11 @@ class TestERP5BankingCashMovement(TestERP5BankingMixin, ERP5TypeTestCase): + 'CreateValidLine2 CheckTotal ' \ + 'CheckCurrencyHandoverInitialInventory ' \ + 'Tic CheckTotal ' \ - + 'Tic CheckWorklist ' \ + 'ConfirmCashMovement ' \ - + 'Tic CheckWorklist ' \ + 'StartCashMovement ' \ + 'CheckCurrencyHandoverSourceDebitStarted ' \ + 'CheckDestinationHasNotChanged ' \ - + 'Tic CheckWorklist ' \ + 'StopCashMovement ' \ - + 'Tic CheckWorklist ' \ + 'DeliverCashMovement ' \ + 'CheckCurrencyHandoverSourceDebit CheckDestinationHasNotChanged ' diff --git a/product/ERP5Banking/tests/testERP5BankingCashSorting.py b/product/ERP5Banking/tests/testERP5BankingCashSorting.py index 9c7a745cec..2c97d951e6 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashSorting.py +++ b/product/ERP5Banking/tests/testERP5BankingCashSorting.py @@ -540,9 +540,6 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase): 'cash_sorting_workflow','deliver_action') self.failUnless(message.find('Insufficient balance')>=0) - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.cash_sorting) - ################################## ## Tests ################################## @@ -562,11 +559,9 @@ class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase): + 'CreateValidOutgoingLineForInternalAndCancelledBanknote ' \ + 'Tic CheckTotal ' \ + 'CheckSource CheckDestination ' \ - + 'Tic CheckWorklist ' \ + 'ConfirmCashSorting Tic ' \ + 'CheckSourceDebitPlanned CheckDestinationCreditPlanned ' \ + 'ResetSourceInventory Tic ' \ - + 'Tic CheckWorklist ' \ + 'DeliverCashSortingFails Tic ' \ + 'DeleteResetInventory Tic ' \ + 'DeliverCashSorting Tic ' \ diff --git a/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py b/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py index e48db4c2fb..bf76492830 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py +++ b/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py @@ -448,9 +448,6 @@ class TestERP5BankingCashToCurrencyPurchase(TestERP5BankingMixin, ERP5TypeTestCa """ self.cash_to_currency_purchase_module.deleteContent('cash_to_currency_purchase_1') - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.cash_to_currency_purchase) - ################################## ## Tests ################################## @@ -468,7 +465,6 @@ class TestERP5BankingCashToCurrencyPurchase(TestERP5BankingMixin, ERP5TypeTestCa + 'CreateValidIncomingLine CheckSubTotal ' \ + 'CreateValidOutgoingLine ' \ + 'Tic CheckTotal ' \ - + 'Tic CheckWorklist ' \ + 'DeliverCashToCurrencyPurchase Tic ' \ + 'CheckFinalInventoryGuichet_Entrante ' \ + 'CheckFinalInventoryGuichet_Sortante' diff --git a/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py b/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py index f5ed274464..0b0af28eee 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py +++ b/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py @@ -409,9 +409,6 @@ class TestERP5BankingCashToCurrencySale(TestERP5BankingMixin, ERP5TypeTestCase): 'cash_to_currency_sale_workflow','deliver_action') self.failUnless(message.find('Insufficient balance')>=0) - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.cash_to_currency_sale) - ################################## ## Tests ################################## @@ -431,8 +428,6 @@ class TestERP5BankingCashToCurrencySale(TestERP5BankingMixin, ERP5TypeTestCase): + 'Tic CheckTotal ' \ + 'ResetSourceInventory Tic ' \ + 'DeliverCashToCurrencySaleFails Tic ' \ - + 'DeleteResetInventory Tic ' \ - + 'CheckWorklist Tic ' \ + 'DeliverCashToCurrencySale Tic ' \ + 'CheckFinalInventoryGuichet_Entrante ' \ + 'CheckFinalInventoryGuichet_Sortante' diff --git a/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py b/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py index f1506af10f..be0f88b177 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py @@ -453,9 +453,6 @@ 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 @@ -465,12 +462,9 @@ class TestERP5BankingCheckDeposit(TestERP5BankingMixin, ERP5TypeTestCase): # define the sequence sequence_string1 = 'Tic CheckObjects Tic CheckInitialInventory ' \ + 'CreateCheckDepositOperation Tic ' \ - + 'CheckWorklist Tic ' \ + 'AddCheckOperationLine Tic ' \ + 'PlanCheckDepositOperation Tic ' \ - + 'CheckWorklist Tic ' \ + 'OrderCheckDepositOperation Tic ' \ - + 'CheckWorklist Tic ' \ + 'Tic DeliverCheckDepositOperation Tic ' \ + 'CheckBankAccountInventoryAfterCheckDepositDelivered' # one to test reject @@ -494,16 +488,13 @@ class TestERP5BankingCheckDeposit(TestERP5BankingMixin, ERP5TypeTestCase): sequence_string4 = 'Tic ClearCheck ClearCheckDepositModule Tic '\ + 'Tic CheckObjects Tic CheckInitialInventory ' \ + 'CreateCheckDepositOperation Tic ' \ - + 'CheckWorklist Tic ' \ + 'AddCheckOperationLine Tic ' \ + 'AddSecondCheckOperationLine Tic ' \ + 'ModifyCheckOperationAmount Tic ' \ + 'TrySecondPlanCheckDepositOperation Tic ' \ + 'ModifyCheckOperationLineAmount Tic ' \ + 'SecondPlanCheckDepositOperation Tic ' \ - + 'CheckWorklist Tic ' \ + 'OrderCheckDepositOperation Tic ' \ - + 'CheckWorklist Tic ' \ + 'Tic DeliverCheckDepositOperation Tic ' \ + 'CheckSecondBankAccountInventoryAfterCheckDepositDelivered' @@ -511,7 +502,6 @@ class TestERP5BankingCheckDeposit(TestERP5BankingMixin, ERP5TypeTestCase): sequence_string5 = 'Tic ClearCheck ClearCheckDepositModule Tic '\ + 'Tic CheckObjects Tic CheckInitialInventory ' \ + 'CreateCheckDepositOperation Tic ' \ - + 'CheckWorklist Tic ' \ + 'AddCheckOperationLine Tic ' \ + 'AddSecondCheckOperationLine Tic ' \ + 'ModifyCheckOperationAmount Tic ' \ @@ -519,7 +509,6 @@ class TestERP5BankingCheckDeposit(TestERP5BankingMixin, ERP5TypeTestCase): + 'SendCheckDepositOperationToManualValidation Tic ' \ + 'AcceptCheckDepositOperation Tic ' \ + 'OrderCheckDepositOperation Tic ' \ - + 'CheckWorklist Tic ' \ + 'Tic DeliverCheckDepositOperation Tic ' \ + 'CheckThirdBankAccountInventoryAfterCheckDepositDelivered' @@ -527,7 +516,6 @@ class TestERP5BankingCheckDeposit(TestERP5BankingMixin, ERP5TypeTestCase): sequence_string6 = 'Tic ClearCheck ClearCheckDepositModule Tic '\ + 'Tic CheckInitialInventory ' \ + 'CreateCheckDepositOperation SetCheckLess Tic ' \ - + 'CheckWorklist Tic ' \ + 'AddCheckOperationLine Tic ' \ + 'TrySecondPlanCheckDepositOperationWithAggregate' @@ -535,7 +523,6 @@ class TestERP5BankingCheckDeposit(TestERP5BankingMixin, ERP5TypeTestCase): sequence_string7 = 'Tic ClearCheck ClearCheckDepositModule Tic '\ + 'Tic CheckInitialInventory ' \ + 'CreateCheckDepositOperation SetCheckLess Tic ' \ - + 'CheckWorklist Tic ' \ + 'AddCheckOperationLineWithNoAggregate Tic ' \ + 'PlanCheckDepositOperation Tic ' \ + 'OrderCheckDepositOperation Tic ' \ diff --git a/product/ERP5Banking/tests/testERP5BankingCheckPayment.py b/product/ERP5Banking/tests/testERP5BankingCheckPayment.py index a007d9bb25..768a01d57d 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckPayment.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckPayment.py @@ -517,9 +517,6 @@ class TestERP5BankingCheckPaymentMixin: wf_id='check_workflow') self.assertEquals(check.getSimulationState(), 'confirmed') - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.check_payment) - def stepCheckCheckAfterReject(self, sequence=None, sequence_list=None, **kwd): """ Make sure that the check is in delivered state @@ -545,14 +542,11 @@ 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/testERP5BankingCheckbookDelivery.py b/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py index e5646833d1..f48c23611d 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py @@ -280,9 +280,6 @@ class TestERP5BankingCheckbookDelivery(TestERP5BankingCheckbookDeliveryMixin, self.failUnless(message.find('Sorry, the item with reference')>=0) self.failUnless(message.find('is not available any more')>=0) - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.checkbook_delivery) - ################################## ## Tests ################################## @@ -300,7 +297,6 @@ class TestERP5BankingCheckbookDelivery(TestERP5BankingCheckbookDeliveryMixin, + 'ChangePreviousDeliveryDate Tic ' \ + 'DeliverCheckbookDeliveryFails Tic ' \ + 'PutBackPreviousDeliveryDate Tic ' \ - + 'CheckWorklist Tic ' \ + 'DeliverCheckbookDelivery Tic ' \ + 'CheckFinalCheckbookInventory' sequence_list.addSequenceString(sequence_string) diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookMovement.py b/product/ERP5Banking/tests/testERP5BankingCheckbookMovement.py index 9afc7c155e..f3119394d9 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookMovement.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookMovement.py @@ -312,9 +312,6 @@ class TestERP5BankingCheckbookMovement(TestERP5BankingCheckbookVaultTransferMixi self.failUnless(message.find('Sorry, the item with reference')>=0) self.failUnless(message.find('is not available any more')>=0) - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.checkbook_movement) - ################################## ## Tests ################################## @@ -329,17 +326,13 @@ class TestERP5BankingCheckbookMovement(TestERP5BankingCheckbookVaultTransferMixi sequence_string = 'Tic CheckObjects Tic CheckInitialCheckbookInventory ' \ + 'CreateCheckbookMovement Tic ' \ + 'CreateCheckAndCheckbookLineList Tic ' \ - + 'CheckWorklist ' \ + 'PlanCheckbookMovement Tic ' \ - + 'CheckWorklist ' \ + 'OrderCheckbookMovement Tic ' \ - + 'CheckWorklist ' \ + 'ConfirmCheckbookMovement Tic ' \ + 'CheckConfirmedCheckbookInventory Tic ' \ + 'ChangePreviousDeliveryDate Tic ' \ + 'DeliverCheckbookMovementFails Tic ' \ + 'PutBackPreviousDeliveryDate Tic ' \ - + 'CheckWorklist ' \ + 'DeliverCheckbookMovement Tic ' \ + 'CheckFinalCheckbookInventory' sequence_list.addSequenceString(sequence_string) diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py b/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py index 454048c3d9..dedde7000d 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py @@ -441,9 +441,6 @@ class TestERP5BankingCheckbookReception(TestERP5BankingMixin, ERP5TypeTestCase): check = checkbook.objectValues()[0] self.assertEqual(check.getSimulationState(), 'confirmed') - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.checkbook_reception) - ################################## ## Tests ################################## @@ -458,9 +455,7 @@ class TestERP5BankingCheckbookReception(TestERP5BankingMixin, ERP5TypeTestCase): sequence_string = 'Tic CheckObjects Tic CheckInitialCheckbookInventory ' \ + 'CreateCheckbookReception Tic ' \ + 'CreateCheckAndCheckbookLineList Tic ' \ - + 'CheckWorklist Tic ' \ + 'ConfirmCheckbookReception Tic ' \ - + 'CheckWorklist Tic ' \ + 'DeliverCheckbookReception Tic ' \ + 'CheckItemsCreated ' \ + 'CheckFinalCheckbookInventory' diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py b/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py index deb4a05022..f791edc1f2 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py @@ -371,9 +371,6 @@ class TestERP5BankingCheckbookUsualCashTransfer(TestERP5BankingCheckbookUsualCas self.failUnless(message.find('Sorry, the item with reference')>=0) self.failUnless(message.find('is not available any more')>=0) - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.checkbook_usual_cash_transfer) - ################################## ## Tests ################################## @@ -390,13 +387,11 @@ class TestERP5BankingCheckbookUsualCashTransfer(TestERP5BankingCheckbookUsualCas + 'CreateCheckAndCheckbookLineList Tic ' \ + 'CheckConfirmCheckbookUsualCashTransferRaiseError Tic ' \ + 'ChangeCheckbookUsualCashTransferStartDate Tic ' \ - + 'CheckWorklist Tic ' \ + 'ConfirmCheckbookUsualCashTransfer Tic ' \ + 'CheckConfirmedCheckbookInventory Tic ' \ + 'ChangePreviousDeliveryDate Tic ' \ + 'DeliverCheckbookUsualCashTransferFails Tic ' \ + 'PutBackPreviousDeliveryDate Tic ' \ - + 'CheckWorklist Tic ' \ + 'DeliverCheckbookUsualCashTransfer Tic ' \ + 'CheckFinalCheckbookInventory' sequence_list.addSequenceString(sequence_string) diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py b/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py index 9238e3dce5..eb86e2ad13 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py @@ -368,9 +368,6 @@ class TestERP5BankingCheckbookVaultTransfer(TestERP5BankingCheckbookVaultTransfe self.failUnless(message.find('Sorry, the item with reference')>=0) self.failUnless(message.find('is not available any more')>=0) - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.checkbook_vault_transfer) - ################################## ## Tests ################################## @@ -385,15 +382,12 @@ class TestERP5BankingCheckbookVaultTransfer(TestERP5BankingCheckbookVaultTransfe sequence_string = 'Tic CheckObjects Tic CheckInitialCheckbookInventory ' \ + 'CreateCheckbookVaultTransfer Tic ' \ + 'CreateCheckAndCheckbookLineList Tic ' \ - + 'CheckWorklist Tic ' \ + 'OrderCheckbookVaultTransfer Tic ' \ - + 'CheckWorklist Tic ' \ + 'ConfirmCheckbookVaultTransfer Tic ' \ + 'CheckConfirmedCheckbookInventory Tic ' \ + 'ChangePreviousDeliveryDate Tic ' \ + 'DeliverCheckbookVaultTransferFails Tic ' \ + 'PutBackPreviousDeliveryDate Tic ' \ - + 'CheckWorklist Tic ' \ + 'DeliverCheckbookVaultTransfer Tic ' \ + 'CheckFinalCheckbookInventory' sequence_list.addSequenceString(sequence_string) diff --git a/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py b/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py index 3a94b337cd..38fbf81883 100755 --- a/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py +++ b/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py @@ -508,9 +508,6 @@ 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 ################################## @@ -527,7 +524,6 @@ class TestERP5BankingClassificationSurvey(TestERP5BankingMixin, ERP5TypeTestCase + 'CreateTwoValidIncomingLine CheckSubTotal ' \ + 'CreateValidOutgoingLineForInternalBanknote ' \ + 'CreateValidOutgoingLineForExternalBanknote ' \ - + 'Tic CheckWorklist ' \ + 'Tic CheckTotal ' \ + 'CheckSource CheckDestination ' \ + 'ConfirmClassificationSurvey Tic ' \ @@ -535,7 +531,6 @@ 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 623e4e4bcb..a7b8276986 100644 --- a/product/ERP5Banking/tests/testERP5BankingCounterRendering.py +++ b/product/ERP5Banking/tests/testERP5BankingCounterRendering.py @@ -496,9 +496,6 @@ 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,14 +516,12 @@ 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 8852c04236..f0584845d5 100644 --- a/product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py +++ b/product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py @@ -431,9 +431,6 @@ 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 ################################## @@ -453,12 +450,10 @@ 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 2c8fe1ec53..2712f11d7f 100755 --- a/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py +++ b/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py @@ -355,9 +355,6 @@ 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 ################################## @@ -376,10 +373,8 @@ 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 69a7487b3d..dc5ee539a1 100644 --- a/product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py +++ b/product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py @@ -261,9 +261,6 @@ 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 ################################## @@ -278,7 +275,6 @@ 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/testERP5BankingInternalMoneyPayment.py b/product/ERP5Banking/tests/testERP5BankingInternalMoneyPayment.py index 72d4c0c5ec..af6603f235 100644 --- a/product/ERP5Banking/tests/testERP5BankingInternalMoneyPayment.py +++ b/product/ERP5Banking/tests/testERP5BankingInternalMoneyPayment.py @@ -263,9 +263,6 @@ class TestERP5BankingInternalMoneyPayment(TestERP5BankingMixin, ERP5TypeTestCase """ self.internal_money_payment_module.deleteContent('internal_money_payment_1') - def stepCheckWorklist(self, **kw): - self.checkWorklist(self.internal_money_payment) - ################################## ## Tests ################################## @@ -280,7 +277,6 @@ class TestERP5BankingInternalMoneyPayment(TestERP5BankingMixin, ERP5TypeTestCase sequence_string = 'Tic CheckObjects Tic CheckInitialInventory ' \ + 'CreateInternalMoneyPayment ' \ + 'InputCashDetails Tic ' \ - + 'Tic CheckWorklist ' \ + 'DeliverInternalMoneyPayment Tic ' \ + 'CheckFinalInventory' sequence_list.addSequenceString(sequence_string) diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py b/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py index c77a9ba32b..47188f7020 100644 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py @@ -1000,9 +1000,6 @@ 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 ################################## @@ -1021,7 +1018,6 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) + 'CreateValidLineForAuxiliaire2 CheckTotal ' \ + 'CheckInitialInventoryForAuxiliaire ' \ + 'SetMonetaryDestructionSourceTotalAssetPrice ' \ - + 'Tic CheckWorklist ' \ + 'PlannedMonetaryDestruction Tic ' \ + 'CheckSourceDebitPlannedForAuxiliaire ' \ + 'StartMonetaryDestruction Tic ' \ @@ -1042,13 +1038,11 @@ class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase) + 'TryPlannedMonetaryDestructionWithBadInventory ' \ + 'DelInvalidLine Tic CheckTotal ' \ + 'SetMonetaryDestructionSourceTotalAssetPrice ' \ - + 'Tic CheckWorklist ' \ + 'PlannedMonetaryDestruction Tic ' \ + 'CheckSourceDebitPlanned ' \ + 'ResetInventory Tic ' \ + 'ValidateFails ' \ + 'DeleteResetInventory ' \ - + 'Tic CheckWorklist ' \ + 'ValidateMonetaryDestruction Tic ' \ + 'CheckSourceDebit ' \ + 'DelMonetaryDestruction Tic' diff --git a/product/ERP5Banking/tests/testERP5BankingStopPayment.py b/product/ERP5Banking/tests/testERP5BankingStopPayment.py index 3b6ca6d24b..f953721bdd 100755 --- a/product/ERP5Banking/tests/testERP5BankingStopPayment.py +++ b/product/ERP5Banking/tests/testERP5BankingStopPayment.py @@ -308,9 +308,6 @@ class TestERP5BankingStopPayment( TestERP5BankingCheckbookDeliveryMixin, """ self.assertEqual(self.check_1.getSimulationState(),'confirmed') - def stepCheckStopPaymentWorklist(self, **kw): - self.checkWorklist(self.stop_payment) - ################################## ## Tests ################################## -- 2.30.9