tests: add fixture for making test project directory

test/python/tokenizer/test_factory.py

@@ -8,68 +8,68 @@ from nominatim.tokenizer import factory
 from nominatim.errors import UsageError
 from dummy_tokenizer import DummyTokenizer
 
-@pytest.fixture
-def test_config(def_config, tmp_path, property_table, tokenizer_mock):
-    def_config.project_dir = tmp_path
-    return def_config
 
-
-def test_setup_dummy_tokenizer(temp_db_conn, test_config):
-    tokenizer = factory.create_tokenizer(test_config)
-
-    assert isinstance(tokenizer, DummyTokenizer)
-    assert tokenizer.init_state == "new"
-    assert (test_config.project_dir / 'tokenizer').is_dir()
-
-    assert properties.get_property(temp_db_conn, 'tokenizer') == 'dummy'
-
-
-def test_setup_tokenizer_dir_exists(test_config):
-    (test_config.project_dir / 'tokenizer').mkdir()
-
-    tokenizer = factory.create_tokenizer(test_config)
-
-    assert isinstance(tokenizer, DummyTokenizer)
-    assert tokenizer.init_state == "new"
-
-
-def test_setup_tokenizer_dir_failure(test_config):
-    (test_config.project_dir / 'tokenizer').write_text("foo")
-
-    with pytest.raises(UsageError):
-        factory.create_tokenizer(test_config)
-
-
-def test_setup_bad_tokenizer_name(def_config, tmp_path, monkeypatch):
-    def_config.project_dir = tmp_path
+def test_setup_bad_tokenizer_name(project_env, monkeypatch):
     monkeypatch.setenv('NOMINATIM_TOKENIZER', 'dummy')
 
     with pytest.raises(UsageError):
-        factory.create_tokenizer(def_config)
+        factory.create_tokenizer(project_env)
 
 
-def test_load_tokenizer(test_config):
-    factory.create_tokenizer(test_config)
-
-    tokenizer = factory.get_tokenizer_for_db(test_config)
-
-    assert isinstance(tokenizer, DummyTokenizer)
-    assert tokenizer.init_state == "loaded"
+class TestFactory:
+    @pytest.fixture(autouse=True)
+    def init_env(self, project_env, property_table, tokenizer_mock):
+        self.config = project_env
 
 
-def test_load_no_tokenizer_dir(test_config):
-    factory.create_tokenizer(test_config)
+    def test_setup_dummy_tokenizer(self, temp_db_conn):
+        tokenizer = factory.create_tokenizer(self.config)
 
-    test_config.project_dir = test_config.project_dir / 'foo'
+        assert isinstance(tokenizer, DummyTokenizer)
+        assert tokenizer.init_state == "new"
+        assert (self.config.project_dir / 'tokenizer').is_dir()
 
-    with pytest.raises(UsageError):
-        factory.get_tokenizer_for_db(test_config)
+        assert properties.get_property(temp_db_conn, 'tokenizer') == 'dummy'
 
 
-def test_load_missing_propoerty(temp_db_cursor, test_config):
-    factory.create_tokenizer(test_config)
+    def test_setup_tokenizer_dir_exists(self):
+        (self.config.project_dir / 'tokenizer').mkdir()
 
-    temp_db_cursor.execute("TRUNCATE TABLE nominatim_properties")
+        tokenizer = factory.create_tokenizer(self.config)
 
-    with pytest.raises(UsageError):
-        factory.get_tokenizer_for_db(test_config)
+        assert isinstance(tokenizer, DummyTokenizer)
+        assert tokenizer.init_state == "new"
+
+
+    def test_setup_tokenizer_dir_failure(self):
+        (self.config.project_dir / 'tokenizer').write_text("foo")
+
+        with pytest.raises(UsageError):
+            factory.create_tokenizer(self.config)
+
+
+    def test_load_tokenizer(self):
+        factory.create_tokenizer(self.config)
+
+        tokenizer = factory.get_tokenizer_for_db(self.config)
+
+        assert isinstance(tokenizer, DummyTokenizer)
+        assert tokenizer.init_state == "loaded"
+
+
+    def test_load_no_tokenizer_dir(self):
+        factory.create_tokenizer(self.config)
+
+        self.config.project_dir = self.config.project_dir / 'foo'
+
+        with pytest.raises(UsageError):
+            factory.get_tokenizer_for_db(self.config)
+
+
+    def test_load_missing_property(self, temp_db_cursor):
+        factory.create_tokenizer(self.config)
+
+        temp_db_cursor.execute("TRUNCATE TABLE nominatim_properties")
+
+        with pytest.raises(UsageError):
+            factory.get_tokenizer_for_db(self.config)