X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0d189ac5df8341e80a118bc8e67e126d03cd5302..d97aed87411fad81eb93fd14a58bb22fdc16dd59:/test/bdd/steps/queries.py?ds=inline
diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py
index d3b1203b..7e88e337 100644
--- a/test/bdd/steps/queries.py
+++ b/test/bdd/steps/queries.py
@@ -9,7 +9,6 @@ import os
import io
import re
import logging
-from tidylib import tidy_document
import xml.etree.ElementTree as ET
import subprocess
from urllib.parse import urlencode
@@ -119,23 +118,6 @@ class SearchResponse(GenericResponse):
if self.result is not None:
self.result = [r['geocoding'] for r in self.result]
- 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('')
- 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])
-
def parse_xml(self):
et = ET.fromstring(self.page)
@@ -176,19 +158,6 @@ class ReverseResponse(GenericResponse):
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('')
- 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:
@@ -251,11 +220,6 @@ class DetailsResponse(GenericResponse):
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)]
@@ -318,6 +282,7 @@ def query_cmd(context, query, dups):
(outp, err) = proc.communicate()
assert_equals (0, proc.returncode, "query.php failed with message: %s\noutput: %s" % (err, outp))
+ logger.debug("run_nominatim_script: %s\n%s\n" % (cmd, outp.decode('utf-8').replace('\\n', '\n')))
context.response = SearchResponse(outp.decode('utf-8'), 'json')
@@ -408,9 +373,7 @@ def website_search_request(context, fmt, query, addr):
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()
@@ -447,7 +410,7 @@ def website_details_request(context, fmt, query):
outp, status = send_api_query('details', params, fmt, context)
if fmt is None:
- outfmt = 'html'
+ outfmt = 'json'
else:
outfmt = fmt.strip()
@@ -508,9 +471,7 @@ def check_page_error(context, 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').+', context.response.page, re.DOTALL))
- elif fmt == 'xml':
+ if fmt == 'xml':
assert_is_not_none(re.search(r'.+', context.response.page, re.DOTALL))
else:
assert_is_not_none(re.search(r'({"error":)', context.response.page, re.DOTALL))
@@ -583,8 +544,8 @@ def check_address(context, lid, neg, attrs):
else:
assert_in(attr, addr_parts)
-@then(u'address of result (?P\d+) is')
-def check_address(context, lid):
+@then(u'address of result (?P\d+) (?Pis|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'])
@@ -595,7 +556,8 @@ def check_address(context, lid):
"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\d+ )?has bounding box in (?P[\d,.-]+)')
def step_impl(context, lid, coords):