Changeset 1879 in products

Timestamp:

Mar 10, 2010 9:03:52 PM (14 years ago)

Author:

mylan

Message:

#161: Fix breakage for plone <3.3 version in canonical url tests, some clarification

File:

• quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/testCanonicalURL.py (modified) (4 diffs)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/testCanonicalURL.py

@@ -3 +3 @@
 from zope.component import provideAdapter
 from plone.indexer.decorator import indexer
+
+try:
+    from plone.indexer.decorator import indexer
+except ImportError:
+    IS_NEW = False
+    from Products.CMFPlone.CatalogTool import registerIndexableAttribute
+else:
+    IS_NEW = True
 
 from Products.CMFCore.interfaces import IContentish
@@ -14 +22 @@
 
     def afterSetUp(self):
-        self.basic_auth = 'portal_manager:secret'
-        uf = self.app.acl_users
-        uf.userFolderAddUser('portal_manager', 'secret', ['Manager'], [])
-        user = uf.getUserById('portal_manager')
-        if not hasattr(user, 'aq_base'):
-            user = user.__of__(uf)
-        newSecurityManager(None, user)
-
+        self.basic_auth = ':'.join((portal_owner,default_password))
+        self.loginAsPortalOwner()
+        # Preparation for functional testing
         self.portal.invokeFactory('Document', id='mydoc')
         self.mydoc = self.portal['mydoc']
@@ -96 +99 @@
 
 
-    def addCanonicalPathCatalogColumn(self):
+    def addIndexerOld(self):
+        def canonical_path(obj, **kwargs):
+            """Return canonical_path property for the object.
+            """
+            cpath = queryAdapter(obj, interface=ISEOCanonicalPath)
+            if cpath:
+                return cpath.canonical_path()
+            return None
+        registerIndexableAttribute("canonical_path", test_column)
 
+    def addIndexerNew(self):
         @indexer(IContentish)
         def canonical_path(obj, **kwargs):
@@ -108 +120 @@
 
         provideAdapter(canonical_path, name='canonical_path')
-        catalog = getToolByName(self.portal, 'portal_catalog')
-        catalog.addColumn(name='canonical_path')
-
 
     def testCatalogUpdated(self):
         purl = getToolByName(self.portal, 'portal_url')
         catalog = getToolByName(self.portal, 'portal_catalog')
-        self.addCanonicalPathCatalogColumn()
+        if IS_NEW:
+            self.addIndexerNew()
+        else:
+            self.addIndexerOld()
+        catalog.addColumn('canonical_path')
 
         canonical = queryAdapter(self.mydoc, ISEOCanonicalPath)