[Erp5-report] r40143 jm - in /erp5/trunk/products: ERP5/tests/ ERP5Legacy/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Nov 9 20:59:08 CET 2010
Author: jm
Date: Tue Nov 9 20:59:08 2010
New Revision: 40143
URL: http://svn.erp5.org?rev=40143&view=rev
Log:
New testLegacySimulationProduction* running testProductionOrder* with legacy simulation
Added:
erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationProduction.py
- copied, changed from r40142, erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py
erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationProductionApparel.py
- copied, changed from r40142, erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py
Modified:
erp5/trunk/products/ERP5/tests/testPackingList.py
erp5/trunk/products/ERP5/tests/testProductionOrder.py
erp5/trunk/products/ERP5/tests/testProductionOrderApparel.py
erp5/trunk/products/ERP5/tests/testProductionPackingList.py
erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py
erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationPackingList.py
Modified: erp5/trunk/products/ERP5/tests/testPackingList.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testPackingList.py?rev=40143&r1=40142&r2=40143&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testPackingList.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testPackingList.py [utf8] Tue Nov 9 20:59:08 2010
@@ -34,7 +34,7 @@ from Products.ERP5Type.UnrestrictedMetho
from Products.ERP5.Document.BusinessTemplate import getChainByType
from zLOG import LOG
from Products.ERP5Type.tests.Sequence import SequenceList
-from testOrder import TestOrderMixin
+from Products.ERP5.tests.testOrder import TestOrderMixin
from DateTime import DateTime
from Products.ERP5Type.Globals import PersistentMapping
from Products.ERP5.tests.utils import newSimulationExpectedFailure
Modified: erp5/trunk/products/ERP5/tests/testProductionOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testProductionOrder.py?rev=40143&r1=40142&r2=40143&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionOrder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testProductionOrder.py [utf8] Tue Nov 9 20:59:08 2010
@@ -37,6 +37,7 @@ from zLOG import LOG
from Products.ERP5Type.tests.Sequence import SequenceList
from Products.CMFCore.utils import getToolByName
from testOrder import TestOrderMixin
+from Products.ERP5.tests.utils import newSimulationExpectedFailure
class TestProductionOrderMixin(TestOrderMixin):
@@ -1316,6 +1317,7 @@ class TestProductionOrder(TestProduction
def getTitle(self):
return "Production Order"
+ @newSimulationExpectedFailure
def test_01_testProductionSimulationExpand(self, quiet=0, run=run_all_test):
"""
Test generation and update of order applied rule.
@@ -1340,6 +1342,7 @@ class TestProductionOrder(TestProduction
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_02_testSourcingSimulationExpand(self, quiet=0,
run=run_all_test):
"""
@@ -1366,6 +1369,7 @@ class TestProductionOrder(TestProduction
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_03_testIndustrialPhase(self, quiet=0, run=run_all_test):
"""
"""
@@ -1393,6 +1397,7 @@ class TestProductionOrder(TestProduction
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_04_testProductionSimulationBuild(self, quiet=0, run=run_all_test):
"""
Test delivery building.
@@ -1419,6 +1424,7 @@ class TestProductionOrder(TestProduction
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_05_testSourcingSimulationBuild(self, quiet=0,
run=run_all_test):
"""
@@ -1431,6 +1437,7 @@ class TestProductionOrder(TestProduction
sequence_list.addSequenceString(self.SOURCING_ORDER_SEQUENCE)
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_06_testIndustrialPhase(self, quiet=0, run=run_all_test):
"""
Test delivery building.
@@ -1570,7 +1577,8 @@ class TestProductionOrder(TestProduction
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
-
+
+ @newSimulationExpectedFailure
def test_08_testTransformationWithEfficiency(self, quiet=0, run=run_all_test):
"""
Test, that efficiency from transformation applies correctly
@@ -1655,6 +1663,7 @@ class TestProductionOrder(TestProduction
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_09_testTransformationWithVariation(self, quiet=0, run=run_all_test):
"""
Test, that variation from transformation works correctly on order
Modified: erp5/trunk/products/ERP5/tests/testProductionOrderApparel.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testProductionOrderApparel.py?rev=40143&r1=40142&r2=40143&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionOrderApparel.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testProductionOrderApparel.py [utf8] Tue Nov 9 20:59:08 2010
@@ -33,7 +33,8 @@ from Products.ERP5Type.tests.ERP5TypeTes
from zLOG import LOG
from Products.ERP5Type.tests.Sequence import SequenceList
from Products.CMFCore.utils import getToolByName
-from testOrder import TestOrderMixin
+from Products.ERP5.tests.testOrder import TestOrderMixin
+from Products.ERP5.tests.utils import newSimulationExpectedFailure
class TestProductionOrderApparelMixin(TestOrderMixin):
@@ -935,6 +936,7 @@ class TestProductionOrderApparel(TestPro
def getTitle(self):
return "Production Order for Apparel"
+ @newSimulationExpectedFailure
def test_01_testProductionSimulationExpand(self, quiet=0, run=run_all_test):
"""
Test generation and update of order applied rule.
@@ -959,6 +961,7 @@ class TestProductionOrderApparel(TestPro
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_02_testSourcingSimulationExpand(self, quiet=0,
run=run_all_test):
"""
@@ -985,6 +988,7 @@ class TestProductionOrderApparel(TestPro
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_03_testIndustrialPhase(self, quiet=0, run=run_all_test):
"""
"""
@@ -1012,6 +1016,7 @@ class TestProductionOrderApparel(TestPro
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_04_testProductionSimulationBuild(self, quiet=0, run=run_all_test):
"""
Test delivery building.
@@ -1038,6 +1043,7 @@ class TestProductionOrderApparel(TestPro
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_05_testSourcingSimulationBuild(self, quiet=0,
run=run_all_test):
"""
@@ -1050,6 +1056,7 @@ class TestProductionOrderApparel(TestPro
sequence_list.addSequenceString(self.SOURCING_ORDER_SEQUENCE)
sequence_list.play(self)
+ @newSimulationExpectedFailure
def test_06_testIndustrialPhase(self, quiet=0, run=run_all_test):
"""
Test delivery building.
Modified: erp5/trunk/products/ERP5/tests/testProductionPackingList.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testProductionPackingList.py?rev=40143&r1=40142&r2=40143&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionPackingList.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testProductionPackingList.py [utf8] Tue Nov 9 20:59:08 2010
@@ -31,8 +31,9 @@ import unittest
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.Sequence import SequenceList
-from testProductionOrder import TestProductionOrderMixin
-from testPackingList import TestPackingListMixin
+from Products.ERP5.tests.testProductionOrder import TestProductionOrderMixin
+from Products.ERP5.tests.testPackingList import TestPackingListMixin
+from Products.ERP5.tests.utils import newSimulationExpectedFailure
class TestProductionPackingReportListMixin(TestProductionOrderMixin, TestPackingListMixin, \
ERP5TypeTestCase):
@@ -401,6 +402,7 @@ class TestProductionDelivery(TestProduct
self.transformation_portal_type,
self.resource_portal_type,)
+ @newSimulationExpectedFailure
def test_01_sourcingDelivery(self, quiet=0,
run=run_all_test):
"""
Modified: erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py?rev=40143&r1=40142&r2=40143&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py [utf8] Tue Nov 9 20:59:08 2010
@@ -30,8 +30,8 @@
import unittest
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from testProductionOrderApparel import TestProductionOrderApparelMixin
-from testProductionPackingList import TestProductionDelivery
+from Products.ERP5.tests.testProductionOrderApparel import TestProductionOrderApparelMixin
+from Products.ERP5.tests.testProductionPackingList import TestProductionDelivery
class TestProductionDeliveryApparel(TestProductionOrderApparelMixin,
TestProductionDelivery, ERP5TypeTestCase):
Modified: erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationPackingList.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationPackingList.py?rev=40143&r1=40142&r2=40143&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationPackingList.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationPackingList.py [utf8] Tue Nov 9 20:59:08 2010
@@ -26,6 +26,10 @@
#
##############################################################################
+import sys
+from Products.ERP5Legacy.tests import testLegacyRuleOrder
+sys.modules['Products.ERP5.tests.testOrder'] = testLegacyRuleOrder
+
import unittest
import transaction
@@ -34,7 +38,7 @@ from Products.ERP5Type.UnrestrictedMetho
from Products.ERP5.Document.BusinessTemplate import getChainByType
from zLOG import LOG
from Products.ERP5Type.tests.Sequence import SequenceList
-from testLegacyRuleOrder import TestOrderMixin
+from Products.ERP5.tests.testOrder import TestOrderMixin
from DateTime import DateTime
from Products.ERP5Type.Globals import PersistentMapping
Copied: erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationProduction.py (from r40142, erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationProduction.py?p2=erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationProduction.py&p1=erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py&r1=40142&r2=40143&rev=40143&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationProduction.py [utf8] Tue Nov 9 20:59:08 2010
@@ -1,14 +1,12 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
-# Copyright (c) 2008 Nexedi SARL and Contributors. All Rights Reserved.
-# Łukasz Nowak <lukasz.nowak at ventis.com.pl>
+# 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 responsability of assessing all potential
+# 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
-# garantees and support are strongly adviced to contract a Free Software
+# guarantees and support are strongly advised to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
@@ -23,21 +21,25 @@
#
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
-import unittest
+import sys
+from Products.ERP5Legacy.tests import testLegacySimulationPackingList
+sys.modules['Products.ERP5.tests.testPackingList'] = testLegacySimulationPackingList
-from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from testProductionOrderApparel import TestProductionOrderApparelMixin
-from testProductionPackingList import TestProductionDelivery
+test_suite_list = []
+from Products.ERP5.tests.testProductionOrder import *
+test_suite_list.append(test_suite)
+from Products.ERP5.tests.testProductionPackingList import *
+test_suite_list.append(test_suite)
-class TestProductionDeliveryApparel(TestProductionOrderApparelMixin,
- TestProductionDelivery, ERP5TypeTestCase):
- pass # everything defined in testProductionPackingList shall pass
+from Products.ERP5Legacy.tests import Legacy_getBusinessTemplateList
+Legacy_getBusinessTemplateList(TestProductionOrderMixin)
def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestProductionDeliveryApparel))
+ suite = test_suite_list[0]()
+ for test_suite in test_suite_list[1:]:
+ suite.addTests(test_suite())
return suite
Copied: erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationProductionApparel.py (from r40142, erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationProductionApparel.py?p2=erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationProductionApparel.py&p1=erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py&r1=40142&r2=40143&rev=40143&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionPackingListApparel.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacySimulationProductionApparel.py [utf8] Tue Nov 9 20:59:08 2010
@@ -1,14 +1,12 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
-# Copyright (c) 2008 Nexedi SARL and Contributors. All Rights Reserved.
-# Łukasz Nowak <lukasz.nowak at ventis.com.pl>
+# 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 responsability of assessing all potential
+# 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
-# garantees and support are strongly adviced to contract a Free Software
+# guarantees and support are strongly advised to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
@@ -23,21 +21,27 @@
#
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
##############################################################################
-import unittest
+import sys
+from Products.ERP5Legacy.tests import testLegacySimulationProduction
+sys.modules['Products.ERP5.tests.testProductionOrder'] = \
+sys.modules['Products.ERP5.tests.testProductionPackingList'] = \
+ testLegacySimulationProduction
-from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from testProductionOrderApparel import TestProductionOrderApparelMixin
-from testProductionPackingList import TestProductionDelivery
+test_suite_list = []
+from Products.ERP5.tests.testProductionOrderApparel import *
+test_suite_list.append(test_suite)
+from Products.ERP5.tests.testProductionPackingListApparel import *
+test_suite_list.append(test_suite)
-class TestProductionDeliveryApparel(TestProductionOrderApparelMixin,
- TestProductionDelivery, ERP5TypeTestCase):
- pass # everything defined in testProductionPackingList shall pass
+from Products.ERP5Legacy.tests import Legacy_getBusinessTemplateList
+Legacy_getBusinessTemplateList(TestProductionOrderApparelMixin)
def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestProductionDeliveryApparel))
+ suite = test_suite_list[0]()
+ for test_suite in test_suite_list[1:]:
+ suite.addTests(test_suite())
return suite
More information about the Erp5-report
mailing list