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

Assert the updated category.

Also fixup naming.
parent c1388c25
...@@ -41,7 +41,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin): ...@@ -41,7 +41,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin):
portal_type=cell_portal_type)) portal_type=cell_portal_type))
def checkDelivery(self, simulation_movement, delivery, delivery_portal_type, def checkDelivery(self, simulation_movement, delivery, delivery_portal_type,
causality_list, simulation_state='delivered'): category_list, simulation_state='delivered'):
self.assertEqual(delivery_portal_type, delivery.getPortalType()) self.assertEqual(delivery_portal_type, delivery.getPortalType())
self.assertEqual(simulation_state, delivery.getSimulationState()) self.assertEqual(simulation_state, delivery.getSimulationState())
self.assertEqual('building', delivery.getCausalityState()) self.assertEqual('building', delivery.getCausalityState())
...@@ -62,7 +62,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin): ...@@ -62,7 +62,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin):
simulation_movement.getDestinationSectionList()) \ simulation_movement.getDestinationSectionList()) \
+ convertCategoryList('destination_decision', + convertCategoryList('destination_decision',
simulation_movement.getDestinationDecisionList()) \ simulation_movement.getDestinationDecisionList()) \
+ causality_list, + category_list,
delivery.getCategoryList()) delivery.getCategoryList())
def test(self): def test(self):
...@@ -136,7 +136,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin): ...@@ -136,7 +136,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin):
delivery_2.getRelativeUrl()) delivery_2.getRelativeUrl())
delivery_kw = dict(delivery_portal_type='Sale Packing List', delivery_kw = dict(delivery_portal_type='Sale Packing List',
causality_list=convertCategoryList('causality', category_list=convertCategoryList('causality',
simulation_movement_1.getParentValue().getCausalityList())) simulation_movement_1.getParentValue().getCausalityList()))
self.checkDelivery(simulation_movement_1, delivery_1, **delivery_kw) self.checkDelivery(simulation_movement_1, delivery_1, **delivery_kw)
self.checkDelivery(simulation_movement_2, delivery_2, **delivery_kw) self.checkDelivery(simulation_movement_2, delivery_2, **delivery_kw)
...@@ -305,11 +305,12 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder): ...@@ -305,11 +305,12 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
invoice_kw = dict(delivery_portal_type='Sale Invoice Transaction', invoice_kw = dict(delivery_portal_type='Sale Invoice Transaction',
simulation_state='confirmed') simulation_state='confirmed')
category_list = ['resource/currency_module/EUR']
self.checkDelivery(invoice_movement_1, invoice_1, self.checkDelivery(invoice_movement_1, invoice_1,
causality_list=convertCategoryList('causality', category_list=category_list + convertCategoryList('causality',
[delivery_1.getRelativeUrl()]), **invoice_kw) [delivery_1.getRelativeUrl()]), **invoice_kw)
self.checkDelivery(invoice_movement_2, invoice_2, self.checkDelivery(invoice_movement_2, invoice_2,
causality_list=convertCategoryList('causality', category_list=category_list + convertCategoryList('causality',
[delivery_2.getRelativeUrl()]), **invoice_kw) [delivery_2.getRelativeUrl()]), **invoice_kw)
class TestSlapOSSaleInvoiceTransactionBuilder(testSlapOSMixin): class TestSlapOSSaleInvoiceTransactionBuilder(testSlapOSMixin):
......
115 116
\ No newline at end of file \ No newline at end of file
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