[Erp5-report] r44610 leonardo - /erp5/trunk/products/ERP5Legacy/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Mar 25 11:38:33 CET 2011
Author: leonardo
Date: Fri Mar 25 11:38:33 2011
New Revision: 44610
URL: http://svn.erp5.org?rev=44610&view=rev
Log:
copy legacy divergence tests from before the fix (and do some cleanup)
Added:
erp5/trunk/products/ERP5Legacy/tests/testLegacyDivergenceTester.py
- copied, changed from r44574, erp5/trunk/products/ERP5/tests/testDivergenceTester.py
Copied: erp5/trunk/products/ERP5Legacy/tests/testLegacyDivergenceTester.py (from r44574, erp5/trunk/products/ERP5/tests/testDivergenceTester.py)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacyDivergenceTester.py?p2=erp5/trunk/products/ERP5Legacy/tests/testLegacyDivergenceTester.py&p1=erp5/trunk/products/ERP5/tests/testDivergenceTester.py&r1=44574&r2=44610&rev=44610&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testDivergenceTester.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacyDivergenceTester.py [utf8] Fri Mar 25 11:38:33 2011
@@ -1,13 +1,13 @@
+# -*- coding: utf-8 -*-
##############################################################################
-#
-# Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.
-# Romain Courteaud <romain at nexedi.com>
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
+# Julien Muchembled <jm at nexedi.com>
#
# 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 adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
@@ -22,18 +22,19 @@
#
# 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 transaction
+
+from Products.ERP5Legacy.tests import testLegacySimulationPackingList
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from Products.ERP5Type.tests.Sequence import SequenceList
-from Products.ERP5.tests.testPackingList import TestPackingListMixin
-from Products.ERP5.tests.utils import newSimulationExpectedFailure
+from Products.ERP5Type.tests.Sequence import Sequence
-class TestDivergenceTester(TestPackingListMixin, ERP5TypeTestCase):
+class TestDivergenceTester(testLegacySimulationPackingList.TestPackingListMixin,
+ ERP5TypeTestCase):
"""
Check isDivergent method on movement, delivery
"""
@@ -64,7 +65,6 @@ class TestDivergenceTester(TestPackingLi
"""
self.logMessage("Bootstrap the site by creating required " \
"order, simulation, ...")
- sequence_list = SequenceList()
# Create a clean packing list
sequence_string = ' \
stepCreateOrganisation1 \
@@ -82,8 +82,8 @@ class TestDivergenceTester(TestPackingLi
stepConfirmOrder \
stepTic \
'
- sequence_list.addSequenceString(sequence_string)
- sequence_list.play(self, quiet=self.quiet)
+ sequence = Sequence(self)
+ sequence(sequence_string, quiet=self.quiet)
self.logMessage("Bootstrap finished")
def setUpOnce(self, quiet=1, run=run_all_test):
@@ -156,14 +156,11 @@ class TestDivergenceTester(TestPackingLi
rule = sequence.get('rule')
rule.newContent(portal_type='Quantity Divergence Tester')
- @newSimulationExpectedFailure
def test_01_QuantityDivergenceTester(self, quiet=quiet, run=run_all_test):
"""
Test the quantity divergence tester
"""
if not run: return
- sequence_list = SequenceList()
- # Create a clean packing list
sequence_string = """
GetPackingList
CheckPackingListIsNotDivergent
@@ -177,8 +174,8 @@ class TestDivergenceTester(TestPackingLi
CheckPackingListIsNotDivergent
Tic
"""
- sequence_list.addSequenceString(sequence_string)
- sequence_list.play(self, quiet=self.quiet)
+ sequence = Sequence(self)
+ sequence(sequence_string, quiet=self.quiet)
def stepSetNewSource(self, sequence=None,
sequence_list=None, **kw):
@@ -214,14 +211,11 @@ class TestDivergenceTester(TestPackingLi
packing_list = sequence.get('packing_list')
packing_list.setSource(sim_mvt.getSource())
- @newSimulationExpectedFailure
def test_02_CategoryDivergenceTester(self, quiet=quiet, run=run_all_test):
"""
Test the category divergence tester
"""
if not run: return
- sequence_list = SequenceList()
- # Create a clean packing list
sequence_string = """
GetPackingList
CheckPackingListIsNotDivergent
@@ -235,8 +229,8 @@ class TestDivergenceTester(TestPackingLi
CheckPackingListIsNotDivergent
Tic
"""
- sequence_list.addSequenceString(sequence_string)
- sequence_list.play(self, quiet=self.quiet)
+ sequence = Sequence(self)
+ sequence(sequence_string, quiet=self.quiet)
def stepSetNewStartDate(self, sequence=None,
sequence_list=None, **kw):
@@ -272,14 +266,11 @@ class TestDivergenceTester(TestPackingLi
packing_list = sequence.get('packing_list')
packing_list.setStartDate(sim_mvt.getStartDate())
- @newSimulationExpectedFailure
def test_03_PropertyDivergenceTester(self, quiet=quiet, run=run_all_test):
"""
Test the property divergence tester
"""
if not run: return
- sequence_list = SequenceList()
- # Create a clean packing list
sequence_string = """
GetPackingList
CheckPackingListIsNotDivergent
@@ -293,8 +284,8 @@ class TestDivergenceTester(TestPackingLi
CheckPackingListIsNotDivergent
Tic
"""
- sequence_list.addSequenceString(sequence_string)
- sequence_list.play(self, quiet=self.quiet)
+ sequence = Sequence(self)
+ sequence(sequence_string, quiet=self.quiet)
def stepSetNewAggregate(self, sequence=None,
sequence_list=None, **kw):
@@ -302,8 +293,8 @@ class TestDivergenceTester(TestPackingLi
Modify the aggregate of the delivery movement
"""
movement = sequence.get('movement')
- # Set a aggregate value which does not exist
- # but it should not be a problem for testing the divergency
+ # Set an aggregate value which does not exist
+ # but it should not be a problem for testing the divergence
movement.setAggregate('a_great_module/a_random_id')
def stepConfigureCategoryDivergenceTesterForAggregate(self, sequence=None,
@@ -322,14 +313,11 @@ class TestDivergenceTester(TestPackingLi
movement = sequence.get('movement')
movement.setAggregate(None)
- @newSimulationExpectedFailure
def test_04_CategoryDivergenceTester(self, quiet=quiet, run=run_all_test):
"""
Test the category divergence tester
"""
if not run: return
- sequence_list = SequenceList()
- # Create a clean packing list
sequence_string = """
GetPackingList
CheckPackingListIsNotDivergent
@@ -343,35 +331,34 @@ class TestDivergenceTester(TestPackingLi
CheckPackingListIsNotDivergent
Tic
"""
- sequence_list.addSequenceString(sequence_string)
- sequence_list.play(self, quiet=self.quiet)
+ sequence = Sequence(self)
+ sequence(sequence_string, quiet=self.quiet)
- @newSimulationExpectedFailure
def test_QuantityDivergenceTesterCompareMethod(self):
rule = self.portal.portal_rules.newContent(portal_type='Delivery Rule')
divergence_tester = rule.newContent(portal_type='Quantity Divergence Tester')
- self.assert_(not divergence_tester.isDecimalAlignmentEnabled())
- self.assertEqual(divergence_tester.compare(3.0, 3.001), False)
- self.assertEqual(divergence_tester.compare(3.0, 3.0), True)
+ self.assertFalse(divergence_tester.isDecimalAlignmentEnabled())
+ self.assertFalse(divergence_tester.compare(3.0, 3.001))
+ self.assertTrue(divergence_tester.compare(3.0, 3.0))
divergence_tester.setDecimalAlignmentEnabled(True)
divergence_tester.setDecimalRoundingOption('ROUND_DOWN')
divergence_tester.setDecimalExponent('0.01')
- self.assertEqual(divergence_tester.compare(3.0, 3.001), True)
- self.assertEqual(divergence_tester.compare(3.0, 3.0), True)
+ self.assertTrue(divergence_tester.compare(3.0, 3.001))
+ self.assertTrue(divergence_tester.compare(3.0, 3.0))
divergence_tester.setDecimalExponent('0.001')
- self.assertEqual(divergence_tester.compare(3.0, 3.001), False)
+ self.assertFalse(divergence_tester.compare(3.0, 3.001))
divergence_tester.setDecimalRoundingOption('ROUND_UP')
divergence_tester.setDecimalExponent('0.01')
- self.assertEqual(divergence_tester.compare(3.0, 3.001), False)
+ self.assertFalse(divergence_tester.compare(3.0, 3.001))
divergence_tester.setDecimalRoundingOption('ROUND_HALF_UP')
divergence_tester.setDecimalExponent('0.01')
- self.assertEqual(divergence_tester.compare(3.0, 3.001), True)
+ self.assertTrue(divergence_tester.compare(3.0, 3.001))
def test_suite():
More information about the Erp5-report
mailing list