[Erp5-report] r34551 daniele - in /erp5/trunk/products/ERP5Catalog: ./ tests/

[nobody at svn.erp5.org]

Author: daniele
Date: Wed Apr 14 13:37:12 2010
New Revision: 34551

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

Modified:
    erp5/trunk/products/ERP5Catalog/CatalogTool.py
    erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py

Modified: erp5/trunk/products/ERP5Catalog/CatalogTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/CatalogTool.py?rev=34551&r1=34550&r2=34551&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py [utf8] Wed Apr 14 13:37:12 2010
@@ -643,23 +643,6 @@
 
     __call__ = searchResults
 
-    security.declarePrivate('beforeCatalogClear')
-    def beforeCatalogClear(self):
-      """
-      Clears the catalog by calling a list of methods
-      """
-      id_tool = self.getPortalObject().portal_ids
-      try:
-        id_tool.dumpDictLengthIdsItems()
-      except ConflictError:
-        raise
-      except:
-        # Swallow exceptions to allow catalog clear to happen.
-        # For example, is portal_ids table does not exist and exception will
-        # be thrown by portal_id methods.
-        LOG('ERP5Catalog.beforeCatalogClear', WARNING,
-            'beforeCatalogClear failed', error=sys.exc_info())
-
     security.declarePrivate('unrestrictedSearchResults')
     def unrestrictedSearchResults(self, REQUEST=None, **kw):
         """Calls ZSQLCatalog.searchResults directly without restrictions.

Modified: erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py?rev=34551&r1=34550&r2=34551&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py [utf8] (original)
+++ erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py [utf8] Wed Apr 14 13:37:12 2010
@@ -1973,7 +1973,6 @@
     self.assertTrue("TRUNCATE(catalog.uid,2) = '2567.54'" in sql_src or \
                     'TRUNCATE(`catalog`.`uid`, 2) = 2567.54' in sql_src, sql_src)
 
-  @skip('Regression portal_ids must be delete of catalog')
   def test_56_CreateUidDuringClearCatalog(self, quiet=quiet,run=run_all_test):
     """
       Create a script in the catalog to generate a uid list
@@ -1982,7 +1981,8 @@
     # Add a script to create uid list
     catalog = self.getCatalogTool().getSQLCatalog()
     script_id = 'z0_zCreateUid'
-    script_content = "context.getPortalObject().portal_ids.generateNewLengthIdList(id_group='text_uid')"
+    script_content = "context.getPortalObject().portal_ids.generateNewIdList(id_generator='uid',\
+                                                                             id_group='text_uid')"
     script = createZODBPythonScript(catalog, script_id,
                           '*args,**kw', script_content)
     sql_clear_catalog = list(catalog.sql_clear_catalog)