X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4a5a997e18c61a37b0e12f840e735e305edc416f..ce9ed993c8c83dff7a86e8bd87cf562364f26a94:/test/bdd/db/import/naming.feature

diff --git a/test/bdd/db/import/naming.feature b/test/bdd/db/import/naming.feature
index d2339376..b739cbae 100644
--- a/test/bdd/db/import/naming.feature
+++ b/test/bdd/db/import/naming.feature
@@ -8,8 +8,8 @@ Feature: Import and search of names
           | N1  | place | locality  | german | country:de |
         When importing
         Then placex contains
-          | object | calculated_country_code | name+name |
-          | N1     | de                      | german |
+          | object | country_code | name+name |
+          | N1     | de           | german |
 
     Scenario: Copying name tag to default language if it does not exist
         Given the places
@@ -17,8 +17,8 @@ Feature: Import and search of names
           | N1  | place | locality  | german | finnish      | country:de |
         When importing
         Then placex contains
-          | object | calculated_country_code | name   | name+name:fi | name+name:de |
-          | N1     | de                      | german | finnish      | german       |
+          | object | country_code | name   | name+name:fi | name+name:de |
+          | N1     | de           | german | finnish      | german       |
 
     Scenario: Copying default language name tag to name if it does not exist
         Given the places
@@ -26,8 +26,8 @@ Feature: Import and search of names
           | N1  | place | locality | german       | finnish      | country:de |
         When importing
         Then placex contains
-          | object | calculated_country_code | name   | name+name:fi | name+name:de |
-          | N1     | de                      | german | finnish      | german       |
+          | object | country_code | name   | name+name:fi | name+name:de |
+          | N1     | de           | german | finnish      | german       |
 
     Scenario: Do not overwrite default language with name tag
         Given the places
@@ -35,5 +35,71 @@ Feature: Import and search of names
           | N1  | place | locality | german | finnish      | local        | country:de |
         When importing
         Then placex contains
-          | object | calculated_country_code | name   | name+name:fi | name+name:de |
-          | N1     | de                      | german | finnish      | local        |
+          | object | country_code | name   | name+name:fi | name+name:de |
+          | N1     | de           | german | finnish      | local        |
+
+    Scenario Outline: Names in any script can be found
+        Given the places
+            | osm | class | type   | name   |
+            | N1  | place | hamlet | <name> |
+        When importing
+        And sending search query "<name>"
+        Then results contain
+            | osm |
+            | N1  |
+
+     Examples:
+        | name |
+        | Berlin |
+        | 北京 |
+        | Вологда |
+        | Αθήνα |
+        | القاهرة |
+        | រាជធានីភ្នំពេញ |
+        | 東京都 |
+        | ပုဗ္ဗသီရိ |
+
+
+    Scenario: German umlauts can be found when expanded
+        Given the places
+            | osm | class | type | name+name:de |
+            | N1  | place | city | Münster      |
+            | N2  | place | city | Köln         |
+            | N3  | place | city | Gräfenroda   |
+        When importing
+        When sending search query "münster"
+        Then results contain
+            | osm |
+            | N1  |
+        When sending search query "muenster"
+        Then results contain
+            | osm |
+            | N1  |
+        When sending search query "munster"
+        Then results contain
+            | osm |
+            | N1  |
+        When sending search query "Köln"
+        Then results contain
+            | osm |
+            | N2  |
+        When sending search query "Koeln"
+        Then results contain
+            | osm |
+            | N2  |
+        When sending search query "Koln"
+        Then results contain
+            | osm |
+            | N2  |
+        When sending search query "gräfenroda"
+        Then results contain
+            | osm |
+            | N3  |
+        When sending search query "graefenroda"
+        Then results contain
+            | osm |
+            | N3  |
+        When sending search query "grafenroda"
+        Then results contain
+            | osm |
+            | N3  |