Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/api/reverse/simple.feature b/test/bdd/api/reverse/simple.feature
index 3f307e0e2d1420e9f9070f161bab8dbba97192b2..4da311e78a9270b9250ffabe5400b1d68fa2e6df 100644 (file)
--- a/test/bdd/api/reverse/simple.feature
+++ b/test/bdd/api/reverse/simple.feature
@@ -13,8 +13,6 @@ Feature: Simple Reverse Tests
         Then the result is valid json
         When sending geojson reverse coordinates <lat>,<lon>
         Then the result is valid geojson
         Then the result is valid json
         When sending geojson reverse coordinates <lat>,<lon>
         Then the result is valid geojson

-        When sending html reverse coordinates <lat>,<lon>
-        Then the result is valid html

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


@@ -28,10 +26,6 @@ Feature: Simple Reverse Tests
           | param       | value   |
           | <parameter> | <value> |
         Then the result is valid xml
           | param       | value   |
           | <parameter> | <value> |
         Then the result is valid xml

-        When sending html reverse coordinates 53.603,10.041
-          | param       | value   |
-          | <parameter> | <value> |
-        Then the result is valid html

         When sending xml reverse coordinates 53.603,10.041
           | param       | value   |
           | <parameter> | <value> |
         When sending xml reverse coordinates 53.603,10.041
           | param       | value   |
           | <parameter> | <value> |


@@ -48,11 +42,13 @@ Feature: Simple Reverse Tests
           | param       | value   |
           | <parameter> | <value> |
         Then the result is valid geojson
           | param       | value   |
           | <parameter> | <value> |
         Then the result is valid geojson

+        When sending geocodejson reverse coordinates 53.603,10.041
+          | param       | value   |
+          | <parameter> | <value> |
+        Then the result is valid geocodejson

 
     Examples:
      | parameter        | value |
 
     Examples:
      | parameter        | value |

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

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


@@ -75,10 +71,10 @@ Feature: Simple Reverse Tests
       | geojson | geojson |
 
     Scenario Outline: Boundingbox is returned
       | geojson | geojson |
 
     Scenario Outline: Boundingbox is returned

-        When sending <format> reverse coordinates 14.62,108.1
+        When sending <format> reverse coordinates 47.11,9.57

           | zoom |
           | zoom |

-          | 4 |
-        Then result has bounding box in 9,20,102,113
+          | 8 |
+        Then result has bounding box in 47,48,9,10

 
     Examples:
       | format |
 
     Examples:
       | format |


@@ -88,7 +84,7 @@ Feature: Simple Reverse Tests
       | xml |
 
     Scenario Outline: Reverse-geocoding with zoom
       | xml |
 
     Scenario Outline: Reverse-geocoding with zoom

-        When sending <format> reverse coordinates 53.603,10.041
+        When sending <format> reverse coordinates 47.11,9.57

           | zoom |
           | 10 |
         Then exactly 1 result is returned
           | zoom |
           | 10 |
         Then exactly 1 result is returned


@@ -98,7 +94,6 @@ Feature: Simple Reverse Tests
       | json |
       | jsonv2 |
       | geojson |
       | json |
       | jsonv2 |
       | geojson |

-      | html |

       | xml |
 
     Scenario: Missing lon parameter
       | xml |
 
     Scenario: Missing lon parameter


@@ -136,3 +131,7 @@ Feature: Simple Reverse Tests
      | 48.966   | 8.448.2 |
      | Nan      | 8.448 |
      | 48.966   | Nan |
      | 48.966   | 8.448.2 |
      | Nan      | 8.448 |
      | 48.966   | Nan |

+
+     Scenario: Reverse Debug output returns no errors
+        When sending debug reverse coordinates 47.11,9.57
+        Then a HTTP 200 is returned