[Erp5-report] r24961 - in /erp5/trunk/products/ERP5: Document/ tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Dec 22 12:44:45 2008
New Revision: 24961

URL: http://svn.erp5.org?rev=24961&view=rev
Log:
Add tests for getQuantity on Container, Container Line and Container Cell
Fix error on Container.getQuantity

Modified:
    erp5/trunk/products/ERP5/Document/Container.py
    erp5/trunk/products/ERP5/tests/testPackingList.py

Modified: erp5/trunk/products/ERP5/Document/Container.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Container.py?rev=24961&r1=24960&r2=24961&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Container.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Container.py [utf8] Mon Dec 22 12:44:45 2008
@@ -83,7 +83,7 @@
 
     security.declareProtected(Permissions.AccessContentsInformation,
                               'getQuantity')
-    def getQuantity(self):
+    def getQuantity(self, default=1.0):
       """
         Returns 1 because only one container is shipped
       """

Modified: erp5/trunk/products/ERP5/tests/testPackingList.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testPackingList.py?rev=24961&r1=24960&r2=24961&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testPackingList.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testPackingList.py [utf8] Mon Dec 22 12:44:45 2008
@@ -745,6 +745,16 @@
     container_line = sequence.get('container_line')
     container_line.edit(quantity=self.default_quantity-1)
 
+  def stepCheckContainerLineSmallQuantity(self, sequence=None,
+      sequence_list=None, **kw):
+    """
+      Checks that quantity is set correctly on the container_line.
+    """
+    container_line = sequence.get('container_line')
+    self.assertEquals(self.default_quantity - 1, container_line.getQuantity())
+    self.assertEquals(self.default_quantity - 1,
+                      container_line.getTotalQuantity())
+
   def stepSetContainerLineFullQuantity(self,sequence=None, sequence_list=None,
                                        quantity=None,**kw):
     """
@@ -777,6 +787,8 @@
         quantity = line.getQuantity()
         container_line.edit(quantity=quantity)
         container_line.immediateReindexObject()
+        self.assertEquals(quantity, container_line.getQuantity())
+        self.assertEquals(quantity, container_line.getTotalQuantity())
       # with variation
       elif line.hasCellContent():
         vcl = line.getVariationCategoryList()
@@ -796,6 +808,15 @@
                 predicate_category_list=cell_key,
                 variation_category_list=cell_key)
             cell.immediateReindexObject()
+          self.assertEquals(old_cell.getQuantity(), cell.getQuantity())
+          self.assertEquals(old_cell.getTotalQuantity(), cell.getTotalQuantity())
+
+        self.assertEquals(line.getQuantity(), container_line.getQuantity())
+        self.assertEquals(line.getTotalQuantity(), container_line.getTotalQuantity())
+
+    # quantity is 1 on the container itself
+    self.assertEquals(1, container.getQuantity())
+    self.assertEquals(1, container.getTotalQuantity())
 
   def stepCheckPackingListIsNotPacked(self,sequence=None, sequence_list=None, **kw):
     """
@@ -1151,6 +1172,7 @@
                       stepAddPackingListContainer \
                       stepAddPackingListContainerLine \
                       stepSetContainerLineSmallQuantity \
+                      stepCheckContainerLineSmallQuantity \
                       stepCheckPackingListIsNotPacked \
                       stepSetContainerFullQuantity \
                       stepTic \
@@ -1170,6 +1192,7 @@
                       stepAddPackingListContainer \
                       stepAddPackingListContainerLine \
                       stepSetContainerLineSmallQuantity \
+                      stepCheckContainerLineSmallQuantity \
                       stepCheckPackingListIsNotPacked \
                       stepSetContainerFullQuantity \
                       stepTic \
@@ -1336,6 +1359,7 @@
   stepDefineNewPackingListContainer = ignored_step
   stepAddPackingListContainerLine = ignored_step
   stepSetContainerLineSmallQuantity = ignored_step
+  stepCheckContainerLineSmallQuantity = ignored_step
   stepSetContainerLineFullQuantity = ignored_step
   stepSetContainerFullQuantity = ignored_step
   stepCheckPackingListIsNotPacked = ignored_step