organise python tests in subdirectories

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

diff --git a/test/python/dummy_tokenizer.py b/test/python/dummy_tokenizer.py
index 18e322caef3d5642939698ed5d83c22726058150..6029eb7c6620b5f088f831dec66dede835664340 100644 (file)
--- a/test/python/dummy_tokenizer.py
+++ b/test/python/dummy_tokenizer.py
@@ -1,6 +1,8 @@
 """
 Tokenizer for testing.
 """
+from nominatim.indexer.place_info import PlaceInfo
+from nominatim.config import Configuration
 
 def create(dsn, data_dir):
     """ Create a new instance of the tokenizer provided by this module.
@@ -17,16 +19,18 @@ class DummyTokenizer:
 
 
     def init_new_db(self, *args, **kwargs):
-        assert self.init_state == None
+        assert self.init_state is None
         self.init_state = "new"
 
 
-    def init_from_project(self):
-        assert self.init_state == None
+    def init_from_project(self, config):
+        assert isinstance(config, Configuration)
+        assert self.init_state is None
         self.init_state = "loaded"
 
 
-    def finalize_import(self, _):
+    @staticmethod
+    def finalize_import(_):
         pass
 
 
@@ -51,10 +55,12 @@ class DummyNameAnalyzer:
     def close(self):
         pass
 
-    def normalize_postcode(self, postcode):
+    @staticmethod
+    def normalize_postcode(postcode):
         return postcode
 
-    def update_postcodes_from_db(self):
+    @staticmethod
+    def update_postcodes_from_db():
         pass
 
     def update_special_phrases(self, phrases, should_replace):
@@ -63,5 +69,7 @@ class DummyNameAnalyzer:
     def add_country_names(self, code, names):
         self.analyser_cache['countries'].append((code, names))
 
-    def process_place(self, place):
+    @staticmethod
+    def process_place(place):
+        assert isinstance(place, PlaceInfo)
         return {}