[Erp5-report] r34549 daniele - in /erp5/trunk/products/ERP5: Document/ tests/

[nobody at svn.erp5.org]

Author: daniele
Date: Wed Apr 14 13:33:38 2010
New Revision: 34549

URL: http://svn.erp5.org?rev=34549&view=rev
Log:
Change the methods to new API of id tool

Modified:
    erp5/trunk/products/ERP5/Document/Alarm.py
    erp5/trunk/products/ERP5/Document/BPMBuilder.py
    erp5/trunk/products/ERP5/tests/testAccounting.py
    erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py

Modified: erp5/trunk/products/ERP5/Document/Alarm.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Alarm.py?rev=34549&r1=34548&r2=34549&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Alarm.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Alarm.py [utf8] Wed Apr 14 13:33:38 2010
@@ -303,7 +303,7 @@
         # later when creating an active process for example
         # We do some inspection to keep compatibility
         # (because fixit and tag were not set previously)
-        tag = str(self.portal_ids.generateNewLengthId(id_group=self.getId()))
+        tag = str(self.portal_ids.generateNewId(id_generator='uid', id_group=self.getId()))
         method = getattr(self, method_id)
         func_code = method.func_code
         try:

Modified: erp5/trunk/products/ERP5/Document/BPMBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMBuilder.py?rev=34549&r1=34548&r2=34549&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMBuilder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMBuilder.py [utf8] Wed Apr 14 13:33:38 2010
@@ -136,7 +136,7 @@
     # able to notify the user after all processes are ended
     # Tag is generated from portal_ids so that it can be retrieved
     # later when creating an active process for example
-    tag = str(self.portal_ids.generateNewLengthId(id_group=self.getId()))
+    tag = str(self.portal_ids.generateNewId(id_generator='uid', id_group=self.getId()))
     self.activate(tag=tag).build(tag=tag)
 
     if self.isAlarmNotificationMode():

Modified: erp5/trunk/products/ERP5/tests/testAccounting.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAccounting.py?rev=34549&r1=34548&r2=34549&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAccounting.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testAccounting.py [utf8] Wed Apr 14 13:33:38 2010
@@ -2092,13 +2092,7 @@
   """
   def _resetIdGenerator(self):
     # clear all existing ids in portal ids
-    if hasattr(self.portal.portal_ids, 'dict_ids'):
-      self.portal.portal_ids.dict_ids.clear()
-    if hasattr(self.portal.portal_ids, 'dict_length_ids'):
-      self.portal.portal_ids.dict_length_ids.clear()
-      self.portal.erp5_sql_transactionless_connection.manage_test(
-        """DELETE FROM portal_ids WHERE id_group LIKE '%accounting%'""")
-      self.portal.portal_catalog.getSQLCatalog().z_portal_ids_commit()
+      self.portal.portal_ids.clearGenerator(all=True)
   
   def test_SourceDestinationReference(self):
     # Check that source reference and destination reference are filled

Modified: erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py?rev=34549&r1=34548&r2=34549&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py [utf8] Wed Apr 14 13:33:38 2010
@@ -393,7 +393,7 @@
 
   def afterSetUp(self):
     super(TestAdvancedSaleInvoice, self).afterSetUp()
-    self.portal.portal_ids.setLastGeneratedId(0, id_group='Accounting_Transaction_Module-Sale_Invoice_Transaction')
+    self.portal.portal_ids.clearGenerator(all=True)
 
   def stepCheckInvoicesAndTransactionsConsistency(self, sequence=None, sequence_list=None,
                                                   **kw):