[Erp5-report] r32349 jm - in /erp5/trunk/products/ERP5Catalog: ./ tests/

[nobody at svn.erp5.org]

Author: jm
Date: Tue Feb  9 10:58:54 2010
New Revision: 32349

URL: http://svn.erp5.org?rev=32349&view=rev
Log:
Fix TestERP5Catalog.test_IndexationContextIndependence

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=32349&r1=32348&r2=32349&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py [utf8] Tue Feb  9 10:58:54 2010
@@ -820,7 +820,7 @@
       Construct a dictionnary with a list of properties
       to catalog into the table predicate
       """
-      if not getattr(object,'isPredicate',None):
+      if not object.providesIPredicate():
         return None
       object = object.asPredicate()
       if object is None:

Modified: erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py?rev=32349&r1=32348&r2=32349&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py [utf8] (original)
+++ erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py [utf8] Tue Feb  9 10:58:54 2010
@@ -53,12 +53,11 @@
 from OFS.ObjectManager import ObjectManager
 from random import randint
 
-dummy_callable = lambda: 0
-
 class IndexableDocument(ObjectManager):
 
   # this property is required for dummy providesIMovement
   __allow_access_to_unprotected_subobjects__ = 1
+  isRADContent = 0
 
   def getUid(self):
     uid = getattr(self, 'uid', None)
@@ -68,10 +67,9 @@
 
   def __getattr__(self, name):
     # Case for all "is..." magic properties (isMovement, ...)
-    if name.startswith('is'):
-      return 0
-    if name.startswith('provides'):
-      return dummy_callable
+    if name.startswith('is') or \
+       name.startswith('provides'):
+      return lambda: 0
     raise AttributeError, name
 
   def getPath(self):