[Erp5-report] r36247 vincent - /erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Jun 10 19:38:28 2010
New Revision: 36247

URL: http://svn.erp5.org?rev=36247&view=rev
Log:
Cleanup: There is no need to rename new catalog.

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

Modified: erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py?rev=36247&r1=36246&r2=36247&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py [utf8] (original)
+++ erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py [utf8] Thu Jun 10 19:38:28 2010
@@ -1692,14 +1692,11 @@ class TestERP5Catalog(ERP5TypeTestCase, 
 
     # Create new catalog
     portal_catalog = self.getCatalogTool()
-    original_catalog_id = 'erp5_mysql_innodb'
-    self.new_catalog_id = self.original_catalog_id + '2'
-    cp_data = portal_catalog.manage_copyObjects(ids=('erp5_mysql_innodb',))
-    new_id = portal_catalog.manage_pasteObjects(cp_data)[0]['new_id']
-    portal_catalog.manage_renameObject(id=new_id, new_id=self.new_catalog_id)
-
-    # Parse all methods in the new catalog in order to change the connector
-    new_catalog = portal_catalog[self.new_catalog_id]
+    original_catalog = portal_catalog.getSQLCatalog()
+    original_catalog_id = original_catalog.getId()
+    cp_data = portal_catalog.manage_copyObjects(ids=(original_catalog_id,))
+    new_catalog_id = portal_catalog.manage_pasteObjects(cp_data)[0]['new_id']
+    new_catalog = portal_catalog[new_catalog_id]
 
     # Add new searchable table in new catalog
     create_dummy_table_sql = """