Merge pull request #2038 from lonvia/addresses-for-large-areas

[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 06c24a2ee014f002ea47ed50be2f9e76975f97db..50aa03b764065aa7a78de175b5792cd9e73338d8 100644 (file)
--- a/test/bdd/api/search/simple.feature
+++ b/test/bdd/api/search/simple.feature
@@ -7,10 +7,6 @@ Feature: Simple Tests
           | 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"
           | param       | value   |
           | <parameter> | <value> |
         When sending xml search query "Hamburg"
           | param       | value   |
           | <parameter> | <value> |


@@ -27,13 +23,15 @@ Feature: Simple Tests
           | 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"
+          | param       | value   |
+          | <parameter> | <value> |
+        Then at least 1 result is returned

 
     Examples:
      | parameter        | value |
      | addressdetails   | 1 |
      | addressdetails   | 0 |
 
     Examples:
      | parameter        | value |
      | addressdetails   | 1 |
      | addressdetails   | 0 |

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

      | polygon_text     | 1 |
      | polygon_text     | 0 |
      | polygon_kml      | 1 |
      | polygon_text     | 1 |
      | polygon_text     | 0 |
      | polygon_kml      | 1 |


@@ -63,9 +61,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>"


@@ -94,7 +90,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


@@ -102,7 +97,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


@@ -112,7 +106,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


@@ -122,7 +115,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


@@ -132,29 +124,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 |


@@ -190,7 +161,7 @@ Feature: Simple Tests
         When sending json search query "Tokyo"
             | param        | value |
             |json_callback | <data> |
         When sending json search query "Tokyo"
             | param        | value |
             |json_callback | <data> |

-        Then a HTTP 400 is returned
+        Then a json user error is returned

 
     Examples:
       | data |
 
     Examples:
       | data |


@@ -208,10 +179,6 @@ 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: Empty JSON search
         When sending json search query "YHlERzzx"


@@ -229,6 +196,6 @@ Feature: Simple Tests
         When sending xml search query "Vaduz"
           | countrycodes |
           | pl,1,,invalid,undefined,%3Cb%3E,bo,, |
         When sending xml search query "Vaduz"
           | countrycodes |
           | pl,1,,invalid,undefined,%3Cb%3E,bo,, |

-       Then result header contains
+        Then result header contains

           | attr     | value |
           | more_url | .*&countrycodes=pl%2Cbo&.* |
           | attr     | value |
           | more_url | .*&countrycodes=pl%2Cbo&.* |