From 724080e687352ecca5bfc303e8a3293e84857a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Wisniewski?= <gregory@nexedi.com> Date: Tue, 17 Nov 2009 10:00:48 +0000 Subject: [PATCH] Avoid multiple inheritance when possible. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30687 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5Banking/tests/TestERP5BankingMixin.py | 4 ++-- .../tests/testERP5BankingAccountingCancellation.py | 4 +--- product/ERP5Banking/tests/testERP5BankingAccountingDate.py | 3 +-- .../ERP5Banking/tests/testERP5BankingAvailableInventory.py | 6 +----- .../tests/testERP5BankingBankAccountInventory.py | 3 +-- .../tests/testERP5BankingCashBalanceRegulation.py | 3 +-- .../ERP5Banking/tests/testERP5BankingCashClassification.py | 3 +-- product/ERP5Banking/tests/testERP5BankingCashExchange.py | 3 +-- product/ERP5Banking/tests/testERP5BankingCashInventory.py | 3 +-- product/ERP5Banking/tests/testERP5BankingCashMovement.py | 3 +-- .../tests/testERP5BankingCashMovementNewNotEmitted.py | 5 +---- product/ERP5Banking/tests/testERP5BankingCashSorting.py | 3 +-- .../tests/testERP5BankingCashToCurrencyPurchase.py | 3 +-- .../ERP5Banking/tests/testERP5BankingCashToCurrencySale.py | 3 +-- product/ERP5Banking/tests/testERP5BankingCheckDeposit.py | 3 +-- product/ERP5Banking/tests/testERP5BankingCheckPayment.py | 6 ++---- .../ERP5Banking/tests/testERP5BankingCheckbookDelivery.py | 6 ++---- .../ERP5Banking/tests/testERP5BankingCheckbookMovement.py | 5 +---- .../ERP5Banking/tests/testERP5BankingCheckbookReception.py | 3 +-- .../tests/testERP5BankingCheckbookUsualCashTransfer.py | 5 +---- .../tests/testERP5BankingCheckbookVaultTransfer.py | 6 ++---- .../tests/testERP5BankingClassificationSurvey.py | 3 +-- product/ERP5Banking/tests/testERP5BankingCounterDate.py | 4 +--- .../ERP5Banking/tests/testERP5BankingCounterRendering.py | 3 +-- .../ERP5Banking/tests/testERP5BankingDestructionSurvey.py | 3 +-- .../tests/testERP5BankingForeignCashReception.py | 3 +-- .../tests/testERP5BankingInternalMoneyDeposit.py | 3 +-- .../tests/testERP5BankingInternalMoneyPayment.py | 3 +-- .../tests/testERP5BankingMonetaryDestruction.py | 3 +-- product/ERP5Banking/tests/testERP5BankingMonetaryIssue.py | 5 ++--- product/ERP5Banking/tests/testERP5BankingMonetaryRecall.py | 3 +-- .../ERP5Banking/tests/testERP5BankingMonetaryReception.py | 3 +-- product/ERP5Banking/tests/testERP5BankingMonetarySurvey.py | 3 +-- product/ERP5Banking/tests/testERP5BankingMoneyDeposit.py | 6 ++---- .../tests/testERP5BankingMoneyDepositRendering.py | 3 +-- .../ERP5Banking/tests/testERP5BankingMutilatedBanknote.py | 3 +-- product/ERP5Banking/tests/testERP5BankingStopPayment.py | 7 ++----- .../tests/testERP5BankingTravelerCheckPurchase.py | 5 +---- .../ERP5Banking/tests/testERP5BankingTravelerCheckSale.py | 6 ++---- .../ERP5Banking/tests/testERP5BankingUsualCashRendering.py | 3 +-- .../ERP5Banking/tests/testERP5BankingUsualCashTransfer.py | 3 +-- product/ERP5Banking/tests/testERP5BankingVaultTransfer.py | 3 +-- 42 files changed, 50 insertions(+), 111 deletions(-) diff --git a/product/ERP5Banking/tests/TestERP5BankingMixin.py b/product/ERP5Banking/tests/TestERP5BankingMixin.py index e6d595308d..41408e4d69 100644 --- a/product/ERP5Banking/tests/TestERP5BankingMixin.py +++ b/product/ERP5Banking/tests/TestERP5BankingMixin.py @@ -28,7 +28,7 @@ from DateTime import DateTime from zLOG import LOG - +from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase def isSameSet(a, b): for i in a: @@ -39,7 +39,7 @@ def isSameSet(a, b): return False return len(a) == len(b) -class TestERP5BankingMixin: +class TestERP5BankingMixin(ERP5TypeTestCase): """ Mixin class for unit test of banking operations """ diff --git a/product/ERP5Banking/tests/testERP5BankingAccountingCancellation.py b/product/ERP5Banking/tests/testERP5BankingAccountingCancellation.py index 88ef2bf51b..aaaeb54efc 100755 --- a/product/ERP5Banking/tests/testERP5BankingAccountingCancellation.py +++ b/product/ERP5Banking/tests/testERP5BankingAccountingCancellation.py @@ -32,7 +32,6 @@ import os from zLOG import LOG from DateTime import DateTime from Products.CMFCore.utils import getToolByName -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -47,8 +46,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingAccountingCancellation(TestERP5BankingMixin, - ERP5TypeTestCase): +class TestERP5BankingAccountingCancellation(TestERP5BankingMixin): """ Inside this test we will check that it is possible to cancel a transaction. """ diff --git a/product/ERP5Banking/tests/testERP5BankingAccountingDate.py b/product/ERP5Banking/tests/testERP5BankingAccountingDate.py index 2f00c30438..d6962b6862 100644 --- a/product/ERP5Banking/tests/testERP5BankingAccountingDate.py +++ b/product/ERP5Banking/tests/testERP5BankingAccountingDate.py @@ -27,7 +27,6 @@ ############################################################################## from DateTime import DateTime -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed @@ -35,7 +34,7 @@ from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed QUIET = False RUN_ALL_TEST = True -class TestERP5BankingAccountingDate(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingAccountingDate(TestERP5BankingMixin): """ Unit test Accounting Date definition and utility script. """ diff --git a/product/ERP5Banking/tests/testERP5BankingAvailableInventory.py b/product/ERP5Banking/tests/testERP5BankingAvailableInventory.py index c373a95c3c..f7fc94bad1 100755 --- a/product/ERP5Banking/tests/testERP5BankingAvailableInventory.py +++ b/product/ERP5Banking/tests/testERP5BankingAvailableInventory.py @@ -32,10 +32,8 @@ import os from zLOG import LOG from DateTime import DateTime from Products.CMFCore.utils import getToolByName -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed -from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin from Products.ERP5Banking.tests.testERP5BankingCheckPayment \ import TestERP5BankingCheckPaymentMixin from Products.ERP5Banking.tests.testERP5BankingMoneyDeposit \ @@ -53,9 +51,7 @@ if __name__ == '__main__': class TestERP5BankingAvailableInventory(TestERP5BankingCheckPaymentMixin, - TestERP5BankingMoneyDepositMixin, - TestERP5BankingMixin, - ERP5TypeTestCase): + TestERP5BankingMoneyDepositMixin): """ Unit test class in order to make sure that it is not possible to debit two times the same account if the amount on the account is diff --git a/product/ERP5Banking/tests/testERP5BankingBankAccountInventory.py b/product/ERP5Banking/tests/testERP5BankingBankAccountInventory.py index d86bb953ae..e75b01909e 100644 --- a/product/ERP5Banking/tests/testERP5BankingBankAccountInventory.py +++ b/product/ERP5Banking/tests/testERP5BankingBankAccountInventory.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': -class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingInventory(TestERP5BankingMixin): """ This class is a unit test to check the module of Bank Account Inventory """ diff --git a/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py b/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py index 0824746762..3d582efaee 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py +++ b/product/ERP5Banking/tests/testERP5BankingCashBalanceRegulation.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCashBalanceRegulation(TestERP5BankingMixin): """ Unit test for the cash balance regulation module Source = destination diff --git a/product/ERP5Banking/tests/testERP5BankingCashClassification.py b/product/ERP5Banking/tests/testERP5BankingCashClassification.py index 5b69fd5a4b..8d2f900dd3 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashClassification.py +++ b/product/ERP5Banking/tests/testERP5BankingCashClassification.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingCashClassification(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCashClassification(TestERP5BankingMixin): # pseudo constants diff --git a/product/ERP5Banking/tests/testERP5BankingCashExchange.py b/product/ERP5Banking/tests/testERP5BankingCashExchange.py index de0e94a63b..f772fae997 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashExchange.py +++ b/product/ERP5Banking/tests/testERP5BankingCashExchange.py @@ -30,7 +30,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': -class TestERP5BankingCashExchange(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCashExchange(TestERP5BankingMixin): """ Unit test for the cash exchange module Source = destination diff --git a/product/ERP5Banking/tests/testERP5BankingCashInventory.py b/product/ERP5Banking/tests/testERP5BankingCashInventory.py index 2e8f0cc487..69e1e1c5bd 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashInventory.py +++ b/product/ERP5Banking/tests/testERP5BankingCashInventory.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': -class TestERP5BankingInventory(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingInventory(TestERP5BankingMixin): """ This class is a unit test to check the module of Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingCashMovement.py b/product/ERP5Banking/tests/testERP5BankingCashMovement.py index 84186465b9..f76aa9caaa 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashMovement.py +++ b/product/ERP5Banking/tests/testERP5BankingCashMovement.py @@ -31,7 +31,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingCashMovement(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCashMovement(TestERP5BankingMixin): """ This class is a unit test to check the module of Cash Movement diff --git a/product/ERP5Banking/tests/testERP5BankingCashMovementNewNotEmitted.py b/product/ERP5Banking/tests/testERP5BankingCashMovementNewNotEmitted.py index da875e1a42..ba65bb20dc 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashMovementNewNotEmitted.py +++ b/product/ERP5Banking/tests/testERP5BankingCashMovementNewNotEmitted.py @@ -29,10 +29,8 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed -from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin from Products.ERP5Banking.tests.testERP5BankingMonetaryIssue import TestERP5BankingMonetaryReceptionMixin from DateTime import DateTime @@ -46,8 +44,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingCashMovementNewNotEmitted(TestERP5BankingMonetaryReceptionMixin, - TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCashMovementNewNotEmitted(TestERP5BankingMonetaryReceptionMixin): """ This class is a unit test to check the module of Cash Movement New Not Emitted """ diff --git a/product/ERP5Banking/tests/testERP5BankingCashSorting.py b/product/ERP5Banking/tests/testERP5BankingCashSorting.py index 2c97d951e6..b683d702d7 100755 --- a/product/ERP5Banking/tests/testERP5BankingCashSorting.py +++ b/product/ERP5Banking/tests/testERP5BankingCashSorting.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingCashSorting(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCashSorting(TestERP5BankingMixin): # pseudo constants diff --git a/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py b/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py index bf76492830..aa6c7fca67 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py +++ b/product/ERP5Banking/tests/testERP5BankingCashToCurrencyPurchase.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': -class TestERP5BankingCashToCurrencyPurchase(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCashToCurrencyPurchase(TestERP5BankingMixin): """ Unit test for the cash exchange module Source = destination diff --git a/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py b/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py index 3e60952dc8..23a4ad56d4 100644 --- a/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py +++ b/product/ERP5Banking/tests/testERP5BankingCashToCurrencySale.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingCashToCurrencySale(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCashToCurrencySale(TestERP5BankingMixin): """ Unit test for the cash exchange module Source = destination diff --git a/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py b/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py index be0f88b177..061da4841e 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckDeposit.py @@ -32,7 +32,6 @@ import os from zLOG import LOG from DateTime import DateTime from Products.CMFCore.utils import getToolByName -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -48,7 +47,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingCheckDeposit(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCheckDeposit(TestERP5BankingMixin): """ Unit test class for the check deposit module """ diff --git a/product/ERP5Banking/tests/testERP5BankingCheckPayment.py b/product/ERP5Banking/tests/testERP5BankingCheckPayment.py index 768a01d57d..b3da9310b8 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckPayment.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckPayment.py @@ -32,7 +32,6 @@ import os from zLOG import LOG from DateTime import DateTime from Products.CMFCore.utils import getToolByName -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -47,7 +46,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingCheckPaymentMixin: +class TestERP5BankingCheckPaymentMixin(TestERP5BankingMixin): """ Unit test class for the check payment module """ @@ -526,8 +525,7 @@ class TestERP5BankingCheckPaymentMixin: self.assertEquals(check.getSimulationState(), 'delivered') self.assertEquals(self.check_1.getSimulationState(), 'confirmed') -class TestERP5BankingCheckPayment(TestERP5BankingCheckPaymentMixin, - TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCheckPayment(TestERP5BankingCheckPaymentMixin): # pseudo constants RUN_ALL_TEST = 1 # we want to run all test diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py b/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py index f48c23611d..0856d66fee 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookDelivery.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.testERP5BankingCheckbookUsualCashTransfer \ @@ -47,7 +46,7 @@ os.environ['EVENT_LOG_SEVERITY'] = '-300' if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingCheckbookDeliveryMixin: +class TestERP5BankingCheckbookDeliveryMixin(TestERP5BankingMixin): def createCheckbookDelivery(self, sequence=None, sequence_list=None, **kwd): """ @@ -133,8 +132,7 @@ class TestERP5BankingCheckbookDeliveryMixin: class TestERP5BankingCheckbookDelivery(TestERP5BankingCheckbookDeliveryMixin, - TestERP5BankingCheckbookUsualCashTransferMixin, - TestERP5BankingMixin, ERP5TypeTestCase): + TestERP5BankingCheckbookUsualCashTransferMixin): """ This class is a unit test to check the module of Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookMovement.py b/product/ERP5Banking/tests/testERP5BankingCheckbookMovement.py index f3119394d9..47de922e79 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookMovement.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookMovement.py @@ -29,10 +29,8 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed -from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin from Products.ERP5Banking.tests.testERP5BankingCheckbookVaultTransfer \ import TestERP5BankingCheckbookVaultTransferMixin @@ -46,8 +44,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingCheckbookMovement(TestERP5BankingCheckbookVaultTransferMixin, - TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCheckbookMovement(TestERP5BankingCheckbookVaultTransferMixin): """ This class is a unit test to check the module of Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py b/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py index dedde7000d..adfd3838be 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookReception.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingCheckbookReception(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCheckbookReception(TestERP5BankingMixin): """ This class is a unit test to check the module of Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py b/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py index f791edc1f2..b6b110be85 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookUsualCashTransfer.py @@ -29,12 +29,10 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.testERP5BankingCheckbookVaultTransfer \ import TestERP5BankingCheckbookVaultTransferMixin -from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin from DateTime import DateTime from zLOG import LOG @@ -106,8 +104,7 @@ class TestERP5BankingCheckbookUsualCashTransferMixin( self.workflow_tool.doActionFor(self.checkbook_vault_transfer, 'deliver_action', wf_id='checkbook_vault_transfer_workflow') -class TestERP5BankingCheckbookUsualCashTransfer(TestERP5BankingCheckbookUsualCashTransferMixin, - TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCheckbookUsualCashTransfer(TestERP5BankingCheckbookUsualCashTransferMixin): """ This class is a unit test to check the module of Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py b/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py index eb86e2ad13..fe21f5e97f 100755 --- a/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingCheckbookVaultTransfer.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -43,7 +42,7 @@ os.environ['EVENT_LOG_SEVERITY'] = '-300' if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingCheckbookVaultTransferMixin: +class TestERP5BankingCheckbookVaultTransferMixin(TestERP5BankingMixin): def createCheckbookReception(self, sequence=None, sequence_list=None, **kwd): """ @@ -145,8 +144,7 @@ class TestERP5BankingCheckbookVaultTransferMixin: """ self.previous_delivery.edit(start_date=self.previous_date) -class TestERP5BankingCheckbookVaultTransfer(TestERP5BankingCheckbookVaultTransferMixin, - TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCheckbookVaultTransfer(TestERP5BankingCheckbookVaultTransferMixin): """ This class is a unit test to check the module of Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py b/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py index 38fbf81883..6b3cc1490f 100755 --- a/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py +++ b/product/ERP5Banking/tests/testERP5BankingClassificationSurvey.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingClassificationSurvey(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingClassificationSurvey(TestERP5BankingMixin): # pseudo constants diff --git a/product/ERP5Banking/tests/testERP5BankingCounterDate.py b/product/ERP5Banking/tests/testERP5BankingCounterDate.py index 1ef083393a..3ce5377dcf 100755 --- a/product/ERP5Banking/tests/testERP5BankingCounterDate.py +++ b/product/ERP5Banking/tests/testERP5BankingCounterDate.py @@ -32,7 +32,6 @@ import os from zLOG import LOG from DateTime import DateTime from Testing import ZopeTestCase -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.DCWorkflow.DCWorkflow import ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin #from Products.ERP5Banking.tests.testERP5BankingCheckPayment \ @@ -48,8 +47,7 @@ os.environ['EVENT_LOG_SEVERITY'] = '-300' if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingCounterDate(TestERP5BankingMixin, - ERP5TypeTestCase): +class TestERP5BankingCounterDate(TestERP5BankingMixin): RUN_ALL_TEST = 1 # we want to run all test QUIET = 0 # we don't want the test to be quiet diff --git a/product/ERP5Banking/tests/testERP5BankingCounterRendering.py b/product/ERP5Banking/tests/testERP5BankingCounterRendering.py index a7b8276986..795fff3d34 100644 --- a/product/ERP5Banking/tests/testERP5BankingCounterRendering.py +++ b/product/ERP5Banking/tests/testERP5BankingCounterRendering.py @@ -31,7 +31,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingCounterRendering(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingCounterRendering(TestERP5BankingMixin): """ This class is a unit test to check the module of Counter Rendering diff --git a/product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py b/product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py index f0584845d5..2c739270c0 100644 --- a/product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py +++ b/product/ERP5Banking/tests/testERP5BankingDestructionSurvey.py @@ -31,7 +31,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingDestructionSurvey(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingDestructionSurvey(TestERP5BankingMixin): """ This class is a unit test to check the module of Destruction Survey diff --git a/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py b/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py index 2712f11d7f..d59603f431 100755 --- a/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py +++ b/product/ERP5Banking/tests/testERP5BankingForeignCashReception.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingForeignCashReception(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingForeignCashReception(TestERP5BankingMixin): """ This class is a unit test to check the module of Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py b/product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py index dc5ee539a1..f76d258a92 100644 --- a/product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py +++ b/product/ERP5Banking/tests/testERP5BankingInternalMoneyDeposit.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingInternalMoneyDeposit(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingInternalMoneyDeposit(TestERP5BankingMixin): diff --git a/product/ERP5Banking/tests/testERP5BankingInternalMoneyPayment.py b/product/ERP5Banking/tests/testERP5BankingInternalMoneyPayment.py index af6603f235..bd3c650afb 100644 --- a/product/ERP5Banking/tests/testERP5BankingInternalMoneyPayment.py +++ b/product/ERP5Banking/tests/testERP5BankingInternalMoneyPayment.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingInternalMoneyPayment(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingInternalMoneyPayment(TestERP5BankingMixin): diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py b/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py index 92541b7457..fe73147c4c 100644 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryDestruction.py @@ -31,7 +31,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -47,7 +46,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingMonetaryDestruction(TestERP5BankingMixin): """ This class is a unit test to check the module of Monetary Destruction diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryIssue.py b/product/ERP5Banking/tests/testERP5BankingMonetaryIssue.py index 413c3408dd..f49209f35f 100755 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryIssue.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryIssue.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingMonetaryReceptionMixin: +class TestERP5BankingMonetaryReceptionMixin(TestERP5BankingMixin): def stepCreateMonetaryReception(self, sequence=None, sequence_list=None, **kw): """ @@ -107,7 +106,7 @@ class TestERP5BankingMonetaryReceptionMixin: self.assertEqual(len(self.simulation_tool.getFutureTrackingList(at_date=self.current_date, node=self.reception.getRelativeUrl())), 2) -class TestERP5BankingMonetaryIssue(TestERP5BankingMonetaryReceptionMixin, TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingMonetaryIssue(TestERP5BankingMonetaryReceptionMixin): """ This class is a unit test to check the module of Monetary Issue diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryRecall.py b/product/ERP5Banking/tests/testERP5BankingMonetaryRecall.py index 4166c8c102..fd6ab447a7 100755 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryRecall.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryRecall.py @@ -31,7 +31,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingMonetaryRecall(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingMonetaryRecall(TestERP5BankingMixin): """ This class is a unit test to check the module of Monetary Recall diff --git a/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py b/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py index 1dd082f065..c3bcd98c8d 100755 --- a/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetaryReception.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingMonetaryReception(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingMonetaryReception(TestERP5BankingMixin): """ This class is a unit test to check the module of Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingMonetarySurvey.py b/product/ERP5Banking/tests/testERP5BankingMonetarySurvey.py index f384a2809c..44417b23e0 100755 --- a/product/ERP5Banking/tests/testERP5BankingMonetarySurvey.py +++ b/product/ERP5Banking/tests/testERP5BankingMonetarySurvey.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -44,7 +43,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingMonetarySurvey(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingMonetarySurvey(TestERP5BankingMixin): """ This class is a unit test to check the module of Monetary Survey """ diff --git a/product/ERP5Banking/tests/testERP5BankingMoneyDeposit.py b/product/ERP5Banking/tests/testERP5BankingMoneyDeposit.py index d2d78c3690..0f1ed37254 100644 --- a/product/ERP5Banking/tests/testERP5BankingMoneyDeposit.py +++ b/product/ERP5Banking/tests/testERP5BankingMoneyDeposit.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': -class TestERP5BankingMoneyDepositMixin: +class TestERP5BankingMoneyDepositMixin(TestERP5BankingMixin): @@ -317,8 +316,7 @@ class TestERP5BankingMoneyDepositMixin: ## Tests ################################## -class TestERP5BankingMoneyDeposit(TestERP5BankingMoneyDepositMixin, - TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingMoneyDeposit(TestERP5BankingMoneyDepositMixin): # pseudo constants RUN_ALL_TEST = 1 # we want to run all test diff --git a/product/ERP5Banking/tests/testERP5BankingMoneyDepositRendering.py b/product/ERP5Banking/tests/testERP5BankingMoneyDepositRendering.py index db98ce367a..1b2b2cfb9d 100644 --- a/product/ERP5Banking/tests/testERP5BankingMoneyDepositRendering.py +++ b/product/ERP5Banking/tests/testERP5BankingMoneyDepositRendering.py @@ -31,7 +31,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingMoneyDepositRendering(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingMoneyDepositRendering(TestERP5BankingMixin): """ This class is a unit test to check the module of Money Deposit Rendering diff --git a/product/ERP5Banking/tests/testERP5BankingMutilatedBanknote.py b/product/ERP5Banking/tests/testERP5BankingMutilatedBanknote.py index 9ccbc0a1c4..f74c1a6d8b 100755 --- a/product/ERP5Banking/tests/testERP5BankingMutilatedBanknote.py +++ b/product/ERP5Banking/tests/testERP5BankingMutilatedBanknote.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -45,7 +44,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingMutilatedBanknote(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingMutilatedBanknote(TestERP5BankingMixin): """ """ diff --git a/product/ERP5Banking/tests/testERP5BankingStopPayment.py b/product/ERP5Banking/tests/testERP5BankingStopPayment.py index d0ea4d0376..f880a948a0 100755 --- a/product/ERP5Banking/tests/testERP5BankingStopPayment.py +++ b/product/ERP5Banking/tests/testERP5BankingStopPayment.py @@ -29,16 +29,14 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.testERP5BankingCheckbookVaultTransfer \ import TestERP5BankingCheckbookVaultTransferMixin from Products.ERP5Banking.tests.testERP5BankingCheckbookUsualCashTransfer \ import TestERP5BankingCheckbookUsualCashTransferMixin -from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin from Products.ERP5Banking.tests.testERP5BankingCheckbookDelivery \ - import TestERP5BankingCheckbookDelivery, TestERP5BankingCheckbookDeliveryMixin + import TestERP5BankingCheckbookDeliveryMixin from DateTime import DateTime from zLOG import LOG @@ -53,8 +51,7 @@ if __name__ == '__main__': class TestERP5BankingStopPayment( TestERP5BankingCheckbookDeliveryMixin, TestERP5BankingCheckbookUsualCashTransferMixin, - TestERP5BankingCheckbookVaultTransferMixin, - TestERP5BankingMixin, ERP5TypeTestCase): + TestERP5BankingCheckbookVaultTransferMixin): """ This class is a unit test to check the module of Stop Payment """ diff --git a/product/ERP5Banking/tests/testERP5BankingTravelerCheckPurchase.py b/product/ERP5Banking/tests/testERP5BankingTravelerCheckPurchase.py index 3cab395ce5..17841e8e46 100755 --- a/product/ERP5Banking/tests/testERP5BankingTravelerCheckPurchase.py +++ b/product/ERP5Banking/tests/testERP5BankingTravelerCheckPurchase.py @@ -29,14 +29,12 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.testERP5BankingCheckbookUsualCashTransfer \ import TestERP5BankingCheckbookUsualCashTransferMixin from Products.ERP5Banking.tests.testERP5BankingTravelerCheckSale \ import TestERP5BankingTravelerCheckSaleMixin -from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin from DateTime import DateTime from zLOG import LOG @@ -50,8 +48,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) class TestERP5BankingTravelerCheckPurchase(TestERP5BankingCheckbookUsualCashTransferMixin, - TestERP5BankingTravelerCheckSaleMixin, - TestERP5BankingMixin, ERP5TypeTestCase): + TestERP5BankingTravelerCheckSaleMixin): """ This class is a unit test to check the module of Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingTravelerCheckSale.py b/product/ERP5Banking/tests/testERP5BankingTravelerCheckSale.py index f9fb07c347..ddc844efe1 100755 --- a/product/ERP5Banking/tests/testERP5BankingTravelerCheckSale.py +++ b/product/ERP5Banking/tests/testERP5BankingTravelerCheckSale.py @@ -29,7 +29,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.testERP5BankingCheckbookUsualCashTransfer \ @@ -47,7 +46,7 @@ os.environ['EVENT_LOG_SEVERITY'] = '-300' if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingTravelerCheckSaleMixin: +class TestERP5BankingTravelerCheckSaleMixin(TestERP5BankingMixin): def getTravelerCheckSaleModule(self): """ @@ -206,8 +205,7 @@ class TestERP5BankingTravelerCheckSaleMixin: self.assertEqual(len(workflow_history), 3) class TestERP5BankingTravelerCheckSale(TestERP5BankingCheckbookUsualCashTransferMixin, - TestERP5BankingTravelerCheckSaleMixin, - TestERP5BankingMixin, ERP5TypeTestCase): + TestERP5BankingTravelerCheckSaleMixin): """ This class is a unit test to check the module of Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingUsualCashRendering.py b/product/ERP5Banking/tests/testERP5BankingUsualCashRendering.py index 7d03798beb..e1d8c47ee7 100644 --- a/product/ERP5Banking/tests/testERP5BankingUsualCashRendering.py +++ b/product/ERP5Banking/tests/testERP5BankingUsualCashRendering.py @@ -31,7 +31,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingUsualCashRendering(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingUsualCashRendering(TestERP5BankingMixin): """ This class is a unit test to check the module of Usual Cash Rendering diff --git a/product/ERP5Banking/tests/testERP5BankingUsualCashTransfer.py b/product/ERP5Banking/tests/testERP5BankingUsualCashTransfer.py index 9b36b23999..ecac29d975 100755 --- a/product/ERP5Banking/tests/testERP5BankingUsualCashTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingUsualCashTransfer.py @@ -31,7 +31,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingUsualCashTransfer(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingUsualCashTransfer(TestERP5BankingMixin): """ This class is a unit test to check the module of Usual Cash Transfer diff --git a/product/ERP5Banking/tests/testERP5BankingVaultTransfer.py b/product/ERP5Banking/tests/testERP5BankingVaultTransfer.py index de798e4c42..b7a16245af 100644 --- a/product/ERP5Banking/tests/testERP5BankingVaultTransfer.py +++ b/product/ERP5Banking/tests/testERP5BankingVaultTransfer.py @@ -31,7 +31,6 @@ # import requested python module import os -from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.Sequence import SequenceList from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed from Products.ERP5Banking.tests.TestERP5BankingMixin import TestERP5BankingMixin @@ -46,7 +45,7 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -class TestERP5BankingVaultTransfer(TestERP5BankingMixin, ERP5TypeTestCase): +class TestERP5BankingVaultTransfer(TestERP5BankingMixin): """ This class is a unit test to check the module of Vault Transfer -- 2.30.9