get additional addresses for rank 30 objects

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

diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py
index 4e6ec1ff5ab02c6d3556cd17877ca48376c370d6..65d5dccfcad4975a718cc9b27bf0e3344e40f04f 100644 (file)
--- a/test/bdd/steps/queries.py
+++ b/test/bdd/steps/queries.py
@@ -9,7 +9,6 @@ import os
 import io
 import re
 import logging
 import io
 import re
 import logging

-from tidylib import tidy_document

 import xml.etree.ElementTree as ET
 import subprocess
 from urllib.parse import urlencode
 import xml.etree.ElementTree as ET
 import subprocess
 from urllib.parse import urlencode


@@ -115,24 +114,9 @@ class SearchResponse(GenericResponse):
         self.result = geojson_results_to_json_results(self.result)
 
     def parse_geocodejson(self):
         self.result = geojson_results_to_json_results(self.result)
 
     def parse_geocodejson(self):

-        return self.parse_geojson()
-
-    def parse_html(self):
-        content, errors = tidy_document(self.page,
-                                        options={'char-encoding' : 'utf8'})
-        #eq_(len(errors), 0 , "Errors found in HTML document:\n%s" % errors)
-
-        self.result = []
-        b = content.find('nominatim_results =')
-        e = content.find('</script>')
-        if b >= 0 and e >= 0:
-            content = content[b:e]
-
-            b = content.find('[')
-            e = content.rfind(']')
-            if b >= 0 and e >= 0:
-                self.result = json.JSONDecoder(object_pairs_hook=OrderedDict)\
-                                  .decode(content[b:e+1])
+        self.parse_geojson()
+        if self.result is not None:
+            self.result = [r['geocoding'] for r in self.result]

 
     def parse_xml(self):
         et = ET.fromstring(self.page)
 
     def parse_xml(self):
         et = ET.fromstring(self.page)


@@ -174,19 +158,6 @@ class ReverseResponse(GenericResponse):
         if errorcode == 200:
             getattr(self, 'parse_' + fmt)()
 
         if errorcode == 200:
             getattr(self, 'parse_' + fmt)()
 

-    def parse_html(self):
-        content, errors = tidy_document(self.page,
-                                        options={'char-encoding' : 'utf8'})
-        #eq_(len(errors), 0 , "Errors found in HTML document:\n%s" % errors)
-
-        b = content.find('nominatim_results =')
-        e = content.find('</script>')
-        content = content[b:e]
-        b = content.find('[')
-        e = content.rfind(']')
-
-        self.result = json.JSONDecoder(object_pairs_hook=OrderedDict).decode(content[b:e+1])
-

     def parse_json(self):
         m = re.fullmatch(r'([\w$][^(]*)\((.*)\)', self.page)
         if m is None:
     def parse_json(self):
         m = re.fullmatch(r'([\w$][^(]*)\((.*)\)', self.page)
         if m is None:


@@ -203,7 +174,9 @@ class ReverseResponse(GenericResponse):
         self.result = geojson_results_to_json_results(self.result[0])
 
     def parse_geocodejson(self):
         self.result = geojson_results_to_json_results(self.result[0])
 
     def parse_geocodejson(self):

-        return self.parse_geojson()
+        self.parse_geojson()
+        if self.result is not None:
+            self.result = [r['geocoding'] for r in self.result]

 
     def parse_xml(self):
         et = ET.fromstring(self.page)
 
     def parse_xml(self):
         et = ET.fromstring(self.page)


@@ -247,11 +220,6 @@ class DetailsResponse(GenericResponse):
         if errorcode == 200:
             getattr(self, 'parse_' + fmt)()
 
         if errorcode == 200:
             getattr(self, 'parse_' + fmt)()
 

-    def parse_html(self):
-        content, errors = tidy_document(self.page,
-                                        options={'char-encoding' : 'utf8'})
-        self.result = {}
-

     def parse_json(self):
         self.result = [json.JSONDecoder(object_pairs_hook=OrderedDict).decode(self.page)]
 
     def parse_json(self):
         self.result = [json.JSONDecoder(object_pairs_hook=OrderedDict).decode(self.page)]
 


@@ -404,9 +372,7 @@ def website_search_request(context, fmt, query, addr):
 
     outp, status = send_api_query('search', params, fmt, context)
 
 
     outp, status = send_api_query('search', params, fmt, context)
 

-    if fmt is None:
-        outfmt = 'html'
-    elif fmt == 'jsonv2 ':
+    if fmt is None or fmt == 'jsonv2 ':

         outfmt = 'json'
     else:
         outfmt = fmt.strip()
         outfmt = 'json'
     else:
         outfmt = fmt.strip()


@@ -443,7 +409,7 @@ def website_details_request(context, fmt, query):
     outp, status = send_api_query('details', params, fmt, context)
 
     if fmt is None:
     outp, status = send_api_query('details', params, fmt, context)
 
     if fmt is None:

-        outfmt = 'html'
+        outfmt = 'json'

     else:
         outfmt = fmt.strip()
 
     else:
         outfmt = fmt.strip()
 


@@ -504,9 +470,7 @@ def check_page_error(context, fmt):
     context.execute_steps("Then a HTTP 400 is returned")
     eq_(context.response.format, fmt)
 
     context.execute_steps("Then a HTTP 400 is returned")
     eq_(context.response.format, fmt)
 

-    if fmt == 'html':
-        assert_is_not_none(re.search(r'<html( |>).+</html>', context.response.page, re.DOTALL))
-    elif fmt == 'xml':
+    if fmt == 'xml':

         assert_is_not_none(re.search(r'<error>.+</error>', context.response.page, re.DOTALL))
     else:
         assert_is_not_none(re.search(r'({"error":)', context.response.page, re.DOTALL))
         assert_is_not_none(re.search(r'<error>.+</error>', context.response.page, re.DOTALL))
     else:
         assert_is_not_none(re.search(r'({"error":)', context.response.page, re.DOTALL))


@@ -579,8 +543,8 @@ def check_address(context, lid, neg, attrs):
         else:
             assert_in(attr, addr_parts)
 
         else:
             assert_in(attr, addr_parts)
 

-@then(u'address of result (?P<lid>\d+) is')
-def check_address(context, lid):
+@then(u'address of result (?P<lid>\d+) (?P<complete>is|contains)')
+def check_address(context, lid, complete):

     context.execute_steps("then more than %s results are returned" % lid)
 
     addr_parts = dict(context.response.result[int(lid)]['address'])
     context.execute_steps("then more than %s results are returned" % lid)
 
     addr_parts = dict(context.response.result[int(lid)]['address'])


@@ -591,7 +555,8 @@ def check_address(context, lid):
                      "Bad address value for %s" % line['type'])
         del addr_parts[line['type']]
 
                      "Bad address value for %s" % line['type'])
         del addr_parts[line['type']]
 

-    eq_(0, len(addr_parts), "Additional address parts found: %s" % str(addr_parts))
+    if complete == 'is':
+        eq_(0, len(addr_parts), "Additional address parts found: %s" % str(addr_parts))

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