From 6c58a4c46cc7138cb9534089632c2d5faaf75327 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 16 Jun 2022 22:08:30 +0200 Subject: [PATCH] bdd: move query tests from scene to grid description --- test/bdd/db/query/linking.feature | 20 ++++++++++++++------ test/bdd/db/query/normalization.feature | 12 +++++++++--- test/bdd/db/query/search_simple.feature | 7 +++++-- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/test/bdd/db/query/linking.feature b/test/bdd/db/query/linking.feature index bd8e1da0..351f8871 100644 --- a/test/bdd/db/query/linking.feature +++ b/test/bdd/db/query/linking.feature @@ -3,12 +3,16 @@ Feature: Searching linked places Tests that information from linked places can be searched correctly Scenario: Additional names from linked places are searchable + Given the 0.1 grid + | 10 | | 11 | + | | 2 | | + | 13 | | 12 | Given the places | osm | class | type | admin | name | geometry | - | R13 | boundary | administrative | 6 | Garbo | poly-area:0.1 | + | R13 | boundary | administrative | 6 | Garbo | (10,11,12,13,10) | Given the places - | osm | class | type | admin | name+name:it | geometry | - | N2 | place | hamlet | 15 | Vario | 0.006 0.00001 | + | osm | class | type | admin | name+name:it | + | N2 | place | hamlet | 15 | Vario | And the relations | id | members | tags+type | | 13 | N2:label | boundary | @@ -31,12 +35,16 @@ Feature: Searching linked places Scenario: Differing names from linked places are searchable + Given the 0.1 grid + | 10 | | 11 | + | | 2 | | + | 13 | | 12 | Given the places | osm | class | type | admin | name | geometry | - | R13 | boundary | administrative | 6 | Garbo | poly-area:0.1 | + | R13 | boundary | administrative | 6 | Garbo | (10,11,12,13,10) | Given the places - | osm | class | type | admin | name | geometry | - | N2 | place | hamlet | 15 | Vario | 0.006 0.00001 | + | osm | class | type | admin | name | + | N2 | place | hamlet | 15 | Vario | And the relations | id | members | tags+type | | 13 | N2:label | boundary | diff --git a/test/bdd/db/query/normalization.feature b/test/bdd/db/query/normalization.feature index 162a59a4..f91c0050 100644 --- a/test/bdd/db/query/normalization.feature +++ b/test/bdd/db/query/normalization.feature @@ -138,10 +138,13 @@ Feature: Import and search of names | 0 | N3 | Scenario: Landuse with name are found + Given the grid + | 1 | 2 | + | 3 | | Given the places | osm | class | type | name | geometry | - | R1 | natural | meadow | landuse1 | (0 0, 1 0, 1 1, 0 1, 0 0) | - | R2 | landuse | industrial | landuse2 | (0 0, -1 0, -1 -1, 0 -1, 0 0) | + | R1 | natural | meadow | landuse1 | (1,2,3,1) | + | R2 | landuse | industrial | landuse2 | (2,3,1,2) | When importing When sending search query "landuse1" Then results contain @@ -153,9 +156,12 @@ Feature: Import and search of names | 0 | R2 | Scenario: Postcode boundaries without ref + Given the grid with origin FR + | | 2 | | + | 1 | | 3 | Given the places | osm | class | type | postcode | geometry | - | R1 | boundary | postal_code | 12345 | (0 0, 1 0, 1 1, 0 1, 0 0) | + | R1 | boundary | postal_code | 12345 | (1,2,3,1) | When importing When sending search query "12345" Then results contain diff --git a/test/bdd/db/query/search_simple.feature b/test/bdd/db/query/search_simple.feature index 3672bb89..5fef3132 100644 --- a/test/bdd/db/query/search_simple.feature +++ b/test/bdd/db/query/search_simple.feature @@ -13,9 +13,12 @@ Feature: Searching of simple objects | 0 | N1 | place | village | 10 -10 | Scenario: Updating postcode in postcode boundaries without ref + Given the grid + | 1 | 2 | + | 4 | 3 | Given the places | osm | class | type | postcode | geometry | - | R1 | boundary | postal_code | 12345 | poly-area:1.0 | + | R1 | boundary | postal_code | 12345 | (1,2,3,4,1) | When importing And sending search query "12345" Then results contain @@ -23,7 +26,7 @@ Feature: Searching of simple objects | 0 | R1 | When updating places | osm | class | type | postcode | geometry | - | R1 | boundary | postal_code | 54321 | poly-area:1.0 | + | R1 | boundary | postal_code | 54321 | (1,2,3,4,1) | And sending search query "12345" Then exactly 0 results are returned When sending search query "54321" -- 2.39.5