[Erp5-report] r31392 kazuhiko - /erp5/trunk/products/ERP5/tests/testERP5Simulation.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Dec 18 14:27:33 2009
New Revision: 31392

URL: http://svn.erp5.org?rev=31392&view=rev
Log:
reuse already existing rule.

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

Modified: erp5/trunk/products/ERP5/tests/testERP5Simulation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5Simulation.py?rev=31392&r1=31391&r2=31392&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5Simulation.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testERP5Simulation.py [utf8] Fri Dec 18 14:27:33 2009
@@ -43,12 +43,20 @@
     TestPackingListMixin.afterSetUp(self, quiet, run)
     self.validateNewRules()
 
+  def beforeTearDown(self):
+    portal_rules = self.portal.portal_rules
+    for rule in portal_rules.objectValues(portal_type='New Order Rule'):
+      if rule.getValidationState() == 'validated':
+        rule.invalidate()
+
   def validateNewRules(self):
-    portal_types = self.portal.portal_types
-
     # create a New Order Rule document.
     portal_rules = self.portal.portal_rules
-    if portal_rules._getOb('new_order_rule', None) is None:
+    try:
+      new_order_rule = filter(
+        lambda x:x.title == 'New Default Order Rule',
+        portal_rules.objectValues(portal_type='New Order Rule'))[0]
+    except IndexError:
       new_order_rule = portal_rules.newContent(
         title='New Default Order Rule',
         portal_type='New Order Rule',
@@ -113,6 +121,7 @@
           tested_property=i,
           use_delivery_ratio=1,
           quantity=0)
+    if new_order_rule.getValidationState() != 'validated':
       new_order_rule.validate()
 
 class TestERP5Simulation(TestERP5SimulationMixin, TestPackingList):