diff options
Diffstat (limited to 'archaeological_finds/tests.py')
| -rw-r--r-- | archaeological_finds/tests.py | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index a692cfc9f..688699d3e 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -2539,16 +2539,20 @@ class GeomaticTest(FindInit, TestCase): point_2d_bf = GEOSGeometry("POINT({} {})".format(3.9, 2.9), srid=4326) xy_bf = 3.9, 2.9 + pks = {'cr': {}, 'bf': {}} + ope.multi_polygon = "SRID=4326;" + poly_ope ope.multi_polygon_source = "P" ope.multi_polygon_source_item = str(ope._meta.verbose_name) ope.spatial_reference_system = wgs84 if geom_ope == "Point": ope.point = point_ope + ope.point_source = "P" + ope.point_source_item = str(ope._meta.verbose_name) ope.x, ope.y = xy_ope ope.point_2d = point_2d_ope - ope.save() # needs 2 saves because point_2d is none for multi_polygon - ope = Operation.objects.get(pk=ope.pk) + ope.save() # needs 2 saves because point_2d is none for multi_polygon + ope = Operation.objects.get(pk=ope.pk) ope.save() ope = Operation.objects.get(pk=ope.pk) @@ -2557,21 +2561,25 @@ class GeomaticTest(FindInit, TestCase): "operation": ope, } cr = ContextRecord.objects.create(**default) + cr = ContextRecord.objects.get(pk=cr.pk) cr.multi_polygon = "SRID=4326;" + poly_cr cr.multi_polygon_source = "P" - cr.multi_polygon_source_item = str(ContextRecord._meta.verbose_name) + cr.multi_polygon_source_item = str(cr._meta.verbose_name) cr.spatial_reference_system = wgs84 if geom_cr == "Point": cr.point = point_cr + cr.point_source = "P" + cr.point_source_item = str(cr._meta.verbose_name) cr.x, cr.y = xy_cr cr.point_2d = point_2d_cr cr.save() cr = ContextRecord.objects.get(pk=cr.pk) + pks['cr'][label_cr] = cr.pk bfs = [] - for i in range(len(list_geom_bf)): + for bf_geom in list_geom_bf: default = { - "label": "Find " + str(i + 1) + " from " + label_cr, + "label": "Find " + bf_geom + " from " + label_cr, "context_record": cr, } bf = models.BaseFind.objects.create(**default) @@ -2579,23 +2587,21 @@ class GeomaticTest(FindInit, TestCase): bf.multi_polygon_source = "P" bf.multi_polygon_source_item = str(bf._meta.verbose_name) bf.spatial_reference_system = wgs84 - if list_geom_bf[i] == "Point": + if bf_geom == "Point": bf.point = point_bf + bf.point_source = "P" + bf.point_source_item = str(bf._meta.verbose_name) bf.x, bf.y = xy_bf bf.point_2d = point_2d_bf bf.save() bf = models.BaseFind.objects.get(pk=bf.pk) - bf.save() - bf = models.BaseFind.objects.get(pk=bf.pk) - bf.save() - bf = models.BaseFind.objects.get(pk=bf.pk) bfs.append(bf) + pks['bf'][default['label']] = bf.pk - data = {} - find = models.Find.objects.create(**data) + find = models.Find.objects.create() find.base_finds.add(bf) find.save() - return cr, bfs + return pks def test_get_geo_items(self): wgs84 = SpatialReferenceSystem.objects.get(srid=4326) @@ -3301,7 +3307,7 @@ class SeleniumTestsBaseFinds(SeleniumTests): def test_geo_items(self): self.selenium.implicitly_wait(5) - geo_elements = self.setUpDefaultGeoItems() + geo_elements, ope_pks = self.setUpDefaultGeoItems() poly_bf, centr_bf, pt_bf = geo_elements[2] dic_polygon = { |