Commit 0b817d25 authored by Julien Muchembled's avatar Julien Muchembled

Revert r37470 & r37474 for the moment

Partial (or hacky ?) fixing of this issue would just make everything confusing
and decrease the quality of the unit test.
For example, the name of tests didn't match anymore what was tested.
Or we wouldn't know anymore how the test should be written.

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@38136 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 11dcdb98
...@@ -592,16 +592,16 @@ class TestPackingListMixin(TestOrderMixin): ...@@ -592,16 +592,16 @@ class TestPackingListMixin(TestOrderMixin):
simulation_movement.getDeliveryValue().edit(quantity=self.default_quantity-1) simulation_movement.getDeliveryValue().edit(quantity=self.default_quantity-1)
simulation_movement.expand() simulation_movement.expand()
def stepModifySimulationLineStopDate(self,sequence=None, sequence_list=None, **kw): def stepModifySimulationLineStartDate(self,sequence=None, sequence_list=None, **kw):
""" """
Modify simulation line stop date Modify simulation line start date
""" """
applied_rule = sequence.get('applied_rule') applied_rule = sequence.get('applied_rule')
simulation_movement_list = applied_rule.objectValues() simulation_movement_list = applied_rule.objectValues()
resource_list = sequence.get('resource_list') resource_list = sequence.get('resource_list')
for simulation_movement in simulation_movement_list: for simulation_movement in simulation_movement_list:
simulation_movement.recordProperty('stop_date') simulation_movement.recordProperty('start_date')
simulation_movement.edit(stop_date=self.datetime+15) simulation_movement.edit(start_date=self.datetime+15)
simulation_movement.expand() simulation_movement.expand()
def stepModifyOneSimulationLineStartDate(self,sequence=None, sequence_list=None, **kw): def stepModifyOneSimulationLineStartDate(self,sequence=None, sequence_list=None, **kw):
...@@ -661,12 +661,6 @@ class TestPackingListMixin(TestOrderMixin): ...@@ -661,12 +661,6 @@ class TestPackingListMixin(TestOrderMixin):
self._solveDivergence(packing_list, 'start_date', 'Unify Solver', self._solveDivergence(packing_list, 'start_date', 'Unify Solver',
value=packing_list.getStartDate()) value=packing_list.getStartDate())
def stepUnifyStopDateWithDecision(self,sequence=None, sequence_list=None, **kw):
"""
Solve divergence on stop date using unify
"""
raise NotImplementedError
def stepUnifyStartDateWithPrevision(self,sequence=None, sequence_list=None, **kw): def stepUnifyStartDateWithPrevision(self,sequence=None, sequence_list=None, **kw):
""" """
Check if simulation movement are disconnected Check if simulation movement are disconnected
...@@ -677,12 +671,6 @@ class TestPackingListMixin(TestOrderMixin): ...@@ -677,12 +671,6 @@ class TestPackingListMixin(TestOrderMixin):
self._solveDivergence(packing_list, 'start_date', self._solveDivergence(packing_list, 'start_date',
'Unify Solver', value=simulation_movement_list[-1].getStartDate()) 'Unify Solver', value=simulation_movement_list[-1].getStartDate())
def stepUnifyStopDateWithPrevision(self,sequence=None, sequence_list=None, **kw):
"""
Solve divergence on stop date using unify
"""
raise NotImplementedError
def stepAcceptDecisionResource(self,sequence=None, sequence_list=None, **kw): def stepAcceptDecisionResource(self,sequence=None, sequence_list=None, **kw):
packing_list = sequence.get('packing_list') packing_list = sequence.get('packing_list')
self._solveDivergence(packing_list, 'resource', 'Accept Solver') self._solveDivergence(packing_list, 'resource', 'Accept Solver')
...@@ -1213,7 +1201,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) : ...@@ -1213,7 +1201,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) :
stepCreateNotVariatedResource \ stepCreateNotVariatedResource \
stepModifySimulationLineQuantityForMergedLine \ stepModifySimulationLineQuantityForMergedLine \
stepModifyOneSimulationLineResource \ stepModifyOneSimulationLineResource \
stepModifySimulationLineStopDate \ stepModifySimulationLineStartDate \
stepTic \ stepTic \
stepCheckPackingListIsDiverged \ stepCheckPackingListIsDiverged \
stepAcceptDecisionQuantity \ stepAcceptDecisionQuantity \
...@@ -1222,7 +1210,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) : ...@@ -1222,7 +1210,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) :
stepAcceptDecisionResource \ stepAcceptDecisionResource \
stepTic \ stepTic \
stepCheckPackingListIsDiverged \ stepCheckPackingListIsDiverged \
stepUnifyStopDateWithDecision \ stepUnifyStartDateWithDecision \
stepTic \ stepTic \
stepCheckPackingListIsNotDivergent \ stepCheckPackingListIsNotDivergent \
stepCheckPackingListIsSolved \ stepCheckPackingListIsSolved \
...@@ -1331,11 +1319,11 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) : ...@@ -1331,11 +1319,11 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) :
stepSetContainerFullQuantity \ stepSetContainerFullQuantity \
stepTic \ stepTic \
stepCheckPackingListIsPacked \ stepCheckPackingListIsPacked \
stepModifySimulationLineStopDate \ stepModifySimulationLineStartDate \
stepTic \ stepTic \
stepCheckPackingListIsDiverged \ stepCheckPackingListIsDiverged \
stepCheckPackingListIsDivergent \ stepCheckPackingListIsDivergent \
stepUnifyStopDateWithPrevision \ stepUnifyStartDateWithPrevision \
stepTic \ stepTic \
' '
# XXX Check if there is a new packing list created # XXX Check if there is a new packing list created
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment