Author: luke
Date: Tue Jul 27 16:37:17 2010
New Revision: 37291
URL: http://svn.erp5.org?rev=37291&view=rev
Log:
- factoring: use SubcontentReindexingWrapper
Modified:
erp5/trunk/products/ERP5/tests/testOrder.py
Modified: erp5/trunk/products/ERP5/tests/testOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testOrder.py?rev=37291&r1=37290&r2=37291&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testOrder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testOrder.py [utf8] Tue Jul 27 16:37:17 2010
@@ -33,25 +33,15 @@ import os
import transaction
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from Products.ERP5Type.tests.utils import FileUpload
+from Products.ERP5Type.tests.utils import FileUpload,\
+ SubcontentReindexingWrapper
from AccessControl.SecurityManagement import newSecurityManager
from DateTime import DateTime
from zLOG import LOG
from Products.ERP5Type.tests.Sequence import SequenceList
from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type.Globals import PersistentMapping
-from Products.ZSQLCatalog.SQLCatalog import Catalog
-def catalogObjectListWrapper(self, object_list, method_id_list=None,
- disable_cache=0, check_uid=1, idxs=None):
- """Wrapper to mark inside of portal object list of catalogged objects"""
- import transaction
- portal = self.getPortalObject()
- for q in object_list:
- portal.catalogged_object_path_dict[q.getPath()] = 1
- transaction.commit()
-
-class TestOrderMixin:
+class TestOrderMixin(SubcontentReindexingWrapper):
default_quantity = 99
default_price = 555
@@ -80,40 +70,6 @@ class TestOrderMixin:
user = uf.getUserById('rc').__of__(uf)
newSecurityManager(None, user)
- def wrap_catalogObjectList(self):
- self.original_catalogObjectList = Catalog.catalogObjectList
- Catalog.catalogObjectList = catalogObjectListWrapper
-
- def unwrap_catalogObjectList(self):
- Catalog.catalogObjectList = self.original_catalogObjectList
-
- def _testSubContentReindexing(self, parent_document, children_document_list):
- """Helper method which shall be called *before* tic or commit"""
- self.portal.catalogged_object_path_dict = PersistentMapping()
- transaction.commit()
- expected_path_list = [q.getPath() for q in children_document_list +
- [parent_document]]
- try:
- # wrap call to catalogObjectList
- self.wrap_catalogObjectList()
- self.stepTic()
- self.assertSameSet(
- self.portal.catalogged_object_path_dict.keys(),
- expected_path_list
- )
- # do real assertions
- self.portal.catalogged_object_path_dict = PersistentMapping()
- transaction.commit()
- parent_document.reindexObject()
- self.stepTic()
- self.assertSameSet(
- self.portal.catalogged_object_path_dict.keys(),
- expected_path_list
- )
- finally:
- # unwrap catalogObjectList
- self.unwrap_catalogObjectList()
-
def setUpPreferences(self):
#create apparel variation preferences
portal_preferences = self.getPreferenceTool()