Changeset 1866 in products for quintagroup.catalogupdater/trunk/quintagroup

Timestamp:

Mar 9, 2010 6:57:27 PM (14 years ago)

Author:

mylan

Message:

#163: Fix dependency from plone.indexer for tests

File:

• quintagroup.catalogupdater/trunk/quintagroup/catalogupdater/tests.py (modified) (4 diffs)

quintagroup.catalogupdater/trunk/quintagroup/catalogupdater/tests.py

@@ -6 +6 @@
 from zope.component import provideAdapter
 
-from plone.indexer.decorator import indexer
-from plone.indexer.interfaces import IIndexableObject
 from Testing import ZopeTestCase as ztc
 
@@ -18 +16 @@
 
 from quintagroup.catalogupdater.utility import ICatalogUpdater
+
+try:
+    from plone.indexer.decorator import indexer
+except ImportError:
+    IS_NEW = False
+    from Products.CMFPlone.CatalogTool import registerIndexableAttribute
+else:
+    IS_NEW = True
+
 
 class TestCase(ptc.PloneTestCase):
@@ -30 +37 @@
 ptc.setupPloneSite()
 
-
 class TestUtility(TestCase):
 
@@ -38 +44 @@
         self.catalog = getToolByName(self.portal, 'portal_catalog')
         self.logout()
-        self.addIndexer()
 
-    def addIndexer(self):
+        if IS_NEW:
+            self.addIndexerNew()
+        else:
+            self.addIndexerOld()
+        self.catalog.addColumn('test_column')
+
+
+    def addIndexerNew(self):
         @indexer(Interface)
         def test_column(obj):
             return obj.id
+        provideAdapter(test_column, name='test_column')
 
-        provideAdapter(test_column, name='test_column')
-        self.catalog.addColumn('test_column')
+
+    def addIndexerOld(self):
+        def test_column(obj, portal, **kwargs):
+            return obj.id
+        registerIndexableAttribute("test_column", test_column)
+
 
     def testSingleColumnUpdate(self):