switch BDD tests to always use search API

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

diff --git a/test/bdd/db/query/search_simple.feature b/test/bdd/db/query/search_simple.feature
index daf83cea04d7e25c606b4098db124c6aaba4e087..7f141c4c0d56f275ac71ec27cabf707e7dbe957f 100644 (file)
--- a/test/bdd/db/query/search_simple.feature
+++ b/test/bdd/db/query/search_simple.feature
@@ -7,31 +7,29 @@ Feature: Searching of simple objects
           | osm | class | type    | name+name | geometry   |
           | N1  | place | village | Foo       | 10.0 -10.0 |
         When importing
           | osm | class | type    | name+name | geometry   |
           | N1  | place | village | Foo       | 10.0 -10.0 |
         When importing

-        And searching for "Foo"
+        And sending search query "Foo"

         Then results contain
         Then results contain

-         | ID | osm | class | type    | centroid |
-         | 0  | N1  | place | village | 10 -10   |
+         | ID | osm | category | type    | centroid |
+         | 0  | N1  | place    | village | 10 -10   |

 
      Scenario: Updating postcode in postcode boundaries without ref
         Given the places
           | osm | class    | type        | postcode | geometry |
           | R1  | boundary | postal_code | 12345    | poly-area:1.0 |
         When importing
 
      Scenario: Updating postcode in postcode boundaries without ref
         Given the places
           | osm | class    | type        | postcode | geometry |
           | R1  | boundary | postal_code | 12345    | poly-area:1.0 |
         When importing

-        And searching for "12345"
+        And sending search query "12345"

         Then results contain
         Then results contain

-         | ID | osm_type | osm_id |
-         | 0  | R        | 1 |
+         | ID | osm |
+         | 0  | R1 |

         When updating places
           | osm | class    | type        | postcode | geometry |
           | R1  | boundary | postal_code | 54321    | poly-area:1.0 |
         When updating places
           | osm | class    | type        | postcode | geometry |
           | R1  | boundary | postal_code | 54321    | poly-area:1.0 |

-        And searching for "12345"
+        And sending search query "12345"
+        Then result 0 has not attributes osm_type
+        When sending search query "54321"

         Then results contain
         Then results contain

-         | osm_type |
-         | P        |
-        When searching for "54321"
-        Then results contain
-         | ID | osm_type | osm_id |
-         | 0  | R        | 1 |
+         | ID | osm |
+         | 0  | R1 |

 
     # github #1763
     Scenario: Correct translation of highways under construction
 
     # github #1763
     Scenario: Correct translation of highways under construction