[Erp5-report] r36817 gregory - /erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py

[nobody at svn.erp5.org]

Author: gregory
Date: Fri Jul  2 17:28:20 2010
New Revision: 36817

URL: http://svn.erp5.org?rev=36817&view=rev
Log:
Update ERP5Banking tests after r36763.

Modified:
    erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py

Modified: erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py?rev=36817&r1=36816&r2=36817&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py [utf8] (original)
+++ erp5/trunk/products/ERP5Banking/tests/TestERP5BankingMixin.py [utf8] Fri Jul  2 17:28:20 2010
@@ -899,27 +899,31 @@ class TestERP5BankingMixin(ERP5TypeTestC
     """
     if date is None:
       date = DateTime().Date()
-    return self.checkbook_module.newContent(id = id,
-                                            portal_type = 'Checkbook',
-                                            destination_value = vault,
-                                            destination_payment_value = bank_account,
-                                            reference_range_min = min,
-                                            reference_range_max = max,
-                                            start_date = date)
+    return self.checkbook_module.newContent(
+        id=id,
+        portal_type='Checkbook',
+        destination_value=vault,
+        destination_payment_value=bank_account,
+        reference_range_min=min,
+        reference_range_max=max,
+        start_date=date,
+    )
 
-  def createCheckbookModel(self, id, check_model, reference=None, version=1):
+  def createCheckbookModel(self, id, check_model, reference=None,
+          unique_per_reference=True):
     """
     Create a checkbook for the given bank account
     with 3 variations
     """
-    unique_per_account = version == 1
-    model =  self.checkbook_model_module.newContent(id = id,
-                                            portal_type = 'Checkbook Model',
-                                            title='Generic',
-                                            account_number_enabled=True,
-                                            unique_per_account=unique_per_account,
-                                            reference=reference,
-                                            composition=check_model.getRelativeUrl())
+    model =  self.checkbook_model_module.newContent(
+        id=id,
+        portal_type='Checkbook Model',
+        title='Generic',
+        account_number_enabled=True,
+        reference=reference,
+        composition=check_model.getRelativeUrl(),
+        unique_per_reference=unique_per_reference,
+    )
     model.newContent(id='variant_1', portal_type='Checkbook Model Check Amount Variation',
                      quantity=50, title='50')
     model.newContent(id='variant_2', portal_type='Checkbook Model Check Amount Variation',
@@ -929,18 +933,18 @@ class TestERP5BankingMixin(ERP5TypeTestC
     return model
 
 
-  def createCheckModel(self, id, reference='CCOP', version=1):
+  def createCheckModel(self, id, reference='CCOP', **kw):
     """
     Create a checkbook for the given bank account
     """
-    unique_per_account = version == 1
-    return self.checkbook_model_module.newContent(id = id,
-                                            portal_type = 'Check Model',
-                                            title = 'Check',
-                                            reference = reference,
-                                            account_number_enabled=True,
-                                            unique_per_account=unique_per_account
-                                            )
+    return self.checkbook_model_module.newContent(
+        id=id,
+        portal_type='Check Model',
+        title='Check',
+        reference=reference,
+        account_number_enabled=True,
+        unique_per_reference=True,
+    )
 
   def createCheckAndCheckbookModel(self):
     """
@@ -951,13 +955,13 @@ class TestERP5BankingMixin(ERP5TypeTestC
     self.check_model_2 = self.createCheckModel(id='check_model_2', reference='CCCO')
     self.check_model_1_2 = self.createCheckModel(
         id='check_model_1_2',
-        reference='CCOP2',
-        version=2,
+        reference='CCOP',
+        unique_per_reference=False,
     )
     self.check_model_2_2 = self.createCheckModel(
         id='check_model_2_2',
-        reference='CCCO2',
-        version=2,
+        reference='CCCO',
+        unique_per_reference=False,
     )
     self.checkbook_model = self.createCheckbookModel(
            id='checkbook_model', check_model=self.check_model)
@@ -967,12 +971,12 @@ class TestERP5BankingMixin(ERP5TypeTestC
     self.checkbook_model_1_2 = self.createCheckbookModel(
            id='checkbook_model_1_2',
            check_model=self.check_model_1_2,
-           version=2,
+           unique_per_reference=False,
     )
     self.checkbook_model_2_2 = self.createCheckbookModel(
            id='checkbook_model_2_2',
            check_model=self.check_model_2_2,
-           version=2,
+           unique_per_reference=False,
     )
 
   def createCheck(self, id, reference, checkbook, bank_account=None,