Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / import / naming.feature

diff --git a/test/bdd/db/import/naming.feature b/test/bdd/db/import/naming.feature
index d2339376a01ea1c49ab20b4f9c0279a780e273f7..f3019e2a52fe9e6e03b65e190443da5633e5a51a 100644 (file)
--- 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
           | 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
 
     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
           | 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
 
     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
           | 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
 
     Scenario: Do not overwrite default language with name tag
         Given the places


@@ -35,5 +35,5 @@ Feature: Import and search of names
           | N1  | place | locality | german | finnish      | local        | country:de |
         When importing
         Then placex contains
           | 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        |