[Erp5-report] r40002 jm - in /erp5/trunk/products: ERP5/tests/ ERP5Type/tests/

[nobody at svn.erp5.org]

Author: jm
Date: Sun Nov  7 04:11:29 2010
New Revision: 40002

URL: http://svn.erp5.org?rev=40002&view=rev
Log:
ERP5TypeTestCase: new getRule method

Modified:
    erp5/trunk/products/ERP5/tests/testDivergenceTester.py
    erp5/trunk/products/ERP5/tests/testERP5Commerce.py
    erp5/trunk/products/ERP5/tests/testInventoryAPI.py
    erp5/trunk/products/ERP5/tests/testMRP.py
    erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py

Modified: erp5/trunk/products/ERP5/tests/testDivergenceTester.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testDivergenceTester.py?rev=40002&r1=40001&r2=40002&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testDivergenceTester.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testDivergenceTester.py [utf8] Sun Nov  7 04:11:29 2010
@@ -43,17 +43,15 @@ class TestDivergenceTester(TestPackingLi
   def getTitle(self):
     return "Divergence Tester"
 
-  def getRule(self):
-    rule_reference = 'default_delivering_rule'
-    return self.portal.portal_rules.searchFolder(reference=rule_reference,
-          validation_state="validated", sort_on='version',
-          sort_order='descending')[0].getObject()
+  def getDeliveringRule(self):
+    return self.getRule(reference='default_delivering_rule',
+                        validation_state="validated")
 
   def afterSetUp(self):
     """
     Remove all divergence testers from order_rule.
     """
-    rule = self.getRule()
+    rule = self.getDeliveringRule()
     tester_list = rule.contentValues(
              portal_type=rule.getPortalDivergenceTesterTypeList())
     rule.deleteContent([x.getId() for x in tester_list])
@@ -108,7 +106,7 @@ class TestDivergenceTester(TestPackingLi
     packing_list = sql_result[0].getObject()
     # XXX Hardcoded id
     movement=packing_list['1']
-    rule = self.getRule()
+    rule = self.getDeliveringRule()
     sequence.edit(
         packing_list=packing_list,
         movement=movement,

Modified: erp5/trunk/products/ERP5/tests/testERP5Commerce.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5Commerce.py?rev=40002&r1=40001&r2=40002&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5Commerce.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testERP5Commerce.py [utf8] Sun Nov  7 04:11:29 2010
@@ -110,10 +110,6 @@ class TestCommerce(ERP5TypeTestCase):
             'erp5_commerce',
             'erp5_simulation_test')
 
-  def getRule(self, **kw):
-    return self.portal.portal_rules.searchFolder(
-          sort_on='version', sort_order='descending', **kw)[0].getObject()
-
   def afterSetUp(self):
     uf = self.getPortal().acl_users
     uf._doAddUser('ivan', '', ['Manager'], [])

Modified: erp5/trunk/products/ERP5/tests/testInventoryAPI.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInventoryAPI.py?rev=40002&r1=40001&r2=40002&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInventoryAPI.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInventoryAPI.py [utf8] Sun Nov  7 04:11:29 2010
@@ -185,10 +185,6 @@ class InventoryAPITestCase(ERP5TypeTestC
             'erp5_trade', 'erp5_apparel', 'erp5_project',
             'erp5_simulation_test')
 
-  def getRule(self, **kw):
-    return self.portal.portal_rules.searchFolder(
-          sort_on='version', sort_order='descending', **kw)[0].getObject()
-
   # TODO: move this to a base class {{{
   @reindex
   def _makeOrganisation(self, **kw):

Modified: erp5/trunk/products/ERP5/tests/testMRP.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testMRP.py?rev=40002&r1=40001&r2=40002&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testMRP.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testMRP.py [utf8] Sun Nov  7 04:11:29 2010
@@ -60,10 +60,6 @@ class TestMRPMixin(TestBPMMixin):
       if rule.getValidationState() == 'validated':
         rule.invalidate()
 
-  def getRule(self, **kw):
-    return self.portal.portal_rules.searchFolder(
-          sort_on='version', sort_order='descending', **kw)[0].getObject()
-
   def _createDocument(self, portal_type, **kw):
     module = self.portal.getDefaultModule(
         portal_type=portal_type)

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=40002&r1=40001&r2=40002&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Sun Nov  7 04:11:29 2010
@@ -712,6 +712,10 @@ class ERP5TypeTestCase(ProcessingNodeTes
       # reset aq_dynamic cache
       _aq_reset()
 
+    def getRule(self, **kw):
+      return self.portal.portal_rules.searchFolder(
+          sort_on='version', sort_order='descending', **kw)[0].getObject()
+
     def validateRules(self):
       """
       try to validate all rules in rule_tool.