diff --git a/product/ERP5/tests/testDivergenceTester.py b/product/ERP5/tests/testDivergenceTester.py
new file mode 100644
index 0000000000000000000000000000000000000000..572eab32a9c94fe4b3699f2c387080b9b6bab49f
--- /dev/null
+++ b/product/ERP5/tests/testDivergenceTester.py
@@ -0,0 +1,369 @@
+##############################################################################
+#
+# Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.
+#          Romain Courteaud <romain@nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability 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
+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+#
+# Skeleton ZopeTestCase
+#
+
+from random import randint
+
+import os, sys
+if __name__ == '__main__':
+    execfile(os.path.join(sys.path[0], 'framework.py'))
+
+# Needed in order to have a log file inside the current folder
+os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
+os.environ['EVENT_LOG_SEVERITY'] = '-300'
+
+from Testing import ZopeTestCase
+from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
+from AccessControl.SecurityManagement import newSecurityManager, \
+                                             noSecurityManager
+from DateTime import DateTime
+from Acquisition import aq_base, aq_inner
+from zLOG import LOG
+from Products.ERP5Type.DateUtils import addToDate
+from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
+import time
+import os
+from Products.ERP5Type import product_path
+from Products.CMFCore.utils import getToolByName
+from testPackingList import TestPackingListMixin
+
+class TestDivergenceTester(TestPackingListMixin, ERP5TypeTestCase):
+  """
+  Check isDivergent method on movement, delivery
+  """
+  run_all_test = 1
+  quiet = 0
+  rule_id = 'default_order_rule'
+
+  def getTitle(self):
+    return "Divergence Tester"
+
+  def stepRemoveDivergenceTesters(self, sequence=None, 
+                                  sequence_list=None, **kw):
+    """
+    Remove all divergence testers from order_rule.
+    """
+    rule = getattr(self.getPortal().portal_rules, self.rule_id)
+    tester_list = rule.contentValues(
+             portal_type=rule.getPortalDivergenceTesterTypeList())
+    rule.manage_delObjects(
+                    uids=[x.getUid() for x in tester_list])
+
+  def bootstrapSite(self):
+    """
+    Manager has to create an administrator user first.
+    """
+    self.logMessage("Bootstrap the site by creating required " \
+                    "order, simulation, ...")
+    sequence_list = SequenceList()
+    # Create a clean packing list
+    sequence_string = ' \
+          stepRemoveDivergenceTesters \
+          stepCreateOrganisation1 \
+          stepCreateOrganisation2 \
+          stepCreateOrganisation3 \
+          stepCreateOrder \
+          stepSetOrderProfile \
+          stepCreateNotVariatedResource \
+          stepTic \
+          stepCreateOrderLine \
+          stepSetOrderLineResource \
+          stepSetOrderLineDefaultValues \
+          stepOrderOrder \
+          stepTic \
+          stepConfirmOrder \
+          stepTic \
+    '
+    sequence_list.addSequenceString(sequence_string)
+    sequence_list.play(self, quiet=self.quiet)
+    self.logMessage("Bootstrap finished")
+
+  def afterSetUp(self, quiet=1, run=run_all_test):
+    """
+    Create an order and generate a packing list from it.
+    This has to be called only once.
+    """
+    if getattr(self.portal, 'set_up_once_called', 0):
+      return
+    else:
+      self.portal.set_up_once_called = 1
+      self.bootstrapSite()
+
+  def stepGetPackingList(self, sequence=None, sequence_list=None, **kw):
+    """
+    Set the packing list in the sequence
+    """
+    sql_result = self.getPortal().portal_catalog(
+                         portal_type=self.packing_list_portal_type)
+    self.assertEquals(1, len(sql_result))
+    packing_list = sql_result[0].getObject()
+    # XXX Hardcoded id
+    movement=packing_list['1']
+    rule = getattr(self.getPortal().portal_rules, self.rule_id)
+    sequence.edit(
+        packing_list=packing_list,
+        movement=movement,
+        rule=rule,
+        sim_mvt=movement.getDeliveryRelatedValueList()[0])
+
+  def stepCheckPackingListIsDivergent(self, sequence=None, 
+                                      sequence_list=None, **kw):
+    """
+    Test if packing list is divergent
+    """
+    packing_list = sequence.get('packing_list')
+    self.assertTrue(packing_list.isDivergent())
+
+  def stepSetNewQuantity(self, sequence=None, 
+                         sequence_list=None, **kw):
+    """
+    Modify the quantity of the delivery movement
+    """
+    packing_list = sequence.get('packing_list')
+    movement = sequence.get('movement')
+    movement.setQuantity(movement.getQuantity()+1234)
+
+  def stepSetPreviousQuantity(self, sequence=None, 
+                              sequence_list=None, **kw):
+    """
+    Reset the quantity of the delivery movement
+    """
+    sim_mvt = sequence.get('sim_mvt')
+    movement = sequence.get('movement')
+    movement.setQuantity(sim_mvt.getQuantity())
+
+  def stepAddQuantityDivergenceTester(self, sequence=None, 
+                                      sequence_list=None, **kw):
+    """
+    Add a quantity divergence tester in the rule
+    """
+    rule = sequence.get('rule')
+    rule.newContent(portal_type='Quantity Divergence Tester')
+
+  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 = ' \
+          stepGetPackingList \
+          stepCheckPackingListIsNotDivergent \
+          stepSetNewQuantity \
+          stepCheckPackingListIsNotDivergent \
+          stepAddQuantityDivergenceTester \
+          stepCheckPackingListIsDivergent \
+          stepSetPreviousQuantity \
+          stepCheckPackingListIsNotDivergent \
+          Tic \
+          stepRemoveDivergenceTesters \
+          Tic \
+    '
+    sequence_list.addSequenceString(sequence_string)
+    sequence_list.play(self, quiet=self.quiet)
+
+  def stepSetNewSource(self, sequence=None, 
+                       sequence_list=None, **kw):
+    """
+    Modify the source of the delivery
+    """
+    packing_list = sequence.get('packing_list')
+    packing_list.setSource(None)
+
+  def stepAddCategoryDivergenceTester(self, sequence=None, 
+                                      sequence_list=None, **kw):
+    """
+    Add a category divergence tester in the rule
+    """
+    rule = sequence.get('rule')
+    tester = rule.newContent(portal_type='Category Divergence Tester')
+    sequence.edit(tester=tester)
+
+  def stepConfigureCategoryDivergenceTesterForSource(self, sequence=None, 
+                                      sequence_list=None, **kw):
+    """
+    Add a category divergence tester in the rule
+    """
+    tester = sequence.get('tester')
+    tester.setTestedPropertyList(['source | Source'])
+
+  def stepSetPreviousSource(self, sequence=None, 
+                            sequence_list=None, **kw):
+    """
+    Reset the quantity of the delivery
+    """
+    sim_mvt = sequence.get('sim_mvt')
+    packing_list = sequence.get('packing_list')
+    packing_list.setSource(sim_mvt.getSource())
+
+  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 = ' \
+          stepGetPackingList \
+          stepCheckPackingListIsNotDivergent \
+          stepSetNewSource \
+          stepCheckPackingListIsNotDivergent \
+          stepAddCategoryDivergenceTester \
+          stepCheckPackingListIsNotDivergent \
+          stepConfigureCategoryDivergenceTesterForSource \
+          stepCheckPackingListIsDivergent \
+          stepSetPreviousSource \
+          stepCheckPackingListIsNotDivergent \
+          Tic \
+          stepRemoveDivergenceTesters \
+          Tic \
+    '
+    sequence_list.addSequenceString(sequence_string)
+    sequence_list.play(self, quiet=self.quiet)
+
+  def stepSetNewStartDate(self, sequence=None, 
+                       sequence_list=None, **kw):
+    """
+    Modify the source of the delivery
+    """
+    packing_list = sequence.get('packing_list')
+    packing_list.setStartDate(packing_list.getStartDate()+10)
+
+  def stepAddPropertyDivergenceTester(self, sequence=None, 
+                                      sequence_list=None, **kw):
+    """
+    Add a property divergence tester in the rule
+    """
+    rule = sequence.get('rule')
+    tester = rule.newContent(portal_type='Property Divergence Tester')
+    sequence.edit(tester=tester)
+
+  def stepConfigurePropertyDivergenceTesterForStartDate(self, sequence=None, 
+                                      sequence_list=None, **kw):
+    """
+    Add a property divergence tester in the rule
+    """
+    tester = sequence.get('tester')
+    tester.setTestedPropertyList(['start_date | Start Date'])
+
+  def stepSetPreviousStartDate(self, sequence=None, 
+                               sequence_list=None, **kw):
+    """
+    Reset the quantity of the delivery
+    """
+    sim_mvt = sequence.get('sim_mvt')
+    packing_list = sequence.get('packing_list')
+    packing_list.setStartDate(sim_mvt.getStartDate())
+
+  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 = ' \
+          stepGetPackingList \
+          stepCheckPackingListIsNotDivergent \
+          stepSetNewStartDate \
+          stepCheckPackingListIsNotDivergent \
+          stepAddPropertyDivergenceTester \
+          stepCheckPackingListIsNotDivergent \
+          stepConfigurePropertyDivergenceTesterForStartDate \
+          stepCheckPackingListIsDivergent \
+          stepSetPreviousStartDate \
+          stepCheckPackingListIsNotDivergent \
+          Tic \
+          stepRemoveDivergenceTesters \
+          Tic \
+    '
+    sequence_list.addSequenceString(sequence_string)
+    sequence_list.play(self, quiet=self.quiet)
+
+  def stepSetNewAggregate(self, sequence=None, 
+                          sequence_list=None, **kw):
+    """
+    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
+    movement.setAggregate('a_great_module/a_random_id')
+
+  def stepConfigureCategoryDivergenceTesterForAggregate(self, sequence=None, 
+                                                        sequence_list=None, **kw):
+    """
+    Add a category divergence tester in the rule
+    """
+    tester = sequence.get('tester')
+    tester.setTestedPropertyList(['aggregate | Aggregate'])
+
+  def stepSetPreviousAggregate(self, sequence=None, 
+                            sequence_list=None, **kw):
+    """
+    Reset the quantity of the delivery
+    """
+    movement = sequence.get('movement')
+    movement.setAggregate(None)
+
+  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 = ' \
+          stepGetPackingList \
+          stepCheckPackingListIsNotDivergent \
+          stepSetNewAggregate \
+          stepCheckPackingListIsNotDivergent \
+          stepAddCategoryDivergenceTester \
+          stepCheckPackingListIsNotDivergent \
+          stepConfigureCategoryDivergenceTesterForAggregate \
+          stepCheckPackingListIsDivergent \
+          stepSetPreviousAggregate \
+          stepCheckPackingListIsNotDivergent \
+          Tic \
+          stepRemoveDivergenceTesters \
+          Tic \
+    '
+    sequence_list.addSequenceString(sequence_string)
+    sequence_list.play(self, quiet=self.quiet)
+if __name__ == '__main__':
+    framework()
+else:
+    import unittest
+    def test_suite():
+        suite = unittest.TestSuite()
+        suite.addTest(unittest.makeSuite(TestDivergenceTester))
+        return suite