diff options
Diffstat (limited to 'ishtar_common/tests.py')
| -rw-r--r-- | ishtar_common/tests.py | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 9ed7394ea..ced35a672 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -3217,7 +3217,6 @@ class SeleniumTests(StaticLiveServerTestCase): from selenium.webdriver.support.wait import WebDriverWait from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as EC - from archaeological_operations.models import Operation @classmethod def setUpClass(cls): @@ -3257,10 +3256,20 @@ class SeleniumTests(StaticLiveServerTestCase): ope1 = create_operation(self.user) ope2 = create_operation(self.user) - GeomaticFindsTest.create_cr_with_bfs(ope1, "Point", "Point", ["Polygon", "Point"], "CR Pt Poly Pt") - GeomaticFindsTest.create_cr_with_bfs(ope1, "Point", "Polygon", ["Polygon", "Point"], "CR Poly Poly Pt") - GeomaticFindsTest.create_cr_with_bfs(ope2, "Polygon", "Point", ["Polygon", "Point"], "CR Pt Poly Pt") - GeomaticFindsTest.create_cr_with_bfs(ope2, "Polygon", "Polygon", ["Polygon", "Point"], "CR Poly Poly Pt") + pks = {'ope': {'Pt': ope1.pk, 'Poly': ope2.pk}, 'cr': {}, 'bf': {}} + + 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) geom_ope = [ [[[[1, 1], [5, 1], [5, 5], [1, 5], [1, 1]], [[2, 2], [2, 3], [3, 3], [3, 2], [2, 2]]], @@ -3271,7 +3280,7 @@ class SeleniumTests(StaticLiveServerTestCase): geom_cr = [ [[[[2, 1], [5, 1], [5, 5], [1, 5], [2, 1]], [[2, 2], [2, 3], [3, 3], [3, 2], [2, 2]]], [[[6, 3], [9, 2], [9, 4], [6, 3]]]], - [3.86111, 3.02778], #TODO: change it + [4.17708, 3.11458], [3.9, 3] ] geom_bf = [ @@ -3280,7 +3289,8 @@ class SeleniumTests(StaticLiveServerTestCase): [4.42105, 2.73684], [3.9, 2.9] ] - return [geom_ope, geom_cr, geom_bf] + return [geom_ope, geom_cr, geom_bf], [ope1.pk, ope2.pk] + def scroll(self, element): self.selenium.execute_script( |