[Erp5-report] r28595 - /erp5/trunk/products/ERP5/tests/testInvoice.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Aug 24 15:09:11 2009
New Revision: 28595

URL: http://svn.erp5.org?rev=28595&view=rev
Log:
use rule_reference instead of rule_id

Modified:
    erp5/trunk/products/ERP5/tests/testInvoice.py

Modified: erp5/trunk/products/ERP5/tests/testInvoice.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInvoice.py?rev=28595&r1=28594&r2=28595&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] Mon Aug 24 15:09:11 2009
@@ -2136,10 +2136,10 @@
     invoice.edit()
 
     # call updateAppliedRule directly, don't rely on edit interactions
-    rule_id = 'default_invoice_rule'
-    self.failUnless(rule_id in
-                    self.getPortal().portal_rules.objectIds())
-    invoice.updateAppliedRule(rule_id=rule_id)
+    rule_reference = 'default_invoice_rule'
+    self.assertNotEquals(0,
+        len(self.portal.portal_rules.searchFolder(reference=rule_reference)))
+    invoice.updateAppliedRule(rule_reference=rule_reference)
 
   def stepCheckInvoiceRuleNotAppliedOnInvoiceEdit(self,
                     sequence=None, sequence_list=None, **kw):
@@ -2159,10 +2159,10 @@
     packing_list.edit()
 
     # call updateAppliedRule directly, don't rely on edit interactions
-    rule_id = 'default_delivery_rule'
-    self.failUnless(rule_id in
-                    self.getPortal().portal_rules.objectIds())
-    packing_list.updateAppliedRule(rule_id=rule_id)
+    rule_reference = 'default_delivery_rule'
+    self.assertNotEquals(0,
+        len(self.portal.portal_rules.searchFolder(reference=rule_reference)))
+    packing_list.updateAppliedRule(rule_reference=rule_reference)
 
   def stepCheckDeliveryRuleNotAppliedOnPackingListEdit(self,
                     sequence=None, sequence_list=None, **kw):