bdd: fully check correctness of geojson and geocodejson

[nominatim.git] / test / bdd / steps / http_responses.py

diff --git a/test/bdd/steps/http_responses.py b/test/bdd/steps/http_responses.py
index 035838a5a9c0bf7952cfe62154942f54219b1039..aee0d7f069b62950292aab92cf6c983077b658a6 100644 (file)
--- a/test/bdd/steps/http_responses.py
+++ b/test/bdd/steps/http_responses.py
@@ -2,17 +2,16 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2022 by the Nominatim developer community.
+# Copyright (C) 2023 by the Nominatim developer community.

 # For a full list of authors see the git log.
 """
 Classes wrapping HTTP responses from the Nominatim API.
 """
 # For a full list of authors see the git log.
 """
 Classes wrapping HTTP responses from the Nominatim API.
 """

-from collections import OrderedDict

 import re
 import json
 import xml.etree.ElementTree as ET
 
 import re
 import json
 import xml.etree.ElementTree as ET
 

-from check_functions import Almost
+from check_functions import Almost, check_for_attributes

 
 OSM_TYPE = {'N' : 'node', 'W' : 'way', 'R' : 'relation',
             'n' : 'node', 'w' : 'way', 'r' : 'relation',
 
 OSM_TYPE = {'N' : 'node', 'W' : 'way', 'R' : 'relation',
             'n' : 'node', 'w' : 'way', 'r' : 'relation',


@@ -70,22 +69,54 @@ class GenericResponse:
         else:
             code = m.group(2)
             self.header['json_func'] = m.group(1)
         else:
             code = m.group(2)
             self.header['json_func'] = m.group(1)

-        self.result = json.JSONDecoder(object_pairs_hook=OrderedDict).decode(code)
-        if isinstance(self.result, OrderedDict):
+        self.result = json.JSONDecoder().decode(code)
+        if isinstance(self.result, dict):

             if 'error' in self.result:
                 self.result = []
             else:
                 self.result = [self.result]
 
             if 'error' in self.result:
                 self.result = []
             else:
                 self.result = [self.result]
 

+

     def _parse_geojson(self):
         self._parse_json()
         if self.result:
     def _parse_geojson(self):
         self._parse_json()
         if self.result:

-            self.result = list(map(_geojson_result_to_json_result, self.result[0]['features']))
+            geojson = self.result[0]
+            # check for valid geojson
+            check_for_attributes(geojson, 'type,features')
+            assert geojson['type'] == 'FeatureCollection'
+            assert isinstance(geojson['features'], list)
+
+            self.result = []
+            for result in geojson['features']:
+                check_for_attributes(result, 'type,properties,geometry')
+                assert result['type'] == 'Feature'
+                new = result['properties']
+                check_for_attributes(new, 'geojson', 'absent')
+                new['geojson'] = result['geometry']
+                if 'bbox' in result:
+                    check_for_attributes(new, 'boundingbox', 'absent')
+                    # bbox is  minlon, minlat, maxlon, maxlat
+                    # boundingbox is minlat, maxlat, minlon, maxlon
+                    new['boundingbox'] = [result['bbox'][1],
+                                          result['bbox'][3],
+                                          result['bbox'][0],
+                                          result['bbox'][2]]
+                for k, v in geojson.items():
+                    if k not in ('type', 'features'):
+                        check_for_attributes(new, '__' + k, 'absent')
+                        new['__' + k] = v
+                self.result.append(new)
+

 
     def _parse_geocodejson(self):
         self._parse_geojson()
 
     def _parse_geocodejson(self):
         self._parse_geojson()

-        if self.result is not None:
-            self.result = [r['geocoding'] for r in self.result]
+        if self.result:
+            for r in self.result:
+                assert set(r.keys()) == {'geocoding', 'geojson', '__geocoding'}, \
+                       f"Unexpected keys in result: {r.keys()}"
+                check_for_attributes(r['geocoding'], 'geojson', 'absent')
+                r |= r.pop('geocoding')
+

 
     def assert_field(self, idx, field, value):
         """ Check that result row `idx` has a field `field` with value `value`.
 
     def assert_field(self, idx, field, value):
         """ Check that result row `idx` has a field `field` with value `value`.


@@ -102,10 +133,33 @@ class GenericResponse:
         elif value.startswith("^"):
             assert re.fullmatch(value, self.result[idx][field]), \
                    BadRowValueAssert(self, idx, field, value)
         elif value.startswith("^"):
             assert re.fullmatch(value, self.result[idx][field]), \
                    BadRowValueAssert(self, idx, field, value)

+        elif isinstance(self.result[idx][field], dict):
+            assert self.result[idx][field] == eval('{' + value + '}'), \
+                   BadRowValueAssert(self, idx, field, value)

         else:
             assert str(self.result[idx][field]) == str(value), \
                    BadRowValueAssert(self, idx, field, value)
 
         else:
             assert str(self.result[idx][field]) == str(value), \
                    BadRowValueAssert(self, idx, field, value)
 

+
+    def assert_subfield(self, idx, path, value):
+        assert path
+
+        field = self.result[idx]
+        for p in path:
+            assert isinstance(field, dict)
+            assert p in field
+            field = field[p]
+
+        if isinstance(value, float):
+            assert Almost(value) == float(field)
+        elif value.startswith("^"):
+            assert re.fullmatch(value, field)
+        elif isinstance(field, dict):
+            assert field, eval('{' + value + '}')
+        else:
+            assert str(field) == str(value)
+
+

     def assert_address_field(self, idx, field, value):
         """ Check that result rows`idx` has a field `field` with value `value`
             in its address. If idx is None, then all results are checked.
     def assert_address_field(self, idx, field, value):
         """ Check that result rows`idx` has a field `field` with value `value`
             in its address. If idx is None, then all results are checked.


@@ -160,6 +214,8 @@ class GenericResponse:
                         raise RuntimeError("Context needed when using grid coordinates")
                     self.assert_field(i, 'lat', float(lat))
                     self.assert_field(i, 'lon', float(lon))
                         raise RuntimeError("Context needed when using grid coordinates")
                     self.assert_field(i, 'lat', float(lat))
                     self.assert_field(i, 'lon', float(lon))

+                elif '+' in name:
+                    self.assert_subfield(i, name.split('+'), value)

                 else:
                     self.assert_field(i, name, value)
 
                 else:
                     self.assert_field(i, name, value)