From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 1 Jan 2017 16:58:21 +0000 (+0100)
Subject: add test for moreURL issue and debugging of test query contents
X-Git-Tag: v3.0.0~83
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d18bd14045ef31342a8af5834f760532ef9d7487?ds=inline

add test for moreURL issue and debugging of test query contents
---

diff --git a/test/bdd/api/search/simple.feature b/test/bdd/api/search/simple.feature
index 4d77eac4..b986d8a7 100644
--- a/test/bdd/api/search/simple.feature
+++ b/test/bdd/api/search/simple.feature
@@ -219,3 +219,10 @@ Feature: Simple Tests
         When sending json search query "-21.0,-33.0"
         Then exactly 0 results are returned
 
+    Scenario: Country code selection is retained in more URL (#596)
+        When sending xml search query "Vaduz"
+          | countrycodes |
+          | pl,1,,invalid,undefined,%3Cb%3E,bo,, |
+       Then result header contains
+          | attr     | value |
+          | more_url | .*&countrycodes=pl,bo&.* |
diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py
index c429f082..55285d6a 100644
--- a/test/bdd/steps/queries.py
+++ b/test/bdd/steps/queries.py
@@ -8,6 +8,7 @@ import json
 import os
 import io
 import re
+import logging
 from tidylib import tidy_document
 import xml.etree.ElementTree as ET
 import subprocess
@@ -15,6 +16,8 @@ from urllib.parse import urlencode
 from collections import OrderedDict
 from nose.tools import * # for assert functions
 
+logger = logging.getLogger(__name__)
+
 BASE_SERVER_ENV = {
     'HTTP_HOST' : 'localhost',
     'HTTP_USER_AGENT' : 'Mozilla/5.0 (X11; Linux x86_64; rv:51.0) Gecko/20100101 Firefox/51.0',
@@ -274,6 +277,8 @@ def send_api_query(endpoint, params, fmt, context):
                                           '%s.php' % endpoint)
     env['NOMINATIM_SETTINGS'] = context.nominatim.local_settings_file
 
+    logger.debug("Environment:" + json.dumps(env, sort_keys=True, indent=2))
+
     if hasattr(context, 'http_headers'):
         env.update(context.http_headers)
 
@@ -285,14 +290,16 @@ def send_api_query(endpoint, params, fmt, context):
                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
     (outp, err) = proc.communicate()
+    outp = outp.decode('utf-8')
+
+    logger.debug("Result: \n===============================\n"
+                 + outp + "\n===============================\n")
 
     assert_equals(0, proc.returncode,
                   "query.php failed with message: %s\noutput: %s" % (err, outp))
 
     assert_equals(0, len(err), "Unexpected PHP error: %s" % (err))
 
-    outp = outp.decode('utf-8')
-
     if outp.startswith('Status: '):
         status = int(outp[8:11])
     else: