[Erp5-report] r31018 fabien - in /erp5/trunk/products/ERP5/tests: testOrder.py testResource.py

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Dec  3 11:51:35 2009
New Revision: 31018

URL: http://svn.erp5.org?rev=31018&view=rev
Log:
apply r30943 to testOrder.py, change the order between colour and morphology
(order is important at cell creation step)

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

Modified: erp5/trunk/products/ERP5/tests/testOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testOrder.py?rev=31018&r1=31017&r2=31018&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testOrder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testOrder.py [utf8] Thu Dec  3 11:51:35 2009
@@ -79,9 +79,11 @@
       if preference.getPreferenceState() == 'disabled':
         preference.enable()
 
-    preference.setPreferredApparelModelVariationBaseCategoryList(('colour', 'size', 'morphology', 'industrial_phase',))
+    preference.setPreferredApparelModelVariationBaseCategoryList(('size', 'industrial_phase',))
     preference.setPreferredApparelClothVariationBaseCategoryList(('size',))
     preference.setPreferredApparelComponentVariationBaseCategoryList(('variation',))
+    preference.setPreferredApparelModelIndividualVariationBaseCategoryList(('colour', 'morphology'))
+
     if preference.getPreferenceState() == 'disabled':
       preference.enable()
     transaction.commit()

Modified: erp5/trunk/products/ERP5/tests/testResource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testResource.py?rev=31018&r1=31017&r2=31018&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testResource.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testResource.py [utf8] Thu Dec  3 11:51:35 2009
@@ -53,8 +53,8 @@
   purchase_supply_line_portal_type = 'Purchase Supply Line'
   internal_supply_line_portal_type = 'Internal Supply Line'
   sale_supply_cell_portal_type = 'Sale Supply Cell'
-  variation_base_category_list = ['colour', 'size', 'morphology',
-                                  'industrial_phase']
+  variation_base_category_list = ['size', 'industrial_phase', 'colour',
+                                  'morphology']
   size_list = ['size/Child','size/Man']
   variation_property_list = []
 
@@ -88,7 +88,7 @@
     preference.setPreferredApparelModelVariationBaseCategoryList(('size', 'industrial_phase',))
     preference.setPreferredApparelClothVariationBaseCategoryList(('size',))
     preference.setPreferredApparelComponentVariationBaseCategoryList(('variation',))
-    preference.setPreferredApparelModelIndividualVariationBaseCategoryList(('morphology', 'colour',))
+    preference.setPreferredApparelModelIndividualVariationBaseCategoryList(('colour', 'morphology'))
     if preference.getPreferenceState() == 'disabled':
       preference.enable()
     transaction.commit()