[Erp5-report] r29451 - /erp5/trunk/products/ERP5/tests/

[nobody at svn.erp5.org]

Author: fabien
Date: Wed Oct  7 16:53:14 2009
New Revision: 29451

URL: http://svn.erp5.org?rev=29451&view=rev
Log:
fix some mistakes :
- indentation pb
- do not create one preference for one test
- enable preference only if it's disable

Modified:
    erp5/trunk/products/ERP5/tests/testInventory.py
    erp5/trunk/products/ERP5/tests/testOrder.py
    erp5/trunk/products/ERP5/tests/testResource.py

Modified: erp5/trunk/products/ERP5/tests/testInventory.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInventory.py?rev=29451&r1=29450&r2=29451&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInventory.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInventory.py [utf8] Wed Oct  7 16:53:14 2009
@@ -76,23 +76,22 @@
     """
     return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_apparel')
 
-    def setUpPreferences(self):
-    portal = self.getPortal()
-    preferences = getToolByName(portal,'portal_preferences')
-
-    system_preference = preferences.newContent(
-      portal_type = 'System Preference'
-    )
-
-    system_preference.edit(
-      preferred_apparel_model_variation_base_category_list = ('colour', 'size', 'morphology', 'industrial_phase',),
-      preferred_apparel_cloth_variation_base_category_list = ('size',),
-      preferred_apparel_component_variation_base_category_list = ('variation',),
-      preferred_apparel_colour_variation_base_category_list = ('colour',),
-      priority = 1,
-    )
-
-    system_preference.enable()
+  def setUpPreferences(self):
+    #create apparel variation preferences
+    portal_preferences = self.getPreferenceTool()
+    preference = getattr(portal_preferences, 'test_site_preference', None)
+    if preference is None:
+      preference = portal_preferences.newContent(portal_type='System Preference',
+                                title='Default Site Preference',
+                                id='test_site_preference')
+      if preference.getPreferenceState() == 'disabled':
+        preference.enable()
+
+    preference.setPreferredApparelModelVariationBaseCategoryList(('colour', 'size', 'morphology', 'industrial_phase',))
+    preference.setPreferredApparelClothVariationBaseCategoryList(('size',))
+    preference.setPreferredApparelComponentVariationBaseCategoryList(('variation',))
+    if preference.getPreferenceState() == 'disabled':
+      preference.enable()
     transaction.commit()
     self.tic()
 

Modified: erp5/trunk/products/ERP5/tests/testOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testOrder.py?rev=29451&r1=29450&r2=29451&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testOrder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testOrder.py [utf8] Wed Oct  7 16:53:14 2009
@@ -68,22 +68,21 @@
     newSecurityManager(None, user)
 
   def setUpPreferences(self):
-    portal = self.getPortal()
-    preferences = getToolByName(portal,'portal_preferences')
-
-    system_preference = preferences.newContent(
-      portal_type = 'System Preference'
-    )
-
-    system_preference.edit(
-      preferred_apparel_model_variation_base_category_list = ('colour', 'size', 'morphology', 'industrial_phase',),
-      preferred_apparel_cloth_variation_base_category_list = ('size',),
-      preferred_apparel_component_variation_base_category_list = ('variation',),
-      preferred_apparel_colour_variation_base_category_list = ('colour',),
-      priority = 1,
-    )
-
-    system_preference.enable()
+    #create apparel variation preferences
+    portal_preferences = self.getPreferenceTool()
+    preference = getattr(portal_preferences, 'test_site_preference', None)
+    if preference is None:
+      preference = portal_preferences.newContent(portal_type='System Preference',
+                                title='Default Site Preference',
+                                id='test_site_preference')
+      if preference.getPreferenceState() == 'disabled':
+        preference.enable()
+
+    preference.setPreferredApparelModelVariationBaseCategoryList(('colour', 'size', 'morphology', 'industrial_phase',))
+    preference.setPreferredApparelClothVariationBaseCategoryList(('size',))
+    preference.setPreferredApparelComponentVariationBaseCategoryList(('variation',))
+    if preference.getPreferenceState() == 'disabled':
+      preference.enable()
     transaction.commit()
     self.tic()
 

Modified: erp5/trunk/products/ERP5/tests/testResource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testResource.py?rev=29451&r1=29450&r2=29451&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testResource.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testResource.py [utf8] Wed Oct  7 16:53:14 2009
@@ -31,7 +31,6 @@
 from Testing import ZopeTestCase
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from AccessControl.SecurityManagement import newSecurityManager
-from Products.CMFCore.utils import getToolByName
 from zLOG import LOG
 from Products.ERP5Type.tests.Sequence import SequenceList
 from DateTime import DateTime
@@ -75,22 +74,21 @@
     newSecurityManager(None, user)
 
   def setUpPreferences(self):
-    portal = self.getPortal()
-    preferences = getToolByName(portal,'portal_preferences')
-
-    system_preference = preferences.newContent(
-      portal_type = 'System Preference'
-    )
-
-    system_preference.edit(
-      preferred_apparel_model_variation_base_category_list = ('colour', 'size', 'morphology', 'industrial_phase',),
-      preferred_apparel_cloth_variation_base_category_list = ('size',),
-      preferred_apparel_component_variation_base_category_list = ('variation',),
-      preferred_apparel_colour_variation_base_category_list = ('colour',),
-      priority = 1,
-    )
-
-    system_preference.enable()
+    #create apparel variation preferences
+    portal_preferences = self.getPreferenceTool()
+    preference = getattr(portal_preferences, 'test_site_preference', None)
+    if preference is None:
+      preference = portal_preferences.newContent(portal_type='System Preference',
+                                title='Default Site Preference',
+                                id='test_site_preference')
+      if preference.getPreferenceState() == 'disabled':
+        preference.enable()
+
+    preference.setPreferredApparelModelVariationBaseCategoryList(('colour', 'size', 'morphology', 'industrial_phase',))
+    preference.setPreferredApparelClothVariationBaseCategoryList(('size',))
+    preference.setPreferredApparelComponentVariationBaseCategoryList(('variation',))
+    if preference.getPreferenceState() == 'disabled':
+      preference.enable()
     transaction.commit()
     self.tic()