[Erp5-report] r16604 - /erp5/trunk/products/ERP5Banking/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 25 13:02:52 CEST 2007
Author: seb
Date: Tue Sep 25 13:02:52 2007
New Revision: 16604
URL: http://svn.erp5.org?rev=16604&view=rev
Log:
check many worklists, also fix problem of vault in cash balance regulation
Modified:
erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashClassification.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashExchange.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashMovement.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashSorting.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckPayment.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookMovement.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookReception.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py
erp5/trunk/products/ERP5Banking/tests/testERP5BankingStopPayment.py
Modified: erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py Tue Sep 25 13:02:52 2007
@@ -1120,3 +1120,23 @@
to_delete_id_list = [x for x in inventory_module.objectIds()
if x.find('reset')>=0]
inventory_module.manage_delObjects(ids=to_delete_id_list)
+
+ def checkWorklist(self, document):
+ """
+ """
+ document.portal_caches.clearAllCache()
+ portal_type = document.getPortalType()
+ state = document.getSimulationState()
+ workflow_id = '%s_workflow' % portal_type.lower().replace(' ', '_')
+ actions = self.getPortal().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)
+
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py Tue Sep 25 13:02:52 2007
@@ -136,7 +136,7 @@
self.guichet_1 = self.paris.surface.banque_interne.guichet_1.encaisse_des_billets_et_monnaies
self.createCashInventory(source=self.guichet_1, destination=self.guichet_1, currency=self.currency_1, line_list=line_list)
- self.guichet_caveau = self.paris.caveau.serre.encaisse_des_billets_retires_de_la_circulation
+ self.guichet_caveau = self.paris.caveau.auxiliaire.encaisse_des_billets_et_monnaies
self.createCashInventory(source=self.guichet_caveau, destination=self.guichet_caveau, currency=self.currency_1, line_list=line_list)
self.guichet_salletri = self.paris.surface.salle_tri.encaisse_des_billets_et_monnaies
@@ -278,7 +278,7 @@
self.assertEqual(len(self.cash_balance_regulation_module.objectValues()), 1)
self.cash_balance_regulation = getattr(self.cash_balance_regulation_module, 'cash_balance_regulation_1')
self.assertEqual(self.cash_balance_regulation.getPortalType(), 'Cash Balance Regulation')
- self.assertEqual(self.cash_balance_regulation.getSource(), 'site/testsite/paris/caveau/serre/encaisse_des_billets_retires_de_la_circulation')
+ self.assertEqual(self.cash_balance_regulation.getSource(), 'site/testsite/paris/caveau/auxiliaire/encaisse_des_billets_et_monnaies')
self.assertEqual(self.cash_balance_regulation.getDestination(), None)
def stepCreateCashBalanceRegulationSalleTri(self, sequence=None, sequence_list=None, **kwd):
@@ -696,7 +696,8 @@
-
+ def stepCheckWorklist(self, **kw):
+ self.checkWorklist(self.cash_balance_regulation)
def stepDelCashBalanceRegulation(self, sequence=None, sequence_list=None, **kwd):
"""
@@ -723,8 +724,10 @@
+ 'CreateValidOutgoingLine ' \
+ 'Tic CheckTotal ' \
+ 'CheckInitialInventory ' \
+ + 'Tic CheckWorklist ' \
+ 'ConfirmCashBalanceRegulation Tic ' \
+ 'CheckConfirmedInventory ' \
+ + 'Tic CheckWorklist ' \
+ 'DeliverCashBalanceRegulation Tic ' \
+ 'CheckFinalInventory'
sequence_list.addSequenceString(sequence_string)
@@ -736,8 +739,10 @@
+ 'CreateValidOutgoingLine ' \
+ 'Tic CheckTotal ' \
+ 'CheckInitialInventoryCaveau ' \
+ + 'Tic CheckWorklist ' \
+ 'ConfirmCashBalanceRegulation Tic ' \
+ 'CheckConfirmedInventoryCaveau ' \
+ + 'Tic CheckWorklist ' \
+ 'DeliverCashBalanceRegulation Tic ' \
+ 'CheckFinalInventoryCaveau'
sequence_list.addSequenceString(sequence_caveau)
@@ -750,6 +755,7 @@
+ 'CheckInitialInventorySalleTri ' \
+ 'ConfirmCashBalanceRegulation Tic ' \
+ 'CheckConfirmedInventorySalleTri ' \
+ + 'Tic CheckWorklist ' \
+ 'DeliverCashBalanceRegulation Tic ' \
+ 'CheckFinalInventorySalleTri'
sequence_list.addSequenceString(sequence_salletri)
@@ -762,6 +768,7 @@
+ 'CheckInitialInventorySurface ' \
+ 'ConfirmCashBalanceRegulation Tic ' \
+ 'CheckConfirmedInventorySurface ' \
+ + 'Tic CheckWorklist ' \
+ 'DeliverCashBalanceRegulation Tic ' \
+ 'CheckFinalInventorySurface'
sequence_list.addSequenceString(sequence_surface)
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashClassification.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashClassification.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashClassification.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashClassification.py Tue Sep 25 13:02:52 2007
@@ -704,6 +704,8 @@
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)
##################################
## Tests
@@ -725,7 +727,9 @@
+ 'CreateValidOutgoingLineForMixed ' \
+ 'Tic CheckTotal ' \
+ 'CheckSource CheckDestination ' \
+ + 'Tic CheckWorklist ' \
+ 'ConfirmCashSorting Tic ' \
+ + 'Tic CheckWorklist ' \
+ 'CheckSourceDebitPlanned CheckDestinationCreditPlanned ' \
+ 'DeliverCashSorting Tic ' \
+ 'CheckSourceDebit CheckDestinationCredit '
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashExchange.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashExchange.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashExchange.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashExchange.py Tue Sep 25 13:02:52 2007
@@ -498,6 +498,9 @@
'cash_exchange_workflow','deliver_action')
self.failUnless(message.find('Insufficient balance')>=0)
+ def stepCheckWorklist(self, **kw):
+ self.checkWorklist(self.cash_exchange)
+
##################################
## Tests
@@ -520,6 +523,7 @@
+ 'ResetInventory Tic ' \
+ 'DeliverFails Tic ' \
+ 'DeleteResetInventory Tic ' \
+ + 'Tic CheckWorklist ' \
+ 'DeliverCashExchange Tic ' \
+ 'CheckFinalInventoryGuichet_1 ' \
+ 'CheckFinalInventoryGuichet_2'
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashMovement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashMovement.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashMovement.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashMovement.py Tue Sep 25 13:02:52 2007
@@ -143,9 +143,13 @@
self.line_list = line_list = [inventory_dict_line_1, inventory_dict_line_2]
self.vault_source = self.paris.caveau.auxiliaire.encaisse_des_externes
+ self.currency_handover_vault_source = self.paris.caveau.auxiliaire.encaisse_des_devises.usd
self.vault_destination = self.madrid.caveau.reserve.encaisse_des_billets_et_monnaies
self.createCashInventory(source=None, destination=self.vault_source, currency=self.currency_1,
+ line_list=line_list)
+ self.createCashInventory(source=None, destination=self.currency_handover_vault_source,
+ currency=self.currency_1,
line_list=line_list)
# Create an Organisation that will be used for users assignment
self.checkUserFolderType()
@@ -188,6 +192,24 @@
# check we have 12 coin of 200 in vault_source
self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
self.assertEqual(self.simulation_tool.getFutureInventory(node=self.vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
+ # check we don't have banknotes of 10000
+ self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.vault_destination.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
+ self.assertEqual(self.simulation_tool.getFutureInventory(node=self.vault_destination.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
+ # check we don't have coins of 200
+ self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.vault_destination.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
+ self.assertEqual(self.simulation_tool.getFutureInventory(node=self.vault_destination.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
+
+ def stepCheckCurrencyHandoverInitialInventory(self, sequence=None, sequence_list=None, **kwd):
+ """
+ Check the initial inventory before any operations
+ """
+ self.simulation_tool = self.getSimulationTool()
+ # check we have 5 banknotes of 10000 in vault_source
+ self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
+ self.assertEqual(self.simulation_tool.getFutureInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 5.0)
+ # check we have 12 coin of 200 in vault_source
+ self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
+ self.assertEqual(self.simulation_tool.getFutureInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 12.0)
# check we don't have banknotes of 10000
self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.vault_destination.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
self.assertEqual(self.simulation_tool.getFutureInventory(node=self.vault_destination.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
@@ -258,7 +280,10 @@
# check the banknote of the cell is banknote of 10000
self.assertEqual(cell.getResourceValue(), self.billet_10000)
# check the source vault is vault_source
- self.assertEqual(cell.getSourceValue(), self.vault_source)
+ if cell.getExplanationValue().isCurrencyHandover():
+ self.assertEqual(cell.getSourceValue(), self.currency_handover_vault_source)
+ else:
+ self.assertEqual(cell.getSourceValue(), self.vault_source)
# check the destination vault is vault_destination
if cell.getId() == 'movement_0_0_0':
# check the quantity of banknote for year 1992 is 2
@@ -482,6 +507,19 @@
# check we will have 0 coin of 200 after deliver
self.assertEqual(self.simulation_tool.getFutureInventory(node=self.vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
+ def stepCheckCurrencyHandoverSourceDebitStarted(self, sequence=None, sequence_list=None, **kwd):
+ """
+ Check that computaion of inventory at vault vault_source is right after start and before stop
+ """
+ # check we have 0 banknotes of 10000 currently
+ self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
+ # check we will have 0 banknote of 10000 after deliver
+ self.assertEqual(self.simulation_tool.getFutureInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
+ # check we have 0 coins of 200 currently
+ self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
+ # check we will have 0 coin of 200 after deliver
+ self.assertEqual(self.simulation_tool.getFutureInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
+
def stepCheckDestinationCreditStarted(self, sequence=None, sequence_list=None, **kwd):
"""
Check that compution of inventory at vault vault_destination is right after start and before stop
@@ -516,6 +554,7 @@
def stepSetCashMovementCurrencyHandover(self, sequence=None, sequence_list=None, **kwd):
self.cash_movement.setCurrencyHandover(True)
self.cash_movement.setDestination(None)
+ self.cash_movement.setSourceValue(self.currency_handover_vault_source)
def stepDeliverCashMovement(self, sequence=None, sequence_list=None, **kwd):
"""
@@ -543,7 +582,16 @@
self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
self.assertEqual(self.simulation_tool.getFutureInventory(node=self.vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
-
+ def stepCheckCurrencyHandoverSourceDebit(self, sequence=None, sequence_list=None, **kwd):
+ """
+ Check inventory at source (vault vault_source) after deliver of the cash_movement
+ """
+ # check we have 0 banknote of 10000
+ self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
+ self.assertEqual(self.simulation_tool.getFutureInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.billet_10000.getRelativeUrl()), 0.0)
+ # check we have 0 coin of 200
+ self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
+ self.assertEqual(self.simulation_tool.getFutureInventory(node=self.currency_handover_vault_source.getRelativeUrl(), resource = self.piece_200.getRelativeUrl()), 0.0)
def stepCheckDestinationCredit(self, sequence=None, sequence_list=None, **kwd):
"""
@@ -587,6 +635,9 @@
message = self.assertWorkflowTransitionFails(self.cash_movement,
'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):
@@ -602,14 +653,18 @@
+ '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 '
@@ -617,19 +672,24 @@
# Another sequence in order to test that the currency handover
# is working
- sequence_string = 'Tic DelCashMovement Tic CheckInitialInventory ' \
+ sequence_string = 'Tic DelCashMovement Tic CheckCurrencyHandoverInitialInventory ' \
+ 'CreateCashMovement ' \
+ 'SetCashMovementCurrencyHandover ' \
+ 'CreateValidLine1 CheckSubTotal ' \
+ 'CreateValidLine2 CheckTotal ' \
- + 'CheckInitialInventory ' \
+ + 'CheckCurrencyHandoverInitialInventory ' \
+ 'Tic CheckTotal ' \
+ + 'Tic CheckWorklist ' \
+ 'ConfirmCashMovement ' \
+ + 'Tic CheckWorklist ' \
+ 'StartCashMovement ' \
- + 'CheckSourceDebitStarted CheckDestinationHasNotChanged ' \
+ + 'CheckCurrencyHandoverSourceDebitStarted ' \
+ + 'CheckDestinationHasNotChanged ' \
+ + 'Tic CheckWorklist ' \
+ 'StopCashMovement ' \
+ + 'Tic CheckWorklist ' \
+ 'DeliverCashMovement ' \
- + 'CheckSourceDebit CheckDestinationHasNotChanged '
+ + 'CheckCurrencyHandoverSourceDebit CheckDestinationHasNotChanged '
sequence_list.addSequenceString(sequence_string)
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashSorting.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashSorting.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashSorting.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashSorting.py Tue Sep 25 13:02:52 2007
@@ -602,6 +602,8 @@
'cash_sorting_workflow','deliver_action')
self.failUnless(message.find('Insufficient balance')>=0)
+ def stepCheckWorklist(self, **kw):
+ self.checkWorklist(self.cash_sorting)
##################################
## Tests
@@ -621,9 +623,11 @@
+ 'CreateValidOutgoingLineForExternalBanknote ' \
+ 'CreateValidOutgoingLineForInternalAndCancelledBanknote Tic CheckTotal ' \
+ 'CheckSource CheckDestination ' \
+ + 'Tic CheckWorklist ' \
+ 'ConfirmCashSorting Tic ' \
+ 'CheckSourceDebitPlanned CheckDestinationCreditPlanned ' \
+ 'ResetSourceInventory Tic ' \
+ + 'Tic CheckWorklist ' \
+ 'DeliverCashSortingFails Tic ' \
+ 'DeleteResetInventory Tic ' \
+ 'DeliverCashSorting Tic ' \
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py Tue Sep 25 13:02:52 2007
@@ -444,15 +444,14 @@
self.assertEqual(self.simulation_tool.getCurrentInventory(node=self.guichet_sortante.getRelativeUrl(), resource = self.piece_100.getRelativeUrl()), 0.0)
self.assertEqual(self.simulation_tool.getFutureInventory(node=self.guichet_sortante.getRelativeUrl(), resource = self.piece_100.getRelativeUrl()), 0.0)
-
-
def stepDelCashToCurrencyPurchase(self, sequence=None, sequence_list=None, **kwd):
"""
Delete the invalid vault_transfer line previously create
"""
self.cash_to_currency_purchase_module.deleteContent('cash_to_currency_purchase_1')
-
+ def stepCheckWorklist(self, **kw):
+ self.checkWorklist(self.cash_to_currency_purchase)
##################################
## Tests
@@ -471,6 +470,7 @@
+ 'CreateValidIncomingLine CheckSubTotal ' \
+ 'CreateValidOutgoingLine ' \
+ 'Tic CheckTotal ' \
+ + 'Tic CheckWorklist ' \
+ 'DeliverCashToCurrencyPurchase Tic ' \
+ 'CheckFinalInventoryGuichet_Entrante ' \
+ 'CheckFinalInventoryGuichet_Sortante'
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py Tue Sep 25 13:02:52 2007
@@ -411,6 +411,8 @@
'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
@@ -432,6 +434,7 @@
+ 'ResetSourceInventory Tic ' \
+ 'DeliverCashToCurrencySaleFails Tic ' \
+ 'DeleteResetInventory Tic ' \
+ + 'CheckWorklist Tic ' \
+ 'DeliverCashToCurrencySale Tic ' \
+ 'CheckFinalInventoryGuichet_Entrante ' \
+ 'CheckFinalInventoryGuichet_Sortante'
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckPayment.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckPayment.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckPayment.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckPayment.py Tue Sep 25 13:02:52 2007
@@ -474,6 +474,24 @@
'check_payment_workflow','deliver_action')
self.failUnless(message.find('Insufficient balance')>=0)
+ def stepCheckCheckIsDelivered(self, sequence=None, sequence_list=None, **kwd):
+ """
+ Make sure that the check is in delivered state
+ """
+ check = self.check_payment.getAggregateValue()
+ self.assertEquals(check, self.check_1)
+ self.assertEquals(check.getSimulationState(), 'delivered')
+
+ def stepCheckUndeliverCheck(self, sequence=None, sequence_list=None, **kwd):
+ """
+ Make sure that the check is in delivered state
+ """
+ check = self.check_payment.getAggregateValue()
+ self.assertEquals(check, self.check_1)
+ self.workflow_tool.doActionFor(check, 'undeliver_action',
+ wf_id='check_workflow')
+ self.assertEquals(check.getSimulationState(), 'confirmed')
+
class TestERP5BankingCheckPayment(TestERP5BankingCheckPaymentMixin,
TestERP5BankingMixin, ERP5TypeTestCase):
@@ -501,6 +519,8 @@
'PayCheckPaymentFails Tic ' \
'DeleteResetInventory Tic ' \
'Pay Tic ' \
+ 'CheckCheckIsDelivered Tic ' \
+ 'CheckUndeliverCheck Tic ' \
'CheckFinalInventory Cleanup Tic'
# sequence 2 : check if validating with non-exiting check fail if
# automatic check creation is disabled.
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py Tue Sep 25 13:02:52 2007
@@ -280,6 +280,9 @@
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
##################################
@@ -297,6 +300,7 @@
+ 'ChangePreviousDeliveryDate Tic ' \
+ 'DeliverCheckbookDeliveryFails Tic ' \
+ 'PutBackPreviousDeliveryDate Tic ' \
+ + 'CheckWorklist Tic ' \
+ 'DeliverCheckbookDelivery Tic ' \
+ 'CheckFinalCheckbookInventory'
sequence_list.addSequenceString(sequence_string)
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookMovement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookMovement.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookMovement.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookMovement.py Tue Sep 25 13:02:52 2007
@@ -314,6 +314,9 @@
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
##################################
@@ -328,13 +331,17 @@
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)
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookReception.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookReception.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookReception.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookReception.py Tue Sep 25 13:02:52 2007
@@ -140,7 +140,7 @@
def stepCreateCheckbookReception(self, sequence=None, sequence_list=None,
- id='checkbook_reception', **kwd):
+ id='checkbook_reception', imported=0, **kwd):
"""
Create a checkbook reception document and check it
"""
@@ -150,16 +150,20 @@
source_value=None, destination_value=self.destination_site,
resource_value=self.currency_1,
description='test',
- start_date=self.date)
+ start_date=self.date,
+ imported=imported)
setattr(self, id, checkbook_reception)
# get the checkbook reception document
- self.checkbook_reception = getattr(self.checkbook_reception_module, 'checkbook_reception')
+ self.checkbook_reception = getattr(self.checkbook_reception_module, id)
# check its portal type
self.assertEqual(self.checkbook_reception.getPortalType(), 'Checkbook Reception')
# check that its source is caisse_1
self.assertEqual(self.checkbook_reception.getSource(), None)
# check that its destination is caisse_2
- self.assertEqual(self.checkbook_reception.getBaobabDestination(),
+ if imported:
+ self.assertEqual(self.checkbook_reception.getBaobabDestination(), None)
+ else:
+ self.assertEqual(self.checkbook_reception.getBaobabDestination(),
'site/testsite/paris/caveau/auxiliaire/encaisse_des_billets_et_monnaies')
return self.checkbook_reception
@@ -171,6 +175,10 @@
def stepCreateCheckbookReception4(self, sequence=None, sequence_list=None, **kwd):
self.stepCreateCheckbookReception(id='checkbook_reception4')
+
+ def stepCreateCheckbookReception5(self, sequence=None, sequence_list=None, **kwd):
+ self.stepCreateCheckbookReception(id='checkbook_reception5',
+ imported=1)
def stepCreateCheckAndCheckbookLineList2(self, sequence=None, sequence_list=None, **kwd):
"""
@@ -212,6 +220,22 @@
destination_payment_value=self.bank_account_1,
reference_range_min='0000101',
reference_range_max='0000150',
+ )
+
+ def stepCreateCheckAndCheckbookLineList5(self, sequence=None, sequence_list=None, **kwd):
+ """
+ Create the checkbook
+ """
+ # This is not required to create checkbook items, they will be
+ # automatically created with the confirm action worfklow transition
+
+ # Add a line for check and checkbook
+ self.line_1 = self.checkbook_reception5.newContent(quantity=1,
+ resource_value=self.checkbook_model_1,
+ check_amount_value=self.checkbook_model_1.variant_1,
+ destination_payment_value=self.bank_account_1,
+ reference_range_min='0000200',
+ reference_range_max='0000249',
)
def stepCreateCheckAndCheckbookLineList(self, sequence=None, sequence_list=None, **kwd):
@@ -299,6 +323,14 @@
wf_id='checkbook_reception_workflow')
self.assertEqual(self.checkbook_reception4.getSimulationState(), 'confirmed')
+ def stepConfirmCheckbookReception5(self, sequence=None, sequence_list=None, **kwd):
+ """
+ confirm the monetary reception
+ """
+ self.workflow_tool.doActionFor(self.checkbook_reception5, 'confirm_action',
+ wf_id='checkbook_reception_workflow')
+ self.assertEqual(self.checkbook_reception5.getSimulationState(), 'confirmed')
+
def stepDeliverCheckbookReception2Fails(self, sequence=None, sequence_list=None, **kwd):
"""
confirm the monetary reception
@@ -326,6 +358,14 @@
self.failUnless(msg.find('The following references are already allocated')
>=0)
self.failUnless(msg.find('150')>=0)
+
+ def stepDeliverCheckbookReception5(self, sequence=None, sequence_list=None, **kwd):
+ """
+ confirm the monetary reception
+ """
+ self.workflow_tool.doActionFor(self.checkbook_reception5, 'deliver_action',
+ wf_id='checkbook_reception_workflow')
+ self.assertEqual(self.checkbook_reception3.getSimulationState(), 'delivered')
def stepDeliverCheckbookReception(self, sequence=None, sequence_list=None, **kw):
"""
@@ -358,6 +398,18 @@
self.failIfDifferentSet(checkbook_object_list,[self.checkbook_1,self.check_1])
self.assertEqual(len(self.simulation_tool.getFutureTrackingList(node=self.reception.getRelativeUrl())), 2)
+ def stepCheckConfirmedCheckbookForImport(self, sequence=None, sequence_list=None, **kw):
+ """
+ Check cash checkbook in item table
+ """
+ checkbook = self.checkbook_reception5.objectValues()[0].getAggregateValue()
+ self.assertEqual(checkbook.getValidationState(), 'confirmed')
+ check = checkbook.objectValues()[0]
+ self.assertEqual(check.getSimulationState(), 'confirmed')
+
+ def stepCheckWorklist(self, **kw):
+ self.checkWorklist(self.checkbook_reception)
+
##################################
## Tests
##################################
@@ -372,7 +424,9 @@
sequence_string = 'Tic CheckObjects Tic CheckInitialCheckbookInventory ' \
+ 'CreateCheckbookReception Tic ' \
+ 'CreateCheckAndCheckbookLineList Tic ' \
+ + 'CheckWorklist Tic ' \
+ 'ConfirmCheckbookReception Tic ' \
+ + 'CheckWorklist Tic ' \
+ 'DeliverCheckbookReception Tic ' \
+ 'CheckItemsCreated ' \
+ 'CheckFinalCheckbookInventory'
@@ -401,6 +455,16 @@
+ 'DeliverCheckbookReception4Fails '
sequence_list.addSequenceString(sequence_string)
+ # Make sure that if we have an import, then everything
+ # will be confirmed automatically
+ sequence_string = 'Tic ' \
+ + 'CreateCheckbookReception5 Tic ' \
+ + 'CreateCheckAndCheckbookLineList5 Tic ' \
+ + 'ConfirmCheckbookReception5 Tic ' \
+ + 'DeliverCheckbookReception5 Tic ' \
+ + 'CheckConfirmedCheckbookForImport Tic '
+ sequence_list.addSequenceString(sequence_string)
+
# play the sequence
sequence_list.play(self)
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py Tue Sep 25 13:02:52 2007
@@ -373,6 +373,9 @@
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
##################################
@@ -389,11 +392,13 @@
+ '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)
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py Tue Sep 25 13:02:52 2007
@@ -370,6 +370,9 @@
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
##################################
@@ -384,12 +387,15 @@
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)
Modified: erp5/trunk/products/ERP5Banking/tests/testERP5BankingStopPayment.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/testERP5BankingStopPayment.py?rev=16604&r1=16603&r2=16604&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/testERP5BankingStopPayment.py (original)
+++ erp5/trunk/products/ERP5Banking/tests/testERP5BankingStopPayment.py Tue Sep 25 13:02:52 2007
@@ -309,16 +309,8 @@
"""
self.assertEqual(self.check_1.getSimulationState(),'confirmed')
- def stepCheckConfirmedWorklist(self, sequence=None, sequence_list=None, **kw):
- """
- """
- actions = self.getPortal().portal_actions.listFilteredActionsFor(self.stop_payment)
- found = 0
- for action in actions['global']:
- if action.get('workflow_id', None) == 'stop_payment_workflow':
- if action.get('title', None) == 'Stop Payment To Confirm (1)':
- found = 1
- self.assertEquals(found, 1)
+ def stepCheckStopPaymentWorklist(self, **kw):
+ self.checkWorklist(self.stop_payment)
##################################
## Tests
@@ -336,12 +328,13 @@
+ 'CreateStopPayment Tic ' \
+ 'SetStopPaymentDebit Tic ' \
+ 'ConfirmStopPayment Tic ' \
- + 'CheckConfirmedWorklist Tic ' \
+ + 'CheckStopPaymentWorklist Tic ' \
+ 'CheckLineCreated Tic ' \
+ 'CheckConfirmedCheckbookInventory ' \
+ 'StartStopPayment Tic ' \
+ 'CheckCheckIsStopped Tic ' \
+ 'DebitStopStopPayment Tic ' \
+ + 'CheckStopPaymentWorklist Tic ' \
+ 'DebitDeliverStopPayment Tic ' \
+ 'CheckCheckIsConfirmed Tic ' \
+ 'CheckInitialAndFinalCheckbookInventory '
More information about the Erp5-report
mailing list