[Erp5-report] r28826 - /erp5/trunk/products/ERP5/tests/testTradeReports.py

[nobody at svn.erp5.org]

Author: jm
Date: Fri Sep  4 13:41:57 2009
New Revision: 28826

URL: http://svn.erp5.org?rev=28826&view=rev
Log:
Update testTradeReports

Modified:
    erp5/trunk/products/ERP5/tests/testTradeReports.py

Modified: erp5/trunk/products/ERP5/tests/testTradeReports.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testTradeReports.py?rev=28826&r1=28825&r2=28826&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testTradeReports.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testTradeReports.py [utf8] Fri Sep  4 13:41:57 2009
@@ -720,15 +720,16 @@
     
     # test columns values
     line = data_line_list[0]
-    self.assertEquals(line.column_id_list,
-        ['resource_title', 'resource_reference', 'variation_text', 
-          'inventory', 'quantity_unit'])
-
+    self.assertEqual(line.column_id_list, ['resource_title',
+                                           'resource_reference',
+                                           'variation_category_item_list',
+                                           'inventory',
+                                           'quantity_unit'])
     self.checkLineProperties(
                    data_line_list[0],
                    resource_title='product_A',
                    resource_reference='ref 2',
-                   variation_text='',
+                   variation_category_item_list=[],
                    inventory=11,
                    quantity_unit='G')
 
@@ -749,28 +750,28 @@
                    data_line_list[0],
                    resource_title='product_B',
                    resource_reference='ref 1',
-                   variation_text='',
+                   variation_category_item_list=[],
                    inventory=33,
                    quantity_unit='Kg')
     self.checkLineProperties(
                    data_line_list[1],
                    resource_title='product_A',
                    resource_reference='ref 2',
-                   variation_text='',
+                   variation_category_item_list=[],
                    inventory=22,
                    quantity_unit='G')
     self.checkLineProperties(
                    data_line_list[2],
                    resource_title='variated product',
                    resource_reference='ref 3',
-                   variation_text='colour/colour1',
+                   variation_category_item_list=['colour1'],
                    inventory=66,
                    quantity_unit='')
     self.checkLineProperties(
                    data_line_list[3],
                    resource_title='variated product',
                    resource_reference='ref 3',
-                   variation_text='colour/colour2',
+                   variation_category_item_list=['colour2'],
                    inventory=66,
                    quantity_unit='')
                     
@@ -871,14 +872,14 @@
                    data_line_list[0],
                    resource_title='product_B',
                    resource_reference='ref 1',
-                   variation_text='',
+                   variation_category_item_list=[],
                    inventory=-33,
                    quantity_unit='Kg')
     self.checkLineProperties(
                    data_line_list[1],
                    resource_title='product_A',
                    resource_reference='ref 2',
-                   variation_text='',
+                   variation_category_item_list=[],
                    inventory=0,
                    quantity_unit='G')
     ################################
@@ -901,21 +902,21 @@
                    data_line_list[0],
                    resource_title='product_A',
                    resource_reference='ref 2',
-                   variation_text='',
+                   variation_category_item_list=[],
                    inventory=0,
                    quantity_unit='G')
     self.checkLineProperties(
                    data_line_list[1],
                    resource_title='variated product',
                    resource_reference='ref 3',
-                   variation_text='colour/colour1',
+                   variation_category_item_list=['colour1'],
                    inventory=66,
                    quantity_unit='')
     self.checkLineProperties(
                    data_line_list[2],
                    resource_title='variated product',
                    resource_reference='ref 3',
-                   variation_text='colour/colour2',
+                   variation_category_item_list=['colour2'],
                    inventory=66,
                    quantity_unit='')
     ################################
@@ -938,21 +939,21 @@
                    data_line_list[0],
                    resource_title='product_B',
                    resource_reference='ref 1',
-                   variation_text='',
+                   variation_category_item_list=[],
                    inventory=-33,
                    quantity_unit='Kg')
     self.checkLineProperties(
                    data_line_list[1],
                    resource_title='variated product',
                    resource_reference='ref 3',
-                   variation_text='colour/colour1',
+                   variation_category_item_list=['colour1'],
                    inventory=66,
                    quantity_unit='')
     self.checkLineProperties(
                    data_line_list[2],
                    resource_title='variated product',
                    resource_reference='ref 3',
-                   variation_text='colour/colour2',
+                   variation_category_item_list=['colour2'],
                    inventory=66,
                    quantity_unit='')
     
@@ -978,7 +979,7 @@
                    data_line_list[0],
                    resource_title='product_A',
                    resource_reference='ref 2',
-                   variation_text='',
+                   variation_category_item_list=[],
                    inventory=0,
                    quantity_unit='G')
     ########################################
@@ -1001,7 +1002,7 @@
                    data_line_list[0],
                    resource_title='product_B',
                    resource_reference='ref 1',
-                   variation_text='',
+                   variation_category_item_list=[],
                    inventory=-33,
                    quantity_unit='Kg')
     ########################################
@@ -1024,14 +1025,14 @@
                    data_line_list[0],
                    resource_title='variated product',
                    resource_reference='ref 3',
-                   variation_text='colour/colour1',
+                   variation_category_item_list=['colour1'],
                    inventory=66,
                    quantity_unit='')
     self.checkLineProperties(
                    data_line_list[1],
                    resource_title='variated product',
                    resource_reference='ref 3',
-                   variation_text='colour/colour2',
+                   variation_category_item_list=['colour2'],
                    inventory=66,
                    quantity_unit='')
     ################################################