[Erp5-report] r41764 jm - in /erp5/trunk/products: ERP5/tests/ ERP5Legacy/tests/

[nobody at svn.erp5.org]

Author: jm
Date: Fri Dec 24 17:35:22 2010
New Revision: 41764

URL: http://svn.erp5.org?rev=41764&view=rev
Log:
Run TestNestedLine with legacy simulation

Added:
    erp5/trunk/products/ERP5Legacy/tests/testLegacyDeliveryBuilderToSupportMultipleLines.py
Modified:
    erp5/trunk/products/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py
    erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationInvoice.py

Modified: erp5/trunk/products/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py?rev=41764&r1=41763&r2=41764&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py [utf8] Fri Dec 24 17:35:22 2010
@@ -33,6 +33,7 @@ from Products.ERP5Type.tests.ERP5TypeTes
 from Products.ERP5Type.tests.Sequence import SequenceList
 from Products.ERP5Type.tests.utils import createZODBPythonScript
 from Products.ERP5.tests.testInvoice import TestSaleInvoiceMixin
+from Products.ERP5.tests.utils import newSimulationExpectedFailure
 
 class TestNestedLineMixin(TestSaleInvoiceMixin):
 
@@ -281,6 +282,7 @@ class TestNestedLine(TestNestedLineMixin
     self.assertEquals(self.new_packing_list_quantity, document.getTotalQuantity())
     self.assertEquals(self.new_packing_list_quantity, line_line.getQuantity())
 
+  @newSimulationExpectedFailure
   def test_03_AcceptingDecision(self, quiet=quiet):
     sequence_list = SequenceList()
     sequence = sequence_list.addSequenceString(self.DEFAULT_SEQUENCE + \
@@ -319,6 +321,7 @@ class TestNestedLine(TestNestedLineMixin
     self.assertEquals(self.new_invoice_quantity, document.getTotalQuantity())
     self.assertEquals(self.new_invoice_quantity, line_line.getQuantity())
 
+  @newSimulationExpectedFailure
   def test_04_MergingMultipleSaleOrders(self, quiet=quiet):
     sequence_list = SequenceList()
     sequence = sequence_list.addSequenceString(self.DEFAULT_SEQUENCE + \

Added: erp5/trunk/products/ERP5Legacy/tests/testLegacyDeliveryBuilderToSupportMultipleLines.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacyDeliveryBuilderToSupportMultipleLines.py?rev=41764&view=auto
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacyDeliveryBuilderToSupportMultipleLines.py (added)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacyDeliveryBuilderToSupportMultipleLines.py [utf8] Fri Dec 24 17:35:22 2010
@@ -0,0 +1,28 @@
+##############################################################################
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly advised to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+##############################################################################
+
+from Products.ERP5Legacy.tests import testLegacySimulationInvoice
+from Products.ERP5.tests.testDeliveryBuilderToSupportMultipleLines import *

Modified: erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationInvoice.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationInvoice.py?rev=41764&r1=41763&r2=41764&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationInvoice.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationInvoice.py [utf8] Fri Dec 24 17:35:22 2010
@@ -30,6 +30,8 @@
   Tests invoice creation from simulation.
 
 """
+import sys
+sys.modules['Products.ERP5.tests.testInvoice'] = sys.modules[__name__]
 
 import transaction
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
@@ -967,6 +969,10 @@ class TestInvoiceMixin(TestPackingListMi
     self._solveDeliveryGroupDivergence(invoice, 'start_date',
                                        invoice.getRelativeUrl())
 
+  def stepAdoptPrevisionQuantityInvoice(self,sequence=None, sequence_list=None):
+    invoice = sequence.get('invoice')
+    self._solveDivergence(invoice, 'quantity', 'adopt')
+
   def stepAcceptDecisionQuantityInvoice(self,sequence=None, sequence_list=None):
     invoice = sequence.get('invoice')
     self._solveDivergence(invoice, 'quantity', 'accept')