Merge remote-tracking branch 'upstream/master'

[nominatim.git] / tests / features / api / reverse_simple.feature

diff --git a/tests/features/api/reverse_simple.feature b/tests/features/api/reverse_simple.feature
index 7d564dde77e0fb656d97204655c5a0c806ccfbf6..6100f54c623df10155e320cafccb771f4cf84729 100644 (file)
--- a/tests/features/api/reverse_simple.feature
+++ b/tests/features/api/reverse_simple.feature
@@ -17,6 +17,49 @@ Feature: Simple Reverse Tests
      | -79.34   | 23.5
      | 0.23     | -178.555
 
      | -79.34   | 23.5
      | 0.23     | -178.555
 

+    Scenario Outline: Testing different parameters
+        Given the request parameters
+          | <parameter>
+          | <value>
+        When sending search query "Manchester"
+        Then the result is valid html
+        Given the request parameters
+          | <parameter>
+          | <value>
+        When sending html search query "Manchester"
+        Then the result is valid html
+        Given the request parameters
+          | <parameter>
+          | <value>
+        When sending xml search query "Manchester"
+        Then the result is valid xml
+        Given the request parameters
+          | <parameter>
+          | <value>
+        When sending json search query "Manchester"
+        Then the result is valid json
+        Given the request parameters
+          | <parameter>
+          | <value>
+        When sending jsonv2 search query "Manchester"
+        Then the result is valid json
+
+    Examples:
+     | parameter        | value
+     | polygon          | 1
+     | polygon          | 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
+
+
+
+

     Scenario Outline: Wrapping of legal jsonp requests
         Given the request parameters
         | json_callback
     Scenario Outline: Wrapping of legal jsonp requests
         Given the request parameters
         | json_callback


@@ -56,35 +99,35 @@ Feature: Simple Reverse Tests
           | lat
           | 51.51
         When sending an API call reverse
           | lat
           | 51.51
         When sending an API call reverse

-        Then exactly 0 results are returned
+        Then a HTTP 400 is returned

 
     Scenario: Missing lat parameter
         Given the request parameters
           | lon
           | -79.39114
         When sending an API call reverse
 
     Scenario: Missing lat parameter
         Given the request parameters
           | lon
           | -79.39114
         When sending an API call reverse

-        Then exactly 0 results are returned
+        Then a HTTP 400 is returned

 
     Scenario: Missing osm_id parameter
         Given the request parameters
           | osm_type
           | N
         When sending an API call reverse
 
     Scenario: Missing osm_id parameter
         Given the request parameters
           | osm_type
           | N
         When sending an API call reverse

-        Then exactly 0 results are returned
+        Then a HTTP 400 is returned

 
     Scenario: Missing osm_type parameter
         Given the request parameters
           | osm_id
           | 3498564
         When sending an API call reverse
 
     Scenario: Missing osm_type parameter
         Given the request parameters
           | osm_id
           | 3498564
         When sending an API call reverse

-        Then exactly 0 results are returned
+        Then a HTTP 400 is returned

 
     Scenario Outline: Bad format for lat or lon
         Given the request parameters
           | lat   | lon   |
           | <lat> | <lon> |
         When sending an API call reverse
 
     Scenario Outline: Bad format for lat or lon
         Given the request parameters
           | lat   | lon   |
           | <lat> | <lon> |
         When sending an API call reverse

-        Then exactly 0 results are returned
+        Then a HTTP 400 is returned

 
     Examples:
      | lat      | lon
 
     Examples:
      | lat      | lon