[Erp5-report] r14964 - in /erp5/trunk/products/ERP5: Document/ tests/

[nobody at svn.erp5.org]

Author: aurel
Date: Tue Jun 26 11:23:58 2007
New Revision: 14964

URL: http://svn.erp5.org?rev=14964&view=rev
Log:
test method on predicate now take the predicate as parameter

Modified:
    erp5/trunk/products/ERP5/Document/Predicate.py
    erp5/trunk/products/ERP5/tests/testPredicate.py

Modified: erp5/trunk/products/ERP5/Document/Predicate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Predicate.py?rev=14964&r1=14963&r2=14964&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Predicate.py (original)
+++ erp5/trunk/products/ERP5/Document/Predicate.py Tue Jun 26 11:23:58 2007
@@ -162,7 +162,7 @@
       for test_method_id in test_method_id_list :
         if (test_method_id is not None) and result:
           method = getattr(context,test_method_id)
-          result = result and method()
+          result = result and method(self)
 #        LOG('predicate test', 0,
 #            '%s after method %s ' % (result, test_method_id))
     return result

Modified: erp5/trunk/products/ERP5/tests/testPredicate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testPredicate.py?rev=14964&r1=14963&r2=14964&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testPredicate.py (original)
+++ erp5/trunk/products/ERP5/tests/testPredicate.py Tue Jun 26 11:23:58 2007
@@ -130,13 +130,13 @@
   def stepCreatePredicateTrueScript(self, sequence=None, **kw) :
     """Creates a script that always return true"""
     createZODBPythonScript(self.getPortal().portal_skins.erp5_base,
-                           'Predicate_true', '', """return 1""")
+                           'Predicate_true', 'predicate', """return 1""")
     sequence.edit(test_method_id = 'Predicate_true')
   
   def stepCreatePredicateFalseScript(self, sequence=None, **kw) :
     """Creates a script that always return false"""
     createZODBPythonScript(self.getPortal().portal_skins.erp5_base,
-                           'Predicate_false', '', """return 0""")
+                           'Predicate_false', 'predicate', """return 0""")
     sequence.edit(test_method_id = 'Predicate_false')
     
   def stepCreateTestMethodIdPredicate(self, sequence=None, **kw) :
@@ -330,11 +330,11 @@
   def test_TestMethodId(self):
     doc = self.createDocument(region='europe/western_europe/france',)
     calls = []
-    def true_method():
+    def true_method(predicate):
       calls.append(True)
       return True
     doc.true_method = true_method
-    def false_method():
+    def false_method(predicate):
       calls.append(False)
       return False
     doc.false_method = false_method