Commit 0ccac5f0 authored by Fabien Morin's avatar Fabien Morin

modify test to use the use the rewrited getInheritanceModelReferenceDict method

wich use a Breadth First Search instead of Depth First Search witch is very more appropiate in this case.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18345 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 76e8d606
...@@ -855,9 +855,8 @@ class TestPayroll(TestPayrollMixin): ...@@ -855,9 +855,8 @@ class TestPayroll(TestPayrollMixin):
# return a list of data that should contain data from all model # return a list of data that should contain data from all model
portal_type_list = ['Annotation Line', ] portal_type_list = ['Annotation Line', ]
model_reference_dict = {} model_reference_dict = model_employee.getInheritanceModelReferenceDict(\
model_employee.getInheritanceModelReferenceDict(\ portal_type_list=portal_type_list)
model_reference_dict, model_employee, portal_type_list, [])
# check data's are corrected # check data's are corrected
...@@ -907,7 +906,7 @@ class TestPayroll(TestPayrollMixin): ...@@ -907,7 +906,7 @@ class TestPayroll(TestPayrollMixin):
portal_type_list = ['Annotation Line', ] portal_type_list = ['Annotation Line', ]
model_reference_dict = {} model_reference_dict = {}
model_reference_dict = model_employee.getInheritanceModelReferenceDict(\ model_reference_dict = model_employee.getInheritanceModelReferenceDict(\
model_reference_dict, model_employee, portal_type_list, []) portal_type_list=portal_type_list)
# check that if a reference is already present in the model_employee, # check that if a reference is already present in the model_employee,
# and the model_company contain a data with the same one, the data used at # and the model_company contain a data with the same one, the data used at
...@@ -961,7 +960,7 @@ class TestPayroll(TestPayrollMixin): ...@@ -961,7 +960,7 @@ class TestPayroll(TestPayrollMixin):
portal_type_list = ['Annotation Line', ] portal_type_list = ['Annotation Line', ]
model_reference_dict = {} model_reference_dict = {}
model_reference_dict = model_employee.getInheritanceModelReferenceDict(\ model_reference_dict = model_employee.getInheritanceModelReferenceDict(\
model_reference_dict, model_employee, portal_type_list, []) portal_type_list=portal_type_list)
# check data's are corrected # check data's are corrected
...@@ -974,18 +973,17 @@ class TestPayroll(TestPayrollMixin): ...@@ -974,18 +973,17 @@ class TestPayroll(TestPayrollMixin):
# that's make 11 ! # that's make 11 !
# check the model number # check the model number
self.assertEqual(len(model_reference_dict), 5) # (6-1 because model_b self.assertEqual(len(model_reference_dict), 6)
# haven't any subobject not
# yet added)
self.assertEqual(set(model_reference_dict[model_employee.getRelativeUrl()]), self.assertEqual(set(model_reference_dict[model_employee.getRelativeUrl()]),
set(['1', 'over_time_duration'])) set(['1', 'over_time_duration']))
self.assertEqual(set(model_reference_dict[model_company.getRelativeUrl()]), self.assertEqual(set(model_reference_dict[model_company.getRelativeUrl()]),
set(['2', 'worked_time_duration'])) set(['2', 'worked_time_duration']))
self.assertEqual(model_reference_dict[model_a.getRelativeUrl()], ['5',])
self.assertEqual(set(model_reference_dict[model_c.getRelativeUrl()]),
set(['6', '7', '8']))
self.assertEqual(set(model_reference_dict[model_country.getRelativeUrl()]), self.assertEqual(set(model_reference_dict[model_country.getRelativeUrl()]),
set(['3','4', 'social_insurance'])) set(['3','4', 'social_insurance']))
self.assertEqual(model_reference_dict[model_a.getRelativeUrl()], ['5',])
self.assertEqual(model_reference_dict[model_b.getRelativeUrl()], ['6',])
self.assertEqual(set(model_reference_dict[model_c.getRelativeUrl()]),
set(['7', '8']))
# copy sub object from all inhéritance models into the a paysheet # copy sub object from all inhéritance models into the a paysheet
......
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