bdd: replace property_list construct with standard check functions

diff --git a/test/bdd/steps/http_responses.py b/test/bdd/steps/http_responses.py
index a3493b975790441881f8b76115d7567edd9535dd..ccf247a91de86c0dd7cda64a8fd1b1cc0c597b3d 100644 (file)
--- a/test/bdd/steps/http_responses.py
+++ b/test/bdd/steps/http_responses.py
@@ -152,10 +152,6 @@ class GenericResponse:
                     self.check_row_field(i, name, Field(value))
 
 
                     self.check_row_field(i, name, Field(value))
 
 

-    def property_list(self, prop):
-        return [x[prop] for x in self.result]
-
-

     def check_row(self, idx, check, msg):
         """ Assert for the condition 'check' and print 'msg' on fail together
             with the contents of the failing result.
     def check_row(self, idx, check, msg):
         """ Assert for the condition 'check' and print 'msg' on fail together
             with the contents of the failing result.

diff --git a/test/bdd/steps/steps_api_queries.py b/test/bdd/steps/steps_api_queries.py
index cf133c05e5c39f11b8c5490c1d89958ca32f46ff..9ae9d7ae007865edff136340fdad0ab631526899 100644 (file)
--- a/test/bdd/steps/steps_api_queries.py
+++ b/test/bdd/steps/steps_api_queries.py
@@ -314,36 +314,42 @@ def check_address(context, lid, complete):
     if complete == 'is':
         assert len(addr_parts) == 0, "Additional address parts found: %s" % str(addr_parts)
 
     if complete == 'is':
         assert len(addr_parts) == 0, "Additional address parts found: %s" % str(addr_parts)
 

+

 @then(u'result (?P<lid>\d+ )?has bounding box in (?P<coords>[\d,.-]+)')
 @then(u'result (?P<lid>\d+ )?has bounding box in (?P<coords>[\d,.-]+)')

-def step_impl(context, lid, coords):
+def check_bounding_box_in_area(context, lid, coords):

     if lid is None:
         context.execute_steps("then at least 1 result is returned")
     if lid is None:
         context.execute_steps("then at least 1 result is returned")

-        bboxes = context.response.property_list('boundingbox')
+        todos = range(len(context.response.result))

     else:
     else:

-        context.execute_steps("then more than {}results are returned".format(lid))
-        bboxes = [context.response.result[int(lid)]['boundingbox']]
+        context.execute_steps(f"then more than {lid}results are returned")
+        todos = (int(lid), )

 
     expected = Bbox(coords)
 
 
     expected = Bbox(coords)
 

-    for bbox in bboxes:
-        assert bbox in expected, "Bbox {} is not contained in {}.".format(bbox, expected)
+    for idx in todos:
+        res = context.response.result[idx]
+        check_for_attributes(res, 'boundingbox')
+        context.response.check_row(idx, res['boundingbox'] in expected,
+                                   f"Bbox is not contained in {expected}")
+

 
 @then(u'result (?P<lid>\d+ )?has centroid in (?P<coords>[\d,.-]+)')
 
 @then(u'result (?P<lid>\d+ )?has centroid in (?P<coords>[\d,.-]+)')

-def step_impl(context, lid, coords):
+def check_centroid_in_area(context, lid, coords):

     if lid is None:
         context.execute_steps("then at least 1 result is returned")
     if lid is None:
         context.execute_steps("then at least 1 result is returned")

-        centroids = zip(context.response.property_list('lon'),
-                        context.response.property_list('lat'))
+        todos = range(len(context.response.result))

     else:
     else:

-        context.execute_steps("then more than %sresults are returned".format(lid))
-        res = context.response.result[int(lid)]
-        centroids = [(res['lon'], res['lat'])]
+        context.execute_steps(f"then more than {lid}results are returned")
+        todos = (int(lid), )

 
     expected = Bbox(coords)
 
 
     expected = Bbox(coords)
 

-    for centroid in centroids:
-        assert centroid in expected,\
-               "Centroid {} is not inside {}.".format(centroid, expected)
+    for idx in todos:
+        res = context.response.result[idx]
+        check_for_attributes(res, 'lat,lon')
+        context.response.check_row(idx, (res['lon'], res['lat']) in expected,
+                                   f"Centroid is not inside {expected}")
+

 
 @then(u'there are(?P<neg> no)? duplicates')
 def check_for_duplicates(context, neg):
 
 @then(u'there are(?P<neg> no)? duplicates')
 def check_for_duplicates(context, neg):