From 6207aed9fcbe6efb541c1047f962a6916afa2059 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Fri, 24 Dec 2010 16:35:22 +0000
Subject: [PATCH] Run TestNestedLine with legacy simulation
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41764 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
...stDeliveryBuilderToSupportMultipleLines.py | 3 ++
...cyDeliveryBuilderToSupportMultipleLines.py | 28 +++++++++++++++++++
.../tests/testLegacySimulationInvoice.py | 6 ++++
3 files changed, 37 insertions(+)
create mode 100644 product/ERP5Legacy/tests/testLegacyDeliveryBuilderToSupportMultipleLines.py
diff --git a/product/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py b/product/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py
index c4386baee7..89a67a8d34 100644
--- a/product/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py
+++ b/product/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py
@@ -33,6 +33,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
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, ERP5TypeTestCase):
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, ERP5TypeTestCase):
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 + \
diff --git a/product/ERP5Legacy/tests/testLegacyDeliveryBuilderToSupportMultipleLines.py b/product/ERP5Legacy/tests/testLegacyDeliveryBuilderToSupportMultipleLines.py
new file mode 100644
index 0000000000..d57cc38fbd
--- /dev/null
+++ b/product/ERP5Legacy/tests/testLegacyDeliveryBuilderToSupportMultipleLines.py
@@ -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 *
diff --git a/product/ERP5Legacy/tests/testLegacySimulationInvoice.py b/product/ERP5Legacy/tests/testLegacySimulationInvoice.py
index 5ce0e391d2..d406d9c3be 100644
--- a/product/ERP5Legacy/tests/testLegacySimulationInvoice.py
+++ b/product/ERP5Legacy/tests/testLegacySimulationInvoice.py
@@ -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(TestPackingListMixin,
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')
--
2.30.9