[Erp5-report] r33741 nicolas.dumazet - in /erp5/trunk/products: ERP5/tests/ ERP5Legacy/tests/

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Tue Mar 16 07:55:06 2010
New Revision: 33741

URL: http://svn.erp5.org?rev=33741&view=rev
Log:
fix test(Legacy)?ProductionOrder.test_09_testTransformationWithVariation

I was wrong in r33483: even if we delegate ID generation to XMLMatrix.newCell,
we still need to pass along predicate parameters, and mapped_value_property_list

Modified:
    erp5/trunk/products/ERP5/tests/testProductionOrder.py
    erp5/trunk/products/ERP5Legacy/tests/testLegacyProductionOrder.py

Modified: erp5/trunk/products/ERP5/tests/testProductionOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testProductionOrder.py?rev=33741&r1=33740&r2=33741&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionOrder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testProductionOrder.py [utf8] Tue Mar 16 07:55:06 2010
@@ -312,11 +312,16 @@
     transformation_transformed_resource = sequence.get('transformation_transformed_resource')
 
     for colour in self.colour_list:
+      colour_path = 'colour/%s' % colour
       for size in self.mrp_size_list:
+        size_path = 'size/%s' % size
         transformation_transformed_resource.newCell(
-          'colour/%s' % colour,
-          'size/%s' % size,
+          colour_path,
+          size_path,
+          mapped_value_property_list = ('quantity',),
           quantity = self.colour_size_quantity_dict[colour][size],
+          membership_criterion_base_category= ('size', 'colour', ),
+          membership_criterion_category= (size_path, colour_path,),
           base_id="quantity",
         )
 
@@ -329,11 +334,15 @@
     transformation_transformed_resource = sequence.get('transformation_transformed_resource')
 
     for colour in self.colour_list:
+      colour_path = 'colour/%s' % colour
       for size in self.mrp_size_list:
+        size_path = 'size/%s' % size
         transformation_transformed_resource.newCell(
-          'colour/%s' % colour,
-          'size/%s' % size,
+          colour_path,
+          size_path,
           categories = self.colour_size_variation_dict[colour][size],
+          membership_criterion_base_category= ('size', 'colour', ),
+          membership_criterion_category= (size_path, colour_path,),
           base_id="variation",
         )
 
@@ -345,11 +354,17 @@
     order_line = sequence.get('order_line')
 
     for colour in self.colour_list:
+      colour_path = 'colour/%s' % colour
       for size in self.mrp_size_list:
+        size_path = 'size/%s' % size
         order_line.newCell(
-          'size/%s' % size,
-          'colour/%s' % colour,
+          size_path,
+          colour_path,
+          mapped_value_property_list = ('quantity',),
           quantity = self.order_line_colour_size_quantity_dict[colour][size],
+          categories = [size_path, colour_path],
+          membership_criterion_base_category= ('size', 'colour', ),
+          membership_criterion_category= (size_path, colour_path,),
           base_id='movement',
         )
 

Modified: erp5/trunk/products/ERP5Legacy/tests/testLegacyProductionOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacyProductionOrder.py?rev=33741&r1=33740&r2=33741&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacyProductionOrder.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacyProductionOrder.py [utf8] Tue Mar 16 07:55:06 2010
@@ -313,12 +313,19 @@
     transformation_transformed_resource = sequence.get('transformation_transformed_resource')
 
     for colour in self.colour_list:
+      colour_path = 'colour/%s' % colour
       for size in self.mrp_size_list:
+        size_path = 'size/%s' % size
         quantity = self.colour_size_quantity_dict[colour][size]
-        transformation_transformed_resource.newCell('colour/%s' % colour,
-                                                    'size/%s' % size,
-                                                    quantity=quantity,
-                                                    base_id="quantity")
+        transformation_transformed_resource.newCell(
+            colour_path,
+            size_path,
+            mapped_value_property_list = ('quantity',),
+            quantity=quantity,
+            membership_criterion_base_category= ('size', 'colour', ),
+            membership_criterion_category= (size_path, colour_path,),
+            base_id="quantity",
+        )
 
   def stepSetTransformationTransformedResourceVariationMatrix(self, sequence=None, sequence_list=None,
                                **kw):
@@ -329,12 +336,18 @@
     transformation_transformed_resource = sequence.get('transformation_transformed_resource')
 
     for colour in self.colour_list:
+      colour_path = 'colour/%s' % colour
       for size in self.mrp_size_list:
+        size_path = 'size/%s' % size
         variation_list = self.colour_size_variation_dict[colour][size]
-        transformation_transformed_resource.newCell('colour/%s' % colour,
-                                                    'size/%s' % size,
-                                                    categories = variation_list,
-                                                    base_id="variation")
+        transformation_transformed_resource.newCell(
+            colour_path,
+            size_path,
+            categories = variation_list,
+            membership_criterion_base_category= ('size', 'colour', ),
+            membership_criterion_category= (size_path, colour_path,),
+            base_id="variation",
+        )
 
   def stepSetOrderLineQuantityMatrix(self, sequence=None, sequence_list=None,
                                **kw):
@@ -343,11 +356,17 @@
     """
     order_line = sequence.get('order_line')
     for colour in self.colour_list:
+      colour_path = 'colour/%s' % colour
       for size in self.mrp_size_list:
+        size_path = 'size/%s' % size
         order_line.newCell(
-          'size/%s' % size,
-          'colour/%s' % colour,
+          size_path,
+          colour_path,
+          mapped_value_property_list = ('quantity',),
           quantity = self.order_line_colour_size_quantity_dict[colour][size],
+          categories = [size_path, colour_path],
+          membership_criterion_base_category= ('size', 'colour', ),
+          membership_criterion_category= (size_path, colour_path,),
           base_id='movement',
         )