[Erp5-report] r39998 jm - /erp5/trunk/products/ERP5/tests/

[nobody at svn.erp5.org]

Author: jm
Date: Sun Nov  7 04:10:32 2010
New Revision: 39998

URL: http://svn.erp5.org?rev=39998&view=rev
Log:
Update testDeliveryBuilderToSupportMultipleLines WRT changes in TestPackingListMixin._solveDivergence

Modified:
    erp5/trunk/products/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py
    erp5/trunk/products/ERP5/tests/testInvoice.py

Modified: erp5/trunk/products/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py?rev=39998&r1=39997&r2=39998&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py [utf8] Sun Nov  7 04:10:32 2010
@@ -200,21 +200,17 @@ return context.getPortalObject().portal_
     delivery_builder = getattr(self.portal.portal_deliveries, self.delivery_builder_id)
     delivery_builder.delivery_cell_separate_order = ('calculateAddQuantity',)
 
-  def stepAdoptPrevisionPackingListQuantity(self,sequence=None, sequence_list=None):
-    document = sequence.get('packing_list')
-    self._solveDivergence(document, 'quantity', 'adopt')
-
-  def stepAcceptDecisionPackingListQuantity(self,sequence=None, sequence_list=None):
-    document = sequence.get('packing_list')
-    self._solveDivergence(document, 'quantity', 'accept')
+  stepAdoptPrevisionPackingListQuantity = \
+    TestSaleInvoiceMixin.stepAdoptPrevisionQuantity
 
-  def stepAdoptPrevisionInvoiceQuantity(self,sequence=None, sequence_list=None):
-    document = sequence.get('invoice')
-    self._solveDivergence(document, 'quantity', 'adopt')
+  stepAcceptDecisionPackingListQuantity = \
+    TestSaleInvoiceMixin.stepAcceptDecisionQuantity
 
-  def stepAcceptDecisionInvoiceQuantity(self,sequence=None, sequence_list=None):
-    document = sequence.get('invoice')
-    self._solveDivergence(document, 'quantity', 'accept')
+  stepAdoptPrevisionInvoiceQuantity = \
+    TestSaleInvoiceMixin.stepAdoptPrevisionQuantityInvoice
+
+  stepAcceptDecisionInvoiceQuantity = \
+    TestSaleInvoiceMixin.stepAcceptDecisionQuantityInvoice
 
 
 class TestNestedLine(TestNestedLineMixin, ERP5TypeTestCase):

Modified: erp5/trunk/products/ERP5/tests/testInvoice.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInvoice.py?rev=39998&r1=39997&r2=39998&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] Sun Nov  7 04:10:32 2010
@@ -938,6 +938,11 @@ class TestInvoiceMixin(TestPackingListMi
     self._solveDivergence(invoice, 'start_date', 'Unify Solver',
                           value=invoice.getStartDate())
 
+  def stepAdoptPrevisionQuantityInvoice(self,sequence=None, sequence_list=None):
+    invoice = sequence.get('invoice')
+    self.portal.pdb()
+    self._solveDivergence(invoice, 'quantity', 'Adopt Solver')
+
   def stepAcceptDecisionQuantityInvoice(self,sequence=None, sequence_list=None):
     invoice = sequence.get('invoice')
     self._solveDivergence(invoice, 'quantity', 'Accept Solver')