Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / mocks.py

diff --git a/test/python/mocks.py b/test/python/mocks.py
index 53d84aace63b2783ac87c63f2be2bda389324696..7f7aaafc45d49364fba3917da897793c7f607428 100644 (file)
--- a/test/python/mocks.py
+++ b/test/python/mocks.py
@@ -5,6 +5,11 @@ import itertools
 
 import psycopg2.extras
 
 
 import psycopg2.extras
 

+from nominatim.db import properties
+
+# This must always point to the mock word table for the default tokenizer.
+from mock_legacy_word_table import MockLegacyWordTable as MockWordTable
+

 class MockParamCapture:
     """ Mock that records the parameters with which a function was called
         as well as the number of calls.
 class MockParamCapture:
     """ Mock that records the parameters with which a function was called
         as well as the number of calls.


@@ -12,6 +17,8 @@ class MockParamCapture:
     def __init__(self, retval=0):
         self.called = 0
         self.return_value = retval
     def __init__(self, retval=0):
         self.called = 0
         self.return_value = retval

+        self.last_args = None
+        self.last_kwargs = None

 
     def __call__(self, *args, **kwargs):
         self.called += 1
 
     def __call__(self, *args, **kwargs):
         self.called += 1


@@ -20,63 +27,6 @@ class MockParamCapture:
         return self.return_value
 
 
         return self.return_value
 
 

-class MockWordTable:
-    """ A word table for testing.
-    """
-    def __init__(self, conn):
-        self.conn = conn
-        with conn.cursor() as cur:
-            cur.execute("""CREATE TABLE word (word_id INTEGER,
-                                              word_token text,
-                                              word text,
-                                              class text,
-                                              type text,
-                                              country_code varchar(2),
-                                              search_name_count INTEGER,
-                                              operator TEXT)""")
-
-        conn.commit()
-
-    def add_special(self, word_token, word, cls, typ, op):
-        with self.conn.cursor() as cur:
-            cur.execute("""INSERT INTO word (word_token, word, class, type, operator)
-                              VALUES (%s, %s, %s, %s, %s)
-                        """, (word_token, word, cls, typ, op))
-        self.conn.commit()
-
-
-    def add_postcode(self, word_token, postcode):
-        with self.conn.cursor() as cur:
-            cur.execute("""INSERT INTO word (word_token, word, class, type)
-                              VALUES (%s, %s, 'place', 'postcode')
-                        """, (word_token, postcode))
-        self.conn.commit()
-
-
-    def count(self):
-        with self.conn.cursor() as cur:
-            return cur.scalar("SELECT count(*) FROM word")
-
-
-    def count_special(self):
-        with self.conn.cursor() as cur:
-            return cur.scalar("SELECT count(*) FROM word WHERE class != 'place'")
-
-
-    def get_special(self):
-        with self.conn.cursor() as cur:
-            cur.execute("""SELECT word_token, word, class, type, operator
-                           FROM word WHERE class != 'place'""")
-            return set((tuple(row) for row in cur))
-
-
-    def get_postcodes(self):
-        with self.conn.cursor() as cur:
-            cur.execute("""SELECT word FROM word
-                           WHERE class = 'place' and type = 'postcode'""")
-            return set((row[0] for row in cur))
-
-

 class MockPlacexTable:
     """ A placex table for testing.
     """
 class MockPlacexTable:
     """ A placex table for testing.
     """


@@ -125,3 +75,16 @@ class MockPlacexTable:
                          admin_level, address, extratags, 'SRID=4326;' + geom,
                          country))
         self.conn.commit()
                          admin_level, address, extratags, 'SRID=4326;' + geom,
                          country))
         self.conn.commit()

+
+
+class MockPropertyTable:
+    """ A property table for testing.
+    """
+    def __init__(self, conn):
+        self.conn = conn
+
+
+    def set(self, name, value):
+        """ Set a property in the table to the given value.
+        """
+        properties.set_property(self.conn, name, value)