Commit 2b031892 authored by Jérome Perrin's avatar Jérome Perrin

Test all methods if multiple ones are defined

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6325 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8aa4bc4f
...@@ -156,16 +156,18 @@ class Predicate(Folder): ...@@ -156,16 +156,18 @@ class Predicate(Folder):
# LOG('predicate test', 0, # LOG('predicate test', 0,
# '%s after category %s ' % (result, tested_base_category.items())) # '%s after category %s ' % (result, tested_base_category.items()))
# Test method calls # Test method calls
test_method_id = self.getTestMethodId() test_method_id_list = self.getTestMethodIdList()
if (test_method_id is not None) and result: if test_method_id_list is not None :
method = getattr(context,test_method_id) for test_method_id in test_method_id_list :
result = result and method() if (test_method_id is not None) and result:
# LOG('predicate test', 0, method = getattr(context,test_method_id)
# '%s after method %s ' % (result, test_method_id)) result = result and method()
# XXX Add here additional method calls # LOG('predicate test', 0,
# '%s after method %s ' % (result, test_method_id))
return result return result
security.declareProtected( Permissions.AccessContentsInformation, 'buildSqlQuery' ) security.declareProtected( Permissions.AccessContentsInformation,
'buildSqlQuery' )
def buildSqlQuery(self, strict_membership=0, table='category', def buildSqlQuery(self, strict_membership=0, table='category',
join_table='catalog', join_column='uid'): join_table='catalog', join_column='uid'):
""" """
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment