Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py
index 963aad4dffcdca526cef9bc7e1ed1a5496ef5d00..5779c7637b301b188a443fb6e85835345d7cf89d 100644 (file)
--- a/test/bdd/steps/queries.py
+++ b/test/bdd/steps/queries.py
@@ -232,12 +232,17 @@ class DetailsResponse(GenericResponse):
                                         options={'char-encoding' : 'utf8'})
         self.result = {}
 
                                         options={'char-encoding' : 'utf8'})
         self.result = {}
 

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

 @when(u'searching for "(?P<query>.*)"(?P<dups> with dups)?')
 def query_cmd(context, query, dups):
     """ Query directly via PHP script.
     """
 @when(u'searching for "(?P<query>.*)"(?P<dups> with dups)?')
 def query_cmd(context, query, dups):
     """ Query directly via PHP script.
     """

-    cmd = [os.path.join(context.nominatim.build_dir, 'utils', 'query.php'),
-           '--search', query]
+    cmd = ['/usr/bin/env', 'php']
+    cmd.append(os.path.join(context.nominatim.build_dir, 'utils', 'query.php'))
+    cmd.extend(['--search', query])

     # add more parameters in table form
     if context.table:
         for h in context.table.headings:
     # add more parameters in table form
     if context.table:
         for h in context.table.headings:


@@ -282,7 +287,7 @@ def send_api_query(endpoint, params, fmt, context):
     if hasattr(context, 'http_headers'):
         env.update(context.http_headers)
 
     if hasattr(context, 'http_headers'):
         env.update(context.http_headers)
 

-    cmd = ['/usr/bin/php-cgi', '-f']
+    cmd = ['/usr/bin/env', 'php-cgi', '-f']

     if context.nominatim.code_coverage_path:
         env['COV_SCRIPT_FILENAME'] = env['SCRIPT_FILENAME']
         env['COV_PHP_DIR'] = os.path.join(context.nominatim.src_dir, "lib")
     if context.nominatim.code_coverage_path:
         env['COV_SCRIPT_FILENAME'] = env['SCRIPT_FILENAME']
         env['COV_PHP_DIR'] = os.path.join(context.nominatim.src_dir, "lib")


@@ -307,7 +312,7 @@ def send_api_query(endpoint, params, fmt, context):
                  + outp + "\n===============================\n")
 
     assert_equals(0, proc.returncode,
                  + outp + "\n===============================\n")
 
     assert_equals(0, proc.returncode,

-                  "query.php failed with message: %s\noutput: %s" % (err, outp))
+                  "%s failed with message: %s\noutput: %s" % (env['SCRIPT_FILENAME'], err, outp))

 
     assert_equals(0, len(err), "Unexpected PHP error: %s" % (err))
 
 
     assert_equals(0, len(err), "Unexpected PHP error: %s" % (err))
 


@@ -378,7 +383,12 @@ def website_details_request(context, fmt, query):
         params['place_id'] = query
     outp, status = send_api_query('details', params, fmt, context)
 
         params['place_id'] = query
     outp, status = send_api_query('details', params, fmt, context)
 

-    context.response = DetailsResponse(outp, 'html', status)
+    if fmt is None:
+        outfmt = 'html'
+    else:
+        outfmt = fmt.strip()
+
+    context.response = DetailsResponse(outp, outfmt, status)

 
 @when(u'sending (?P<fmt>\S+ )?lookup query for (?P<query>.*)')
 def website_lookup_request(context, fmt, query):
 
 @when(u'sending (?P<fmt>\S+ )?lookup query for (?P<query>.*)')
 def website_lookup_request(context, fmt, query):


@@ -392,7 +402,6 @@ def website_lookup_request(context, fmt, query):
 
     context.response = SearchResponse(outp, outfmt, status)
 
 
     context.response = SearchResponse(outp, outfmt, status)
 

-

 @step(u'(?P<operator>less than|more than|exactly|at least|at most) (?P<number>\d+) results? (?:is|are) returned')
 def validate_result_number(context, operator, number):
     eq_(context.response.errorcode, 200)
 @step(u'(?P<operator>less than|more than|exactly|at least|at most) (?P<number>\d+) results? (?:is|are) returned')
 def validate_result_number(context, operator, number):
     eq_(context.response.errorcode, 200)