Commit bc49a68e authored by Łukasz Nowak's avatar Łukasz Nowak

Simplify and correct.

Start and stop dates are known from open order on first expand level.
parent 9b52ce78
...@@ -73,12 +73,6 @@ class TestVifibOpenOrderSimulation(TestVifibSlapWebServiceMixin): ...@@ -73,12 +73,6 @@ class TestVifibOpenOrderSimulation(TestVifibSlapWebServiceMixin):
stop_date = start_date + getNumberOfDayInMonth(start_date) stop_date = start_date + getNumberOfDayInMonth(start_date)
self.assertEqual(stop_date, open_order_line.getStopDate()) self.assertEqual(stop_date, open_order_line.getStopDate())
# Calculate the list of time frames
expected_time_frame_list = generateTimeFrameList(start_date)
# test the test: have we generated 12th next months coverage?
self.assertEqual(13, len(expected_time_frame_list))
simulation_movement_list = self.portal.portal_catalog( simulation_movement_list = self.portal.portal_catalog(
portal_type='Simulation Movement', portal_type='Simulation Movement',
parent_uid=applied_rule.getUid(), parent_uid=applied_rule.getUid(),
...@@ -91,8 +85,6 @@ class TestVifibOpenOrderSimulation(TestVifibSlapWebServiceMixin): ...@@ -91,8 +85,6 @@ class TestVifibOpenOrderSimulation(TestVifibSlapWebServiceMixin):
# Check the list of expected simulation # Check the list of expected simulation
idx = 0 idx = 0
for simulation_movement in simulation_movement_list: for simulation_movement in simulation_movement_list:
expected_start_date = expected_time_frame_list[idx]
expected_stop_date = expected_time_frame_list[idx+1]
# Check simulation movement property # Check simulation movement property
self.assertEquals(1.0, self.assertEquals(1.0,
simulation_movement.getQuantity()) simulation_movement.getQuantity())
...@@ -130,8 +122,8 @@ class TestVifibOpenOrderSimulation(TestVifibSlapWebServiceMixin): ...@@ -130,8 +122,8 @@ class TestVifibOpenOrderSimulation(TestVifibSlapWebServiceMixin):
self.assertEquals(None, self.assertEquals(None,
simulation_movement.getAggregate( simulation_movement.getAggregate(
portal_type="Software Release")) portal_type="Software Release"))
self.assertEqual(expected_start_date, simulation_movement.getStartDate()) self.assertEqual(start_date, simulation_movement.getStartDate())
self.assertEqual(expected_stop_date, simulation_movement.getStopDate()) self.assertEqual(stop_date, simulation_movement.getStopDate())
# delivered already # delivered already
self.assertNotEqual(None, simulation_movement.getDelivery()) self.assertNotEqual(None, simulation_movement.getDelivery())
......
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