Merge pull request #2838 from lonvia/update-osm2pgsql

[nominatim.git] / test / bdd / api / search / simple.feature

diff --git a/test/bdd/api/search/simple.feature b/test/bdd/api/search/simple.feature
index c12635972dd29a48afb0cd9ed8f72b871da0334a..b9323c5a62d695734cf354176a661bd7b4b2f801 100644 (file)
--- a/test/bdd/api/search/simple.feature
+++ b/test/bdd/api/search/simple.feature
@@ -3,60 +3,47 @@ Feature: Simple Tests
     Simple tests for internal server errors and response format.
 
     Scenario Outline: Testing different parameters
     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
           | 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
           | 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
           | 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
           | 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
           | 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 |
           | param       | value   |
           | <parameter> | <value> |
         Then at least 1 result is returned
 
     Examples:
      | parameter        | value |

-     | addressdetails   | 1 |

      | addressdetails   | 0 |
      | addressdetails   | 0 |

-     | polygon          | 1 |
-     | polygon          | 0 |
-     | polygon_text     | 1 |

      | polygon_text     | 0 |
      | polygon_text     | 0 |

-     | polygon_kml      | 1 |

      | polygon_kml      | 0 |
      | polygon_kml      | 0 |

-     | polygon_geojson  | 1 |

      | polygon_geojson  | 0 |
      | polygon_geojson  | 0 |

-     | polygon_svg      | 1 |

      | polygon_svg      | 0 |
      | accept-language  | de,en |
      | 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 |
      | bounded          | 1 |
      | bounded          | 0 |
      | exclude_place_ids| 385252,1234515 |
      | limit            | 1000 |
      | dedupe           | 1 |
      | dedupe           | 0 |

-     | extratags        | 1 |

      | extratags        | 0 |
      | extratags        | 0 |

-     | namedetails      | 1 |

      | namedetails      | 0 |
 
     Scenario: Search with invalid output format
      | namedetails      | 0 |
 
     Scenario: Search with invalid output format


@@ -67,9 +54,7 @@ Feature: Simple Tests
 
     Scenario Outline: Simple Searches
         When sending search query "<query>"
 
     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>"
         When sending xml search query "<query>"
         Then the result is valid xml
         When sending json search query "<query>"


@@ -98,7 +83,6 @@ Feature: Simple Tests
         Then result header contains
           | attr        | value |
           | querystring | xnznxvcx |
         Then result header contains
           | attr        | value |
           | querystring | xnznxvcx |

-          | polygon     | false |

           | more_url    | .*q=xnznxvcx.*format=xml |
 
     Scenario: Empty XML search with special XML characters
           | more_url    | .*q=xnznxvcx.*format=xml |
 
     Scenario: Empty XML search with special XML characters


@@ -106,7 +90,6 @@ Feature: Simple Tests
         Then result header contains
           | attr        | value |
           | querystring | xfdghn&zxn"xvbyx<vxx>cssdex |
         Then result header contains
           | attr        | value |
           | querystring | xfdghn&zxn"xvbyx<vxx>cssdex |

-          | polygon     | false |

           | more_url    | .*q=xfdghn%26zxn%22xvbyx%3Cvxx%3Ecssdex.*format=xml |
 
     Scenario: Empty XML search with viewbox
           | more_url    | .*q=xfdghn%26zxn%22xvbyx%3Cvxx%3Ecssdex.*format=xml |
 
     Scenario: Empty XML search with viewbox


@@ -116,7 +99,6 @@ Feature: Simple Tests
         Then result header contains
           | attr        | value |
           | querystring | xnznxvcx |
         Then result header contains
           | attr        | value |
           | querystring | xnznxvcx |

-          | polygon     | false |

           | viewbox     | 12,33,77,45.13 |
 
     Scenario: Empty XML search with viewboxlbrt
           | viewbox     | 12,33,77,45.13 |
 
     Scenario: Empty XML search with viewboxlbrt


@@ -126,7 +108,6 @@ Feature: Simple Tests
         Then result header contains
           | attr        | value |
           | querystring | xnznxvcx |
         Then result header contains
           | attr        | value |
           | querystring | xnznxvcx |

-          | polygon     | false |

           | viewbox     | 12,34.13,77,45 |
 
     Scenario: Empty XML search with viewboxlbrt and viewbox
           | viewbox     | 12,34.13,77,45 |
 
     Scenario: Empty XML search with viewboxlbrt and viewbox


@@ -136,29 +117,8 @@ Feature: Simple Tests
         Then result header contains
           | attr        | value |
           | querystring | pub |
         Then result header contains
           | attr        | value |
           | querystring | pub |

-          | polygon     | false |

           | viewbox     | 12,33,77,45.13 |
 
           | viewbox     | 12,33,77,45.13 |
 

-    Scenario Outline: Empty XML search with polygon values
-        When sending xml search query "xnznxvcx"
-          | param   | value |
-          | polygon | <polyval> |
-        Then result header contains
-          | attr        | value |
-          | polygon     | <result> |
-
-    Examples:
-     | result | polyval |
-     | false  | 0 |
-     | true   | 1 |
-     | true   | True |
-     | true   | true |
-     | true   | false |
-     | true   | FALSE |
-     | true   | yes |
-     | true   | no |
-     | true   | '; delete from foobar; select ' |
-

     Scenario: Empty XML search with exluded place ids
         When sending xml search query "jghrleoxsbwjer"
           | exclude_place_ids |
     Scenario: Empty XML search with exluded place ids
         When sending xml search query "jghrleoxsbwjer"
           | exclude_place_ids |


@@ -212,18 +172,17 @@ Feature: Simple Tests
           | json_callback |
           | 234 |
         Then the result is valid xml
           | 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
 
         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"
 
     Scenario: Search for non-existing coordinates
         When sending json search query "-21.0,-33.0"


@@ -237,13 +196,15 @@ Feature: Simple Tests
           | attr     | value |
           | more_url | .*&countrycodes=pl%2Cbo&.* |
 
           | 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 |