Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / query / normalization.feature

diff --git a/test/bdd/db/query/normalization.feature b/test/bdd/db/query/normalization.feature
index b8a760f99bd0bc03e127c14ae60de5f93fdf0290..162a59a48aa9351f9124db9b90fa3f562343ec95 100644 (file)
--- a/test/bdd/db/query/normalization.feature
+++ b/test/bdd/db/query/normalization.feature
@@ -3,6 +3,31 @@ Feature: Import and search of names
     Tests all naming related issues: normalisation,
     abbreviations, internationalisation, etc.
 
     Tests all naming related issues: normalisation,
     abbreviations, internationalisation, etc.
 

+    Scenario: non-latin scripts can be found
+        Given the places
+          | osm | class | type      | name |
+          | N1  | place | locality  | Речицкий район |
+          | N2  | place | locality  | Refugio de montaña |
+          | N3  | place | locality  | 高槻市|
+          | N4  | place | locality  | الدوحة |
+        When importing
+        When sending search query "Речицкий район"
+        Then results contain
+         | ID | osm |
+         | 0  | N1 |
+        When sending search query "Refugio de montaña"
+        Then results contain
+         | ID | osm |
+         | 0  | N2 |
+        When sending search query "高槻市"
+        Then results contain
+         | ID | osm |
+         | 0  | N3 |
+        When sending search query "الدوحة"
+        Then results contain
+         | ID | osm |
+         | 0  | N4 |
+

     Scenario: Case-insensitivity of search
         Given the places
           | osm | class | type      | name |
     Scenario: Case-insensitivity of search
         Given the places
           | osm | class | type      | name |


@@ -52,7 +77,7 @@ Feature: Import and search of names
 
     Scenario: Special characters in name
         Given the places
 
     Scenario: Special characters in name
         Given the places

-          | osm | class | type      | name |
+          | osm | class | type      | name+name:de |

           | N1  | place | locality  | Jim-Knopf-Straße |
           | N2  | place | locality  | Smith/Weston |
           | N3  | place | locality  | space mountain |
           | N1  | place | locality  | Jim-Knopf-Straße |
           | N2  | place | locality  | Smith/Weston |
           | N3  | place | locality  | space mountain |


@@ -139,8 +164,8 @@ Feature: Import and search of names
 
     Scenario: Unprintable characters in postcodes are ignored
         Given the named places
 
     Scenario: Unprintable characters in postcodes are ignored
         Given the named places

-            | osm  | class   | type   | address |
-            | N234 | amenity | prison | 'postcode' : u'1234\u200e' |
+            | osm  | class   | type   | address                    | geometry   |
+            | N234 | amenity | prison | 'postcode' : u'1234\u200e' | country:de |

         When importing
         And sending search query "1234"
         Then result 0 has not attributes osm_type
         When importing
         And sending search query "1234"
         Then result 0 has not attributes osm_type