Merge pull request #3003 from lonvia/rework-bdd-api-tests

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

diff --git a/test/bdd/db/import/linking.feature b/test/bdd/db/import/linking.feature
index 0fb3f76dbb2365d429c2a6ab275d6b22386925b0..dfa4b77c1a6019475004182683065baedfd0e8ac 100644 (file)
--- a/test/bdd/db/import/linking.feature
+++ b/test/bdd/db/import/linking.feature
@@ -55,8 +55,8 @@ Feature: Linking of places
          | R23    | -   |
         When sending search query "rhein"
         Then results contain
          | R23    | -   |
         When sending search query "rhein"
         Then results contain

-         | osm_type |
-         | R |
+         | osm |
+         | R13 |

 
     Scenario: Relations are not linked when in waterway relations
         Given the grid
 
     Scenario: Relations are not linked when in waterway relations
         Given the grid


@@ -81,9 +81,9 @@ Feature: Linking of places
          | R2     | - |
         When sending search query "rhein"
         Then results contain
          | R2     | - |
         When sending search query "rhein"
         Then results contain

-          | ID | osm_type |
-          |  0 | R |
-          |  1 | W |
+          | ID | osm |
+          |  0 | R1  |
+          |  1 | W2  |

 
 
     Scenario: Empty waterway relations are handled correctly
 
 
     Scenario: Empty waterway relations are handled correctly


@@ -138,8 +138,8 @@ Feature: Linking of places
          | W2     | R1 |
         When sending search query "rhein2"
         Then results contain
          | W2     | R1 |
         When sending search query "rhein2"
         Then results contain

-         | osm_type |
-         | W |
+         | osm |
+         | W1  |

 
     # github #573
     Scenario: Boundaries should only be linked to places
 
     # github #573
     Scenario: Boundaries should only be linked to places


@@ -205,14 +205,14 @@ Feature: Linking of places
          | city |
          | Berlin |
         Then results contain
          | city |
          | Berlin |
         Then results contain

-          | ID | osm_type | osm_id |
-          |  0 | R | 13 |
+          | ID | osm |
+          |  0 | R13 |

         When sending search query ""
          | state |
          | Berlin |
         Then results contain
         When sending search query ""
          | state |
          | Berlin |
         Then results contain

-          | ID | osm_type | osm_id |
-          |  0 | R | 13 |
+          | ID | osm |
+          |  0 | R13 |

 
 
     Scenario: Boundaries without place tags only link against same admin level
 
 
     Scenario: Boundaries without place tags only link against same admin level


@@ -237,14 +237,14 @@ Feature: Linking of places
          | state |
          | Berlin |
         Then results contain
          | state |
          | Berlin |
         Then results contain

-          | ID | osm_type | osm_id |
-          |  0 | R | 13 |
+          | ID | osm |
+          |  0 | R13 |

         When sending search query ""
          | city |
          | Berlin |
         Then results contain
         When sending search query ""
          | city |
          | Berlin |
         Then results contain

-          | ID | osm_type | osm_id |
-          |  0 | N | 2 |
+          | ID | osm |
+          |  0 | N2  |

 
     # github #1352
     Scenario: Do not use linked centroid when it is outside the area
 
     # github #1352
     Scenario: Do not use linked centroid when it is outside the area