X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0d189ac5df8341e80a118bc8e67e126d03cd5302..e1b096cf8cf1ac6904c9adf0963f0e1756ca65ea:/test/bdd/api/search/simple.feature?ds=inline

diff --git a/test/bdd/api/search/simple.feature b/test/bdd/api/search/simple.feature
index fe2d684e..b9323c5a 100644
--- a/test/bdd/api/search/simple.feature
+++ b/test/bdd/api/search/simple.feature
@@ -3,58 +3,47 @@ Feature: Simple Tests
     Simple tests for internal server errors and response format.
 
     Scenario Outline: Testing different parameters
-        When sending search query "Hamburg"
+        When sending search query "Vaduz"
           | param       | value   |
           | <parameter> | <value> |
         Then at least 1 result is returned
-        When sending html search query "Hamburg"
-          | param       | value   |
-          | <parameter> | <value> |
-        Then at least 1 result is returned
-        When sending xml search query "Hamburg"
+        When sending xml search query "Vaduz"
           | param       | value   |
           | <parameter> | <value> |
         Then at least 1 result is returned
-        When sending json search query "Hamburg"
+        When sending json search query "Vaduz"
           | param       | value   |
           | <parameter> | <value> |
         Then at least 1 result is returned
-        When sending jsonv2 search query "Hamburg"
+        When sending jsonv2 search query "Vaduz"
           | param       | value   |
           | <parameter> | <value> |
         Then at least 1 result is returned
-        When sending geojson search query "Hamburg"
+        When sending geojson search query "Vaduz"
           | param       | value   |
           | <parameter> | <value> |
         Then at least 1 result is returned
-        When sending geocodejson search query "Hamburg"
+        When sending geocodejson search query "Vaduz"
           | param       | value   |
           | <parameter> | <value> |
         Then at least 1 result is returned
 
     Examples:
      | parameter        | value |
-     | addressdetails   | 1 |
      | addressdetails   | 0 |
-     | polygon_text     | 1 |
      | polygon_text     | 0 |
-     | polygon_kml      | 1 |
      | polygon_kml      | 0 |
-     | polygon_geojson  | 1 |
      | polygon_geojson  | 0 |
-     | polygon_svg      | 1 |
      | polygon_svg      | 0 |
      | accept-language  | de,en |
-     | countrycodes     | de |
+     | countrycodes     | li |
      | bounded          | 1 |
      | bounded          | 0 |
      | exclude_place_ids| 385252,1234515 |
      | limit            | 1000 |
      | dedupe           | 1 |
      | dedupe           | 0 |
-     | extratags        | 1 |
      | extratags        | 0 |
-     | namedetails      | 1 |
      | namedetails      | 0 |
 
     Scenario: Search with invalid output format
@@ -65,9 +54,7 @@ Feature: Simple Tests
 
     Scenario Outline: Simple Searches
         When sending search query "<query>"
-        Then the result is valid html
-        When sending html search query "<query>"
-        Then the result is valid html
+        Then the result is valid json
         When sending xml search query "<query>"
         Then the result is valid xml
         When sending json search query "<query>"
@@ -185,18 +172,17 @@ Feature: Simple Tests
           | json_callback |
           | 234 |
         Then the result is valid xml
-        When sending html search query "Malibu"
-          | json_callback |
-          | 234 |
-        Then the result is valid html
 
-    Scenario: Empty JSON search
-        When sending json search query "YHlERzzx"
+    Scenario Outline: Empty search
+        When sending <format> search query "YHlERzzx"
         Then exactly 0 results are returned
 
-    Scenario: Empty JSONv2 search
-        When sending jsonv2 search query "Flubb XdfESSaZx"
-        Then exactly 0 results are returned
+    Examples:
+        | format |
+        | json |
+        | jsonv2 |
+        | geojson |
+        | geocodejson |
 
     Scenario: Search for non-existing coordinates
         When sending json search query "-21.0,-33.0"
@@ -210,13 +196,15 @@ Feature: Simple Tests
           | attr     | value |
           | more_url | .*&countrycodes=pl%2Cbo&.* |
 
-    Scenario Outline: Search with debug prints valid HTML
-        When sending html search query "<query>"
-          | extratags | addressdetails | namedetails | debug |
-          | 1         | 1              | 1           | 1     |
-        Then the result is valid html
+    Scenario Outline: Search debug output does not return errors
+        When sending debug search query "<query>"
+        Then a HTTP 200 is returned
 
-        Examples:
-          | query |
-          | 10, Alvierweg, 9490, Vaduz |
-          | Hamburg |
+    Examples:
+        | query |
+        | Liechtenstein |
+        | Triesen |
+        | Pfarrkirche |
+        | Landstr 27 Steinort, Triesenberg, 9495 |
+        | 9497 |
+        | restaurant in triesen |