diff options
Diffstat (limited to 'ishtar_common/tests.py')
| -rw-r--r-- | ishtar_common/tests.py | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 33a7bf2dc..c8bbf4342 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -3176,20 +3176,12 @@ class SeleniumTests(StaticLiveServerTestCase): ope1 = create_operation(self.user) ope2 = create_operation(self.user) - pks = {'ope': {'Pt': ope1.pk, 'Poly': ope2.pk}, 'cr': {}, 'bf': {}} + pks = {'Pt': ope1.pk, 'Poly': ope2.pk} - def merge_pks(dic1, dic2): - for key in dic2.keys(): - for label in dic2[key]: - dic1[key][label] = dic2[key][label] - - merge_pks(pks, GeomaticFindsTest.create_cr_with_bfs(ope1, "Point", "Point", ["Polygon", "Point"], "CR Pt Pt")) - merge_pks(pks, GeomaticFindsTest.create_cr_with_bfs(ope1, "Point", "Polygon", ["Polygon", "Point"], "CR Pt Poly")) - merge_pks(pks, GeomaticFindsTest.create_cr_with_bfs(ope2, "Polygon", "Point", ["Polygon", "Point"], "CR Poly Pt")) - merge_pks(pks, GeomaticFindsTest.create_cr_with_bfs(ope2, "Polygon", "Polygon", ["Polygon", "Point"], "CR Poly Poly")) - - print('PKS AAAAAAAAAAAAAAAAA') - print(pks) + pks.update(GeomaticFindsTest.create_cr_with_bfs(ope1, "Point", "Point", ["Polygon", "Point"], "CR Pt Pt")) + pks.update(GeomaticFindsTest.create_cr_with_bfs(ope1, "Point", "Polygon", ["Polygon", "Point"], "CR Pt Poly")) + pks.update(GeomaticFindsTest.create_cr_with_bfs(ope2, "Polygon", "Point", ["Polygon", "Point"], "CR Poly Pt")) + pks.update(GeomaticFindsTest.create_cr_with_bfs(ope2, "Polygon", "Polygon", ["Polygon", "Point"], "CR Poly Poly")) geom_ope = [ [[[[1, 1], [5, 1], [5, 5], [1, 5], [1, 1]], [[2, 2], [2, 3], [3, 3], [3, 2], [2, 2]]], @@ -3209,7 +3201,7 @@ class SeleniumTests(StaticLiveServerTestCase): [4.42105, 2.73684], [3.9, 2.9] ] - return [geom_ope, geom_cr, geom_bf], [ope1.pk, ope2.pk] + return [geom_ope, geom_cr, geom_bf], pks def scroll(self, element): |