[Erp5-report] r28795 - in /erp5/trunk/products/ERP5/tests: testBPMCore.py testPayroll.py

[nobody at svn.erp5.org]

Author: luke
Date: Thu Sep  3 17:09:39 2009
New Revision: 28795

URL: http://svn.erp5.org?rev=28795&view=rev
Log:
 - there is no need to set system preferences for BPM enabled system

Modified:
    erp5/trunk/products/ERP5/tests/testBPMCore.py
    erp5/trunk/products/ERP5/tests/testPayroll.py

Modified: erp5/trunk/products/ERP5/tests/testBPMCore.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testBPMCore.py?rev=28795&r1=28794&r2=28795&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testBPMCore.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testBPMCore.py [utf8] Thu Sep  3 17:09:39 2009
@@ -104,30 +104,6 @@
     applied_rule = self.portal.portal_simulation.newContent(
         portal_type='Applied Rule')
     return applied_rule.newContent(portal_type='Simulation Movement')
-
-  @reindex
-  def setSystemPreference(self):
-    preference_tool = getToolByName(self.portal, 'portal_preferences')
-    system_preference_list = preference_tool.contentValues(
-        portal_type='System Preference')
-    if len(system_preference_list) > 1:
-      raise AttributeError('More than one System Preference, cannot test')
-    if len(system_preference_list) == 0:
-      system_preference = preference_tool.newContent(
-          portal_type='System Preference')
-    else:
-      system_preference = system_preference_list[0]
-    system_preference.edit(
-      preferred_invoicing_resource_use_category_list = \
-          self.invoicing_resource_use_category_list,
-      preferred_normal_resource_use_category_list = \
-          self.normal_resource_use_category_list,
-      priority = 1,
-
-    )
-
-    if system_preference.getPreferenceState() == 'disabled':
-      system_preference.enable()
 
   @reindex
   def createAndValidateAccount(self, account_id, account_type):
@@ -229,7 +205,6 @@
 
   def afterSetUp(self):
     self.createCategories()
-    self.setSystemPreference()
     self.createInvoiceTransactionRule()
     self.stepTic()
 

Modified: erp5/trunk/products/ERP5/tests/testPayroll.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testPayroll.py?rev=28795&r1=28794&r2=28795&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testPayroll.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testPayroll.py [utf8] Thu Sep  3 17:09:39 2009
@@ -35,9 +35,6 @@
 import transaction
 
 class TestPayrollMixin(ERP5ReportTestCase, TestTradeModelLineMixin):
-  normal_resource_use_category_list = ['payroll/base_salary']
-  invoicing_resource_use_category_list = ['payroll/tax']
-
   BUSINESS_PATH_CREATION_SEQUENCE_STRING = """
                CreateBusinessProcess
                CreateBusinessPath
@@ -68,7 +65,6 @@
   def afterSetUp(self):
     """Prepare the test."""
     self.createCategories()
-    self.setSystemPreference()
 
   @reindex
   def beforeTearDown(self):
@@ -90,30 +86,6 @@
                                'Associate', 'Auditor', 'Author'], [])
     user = uf.getUserById('admin').__of__(uf)
     newSecurityManager(None, user)
-
-  @reindex
-  def setSystemPreference(self):
-    preference_tool = getToolByName(self.portal, 'portal_preferences')
-    system_preference_list = preference_tool.contentValues(
-        portal_type='System Preference')
-    if len(system_preference_list) > 1:
-      raise AttributeError('More than one System Preference, cannot test')
-    if len(system_preference_list) == 0:
-      system_preference = preference_tool.newContent(
-          portal_type='System Preference')
-    else:
-      system_preference = system_preference_list[0]
-    system_preference.edit(
-      preferred_invoicing_resource_use_category_list = \
-          self.invoicing_resource_use_category_list,
-      preferred_normal_resource_use_category_list = \
-          self.normal_resource_use_category_list,
-      preferred_payroll_resource_use_category_list = \
-          ['use/payroll'],
-      priority = 1,
-    )
-    if system_preference.getPreferenceState() == 'disabled':
-      system_preference.enable()
 
   @reindex
   def createCategories(self):