enable flake for bdd test code

[nominatim.git] / test / bdd / steps / check_functions.py

diff --git a/test/bdd/steps/check_functions.py b/test/bdd/steps/check_functions.py
index 1a6f08ef33ff9507ba543c3fe2a5f513bc4676ee..df9e6f35ec362957d22c1f910b18abd16918837e 100644 (file)
--- a/test/bdd/steps/check_functions.py
+++ b/test/bdd/steps/check_functions.py
@@ -2,22 +2,58 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2022 by the Nominatim developer community.
+# Copyright (C) 2025 by the Nominatim developer community.

 # For a full list of authors see the git log.
 """
 Collection of assertion functions used for the steps.
 """
 import json
 # For a full list of authors see the git log.
 """
 Collection of assertion functions used for the steps.
 """
 import json

+import math
+import re

 
 

-class Almost:
-    """ Compares a float value with a certain jitter.
+
+OSM_TYPE = {'N': 'node', 'W': 'way', 'R': 'relation',
+            'n': 'node', 'w': 'way', 'r': 'relation',
+            'node': 'n', 'way': 'w', 'relation': 'r'}
+
+
+class OsmType:
+    """ Compares an OSM type, accepting both N/R/W and node/way/relation.
+    """
+
+    def __init__(self, value):
+        self.value = value
+
+    def __eq__(self, other):
+        return other == self.value or other == OSM_TYPE[self.value]
+
+    def __str__(self):
+        return f"{self.value} or {OSM_TYPE[self.value]}"
+
+
+class Field:
+    """ Generic comparator for fields, which looks at the type of the
+        value compared.

     """
     """

-    def __init__(self, value, offset=0.00001):
+    def __init__(self, value, **extra_args):

         self.value = value
         self.value = value

-        self.offset = offset
+        self.extra_args = extra_args

 
     def __eq__(self, other):
 
     def __eq__(self, other):

-        return abs(other - self.value) < self.offset
+        if isinstance(self.value, float):
+            return math.isclose(self.value, float(other), **self.extra_args)
+
+        if self.value.startswith('^'):
+            return re.fullmatch(self.value, str(other))
+
+        if isinstance(other, dict):
+            return other == eval('{' + self.value + '}')
+
+        return str(self.value) == str(other)
+
+    def __str__(self):
+        return str(self.value)
+

 
 class Bbox:
     """ Comparator for bounding boxes.
 
 class Bbox:
     """ Comparator for bounding boxes.


@@ -44,7 +80,6 @@ class Bbox:
         return str(self.coord)
 
 
         return str(self.coord)
 
 

-

 def check_for_attributes(obj, attrs, presence='present'):
     """ Check that the object has the given attributes. 'attrs' is a
         string with a comma-separated list of attributes. If 'presence'
 def check_for_attributes(obj, attrs, presence='present'):
     """ Check that the object has the given attributes. 'attrs' is a
         string with a comma-separated list of attributes. If 'presence'


@@ -62,4 +97,3 @@ def check_for_attributes(obj, attrs, presence='present'):
         else:
             assert attr in obj, \
                    f"No attribute '{attr}'. Full response:\n{_dump_json()}"
         else:
             assert attr in obj, \
                    f"No attribute '{attr}'. Full response:\n{_dump_json()}"

-