adapt tests to ranking changes

diff --git a/test/bdd/db/import/placex.feature b/test/bdd/db/import/placex.feature
index 594f3538e5b11f1e0a3d00bf02a207b2fff02446..2b7c8cd86cfc626058ffacde76c02ed3b238ab3a 100644 (file)
--- a/test/bdd/db/import/placex.feature
+++ b/test/bdd/db/import/placex.feature
@@ -148,9 +148,9 @@ Feature: Import into placex
         And placex contains
           | object | rank_search | rank_address |
           | R20    | 4           | 4 |
         And placex contains
           | object | rank_search | rank_address |
           | R20    | 4           | 4 |

-          | R21    | 30          | 30 |
-          | R22    | 30          | 30 |
-          | R23    | 30          | 30 |
+          | R21    | 25          | 0 |
+          | R22    | 25          | 0 |
+          | R23    | 25          | 0 |

           | R40    | 4           | 0 |
           | R41    | 8           | 0 |
 
           | R40    | 4           | 0 |
           | R41    | 8           | 0 |
 

diff --git a/test/bdd/db/import/rank_computation.feature b/test/bdd/db/import/rank_computation.feature
index 38d15e962bbe6b71dac1ce117caea91e5e057133..4f1cc6c015c7f109a1082a2946d4b89ecb8be03f 100644 (file)
--- a/test/bdd/db/import/rank_computation.feature
+++ b/test/bdd/db/import/rank_computation.feature
@@ -24,7 +24,7 @@ Feature: Rank assignment
         Then placex contains
           | object | rank_search | rank_address |
           | N1     | 30          | 30 |
         Then placex contains
           | object | rank_search | rank_address |
           | N1     | 30          | 30 |

-          | N11    | 30          | 30 |
+          | N11    | 22          | 0 |

           | N12    | 2           | 0 |
           | N13    | 2           | 0 |
           | N14    | 4           | 0 |
           | N12    | 2           | 0 |
           | N13    | 2           | 0 |
           | N14    | 4           | 0 |


@@ -48,11 +48,11 @@ Feature: Rank assignment
         Then placex contains
           | object | rank_search | rank_address |
           | R20    | 4           | 4 |
         Then placex contains
           | object | rank_search | rank_address |
           | R20    | 4           | 4 |

-          | R21    | 30          | 30 |
+          | R21    | 25          | 0 |

           | R22    | 12          | 12 |
           | R23    | 20          | 20 |
 
           | R22    | 12          | 12 |
           | R23    | 20          | 20 |
 

-    Scenario: Ranks for boundaries with place assignment go with place address ranks if available
+    Scenario: Ranks for addressable boundaries with place assignment go with place address ranks if available

         Given the named places
           | osm | class    | type           | admin | extra+place | geometry |
           | R20 | boundary | administrative | 3     | state       | (1 1, 2 2, 1 2, 1 1) |
         Given the named places
           | osm | class    | type           | admin | extra+place | geometry |
           | R20 | boundary | administrative | 3     | state       | (1 1, 2 2, 1 2, 1 1) |


@@ -63,7 +63,7 @@ Feature: Rank assignment
         Then placex contains
           | object | rank_search | rank_address |
           | R20    | 6           | 6  |
         Then placex contains
           | object | rank_search | rank_address |
           | R20    | 6           | 6  |

-          | R21    | 30          | 20 |
+          | R21    | 25          | 0  |

           | R22    | 12          | 16 |
           | R23    | 20          | 16 |
 
           | R22    | 12          | 16 |
           | R23    | 20          | 16 |
 

diff --git a/test/bdd/db/update/simple.feature b/test/bdd/db/update/simple.feature
index 93fb0c00a77fd6449de4e6ea231df5cc1ed30f4d..0ae0ac4a25a0a2376a092ad0b0cb09204b62de63 100644 (file)
--- a/test/bdd/db/update/simple.feature
+++ b/test/bdd/db/update/simple.feature
@@ -28,10 +28,10 @@ Feature: Update of simple objects
 
     Scenario: Do delete large features of low rank
         Given the named places
 
     Scenario: Do delete large features of low rank
         Given the named places

-          | osm | class    | type          | geometry |
-          | W1  | place    | house         | poly-area:5.0 |
-          | R1  | boundary | national_park | poly-area:5.0 |
-          | R2  | highway  | residential   | poly-area:5.0 |
+          | osm | class    | type        | geometry |
+          | W1  | place    | house       | poly-area:5.0 |
+          | R1  | natural  | wood        | poly-area:5.0 |
+          | R2  | highway  | residential | poly-area:5.0 |

         When importing
         Then placex contains
           | object | rank_address |
         When importing
         Then placex contains
           | object | rank_address |


@@ -106,4 +106,4 @@ Feature: Update of simple objects
           | W1  | boundary | historic       | Haha | 5     | (1, 2, 4, 3, 1) |
         Then placex contains
           | object | rank_address |
           | W1  | boundary | historic       | Haha | 5     | (1, 2, 4, 3, 1) |
         Then placex contains
           | object | rank_address |

-          | W1     | 30            |
+          | W1     | 0            |

diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py
index f4c485fd99e34be3bf44b22fe39e825e9ba69e34..9604fd1089549946dfec258785d04afc7137412f 100644 (file)
--- a/test/bdd/steps/db_ops.py
+++ b/test/bdd/steps/db_ops.py
@@ -110,6 +110,9 @@ class PlaceObjName(object):
         if self.pid is None:
             return "<null>"
 
         if self.pid is None:
             return "<null>"
 

+        if self.pid == 0:
+            return "place ID 0"
+

         cur = self.conn.cursor()
         cur.execute("""SELECT osm_type, osm_id, class
                        FROM placex WHERE place_id = %s""",
         cur = self.conn.cursor()
         cur.execute("""SELECT osm_type, osm_id, class
                        FROM placex WHERE place_id = %s""",