adapt tests to extended results

This commit is contained in:
Sarah Hoffmann
2025-03-21 20:24:09 +01:00
parent 3cb183ffb0
commit be4ba370ef
3 changed files with 10 additions and 9 deletions

View File

@@ -230,19 +230,20 @@ def test_update_statistics(word_table, table_factory, temp_db_cursor,
tokenizer_factory, test_config):
word_table.add_full_word(1000, 'hello')
word_table.add_full_word(1001, 'bye')
word_table.add_full_word(1002, 'town')
table_factory('search_name',
'place_id BIGINT, name_vector INT[], nameaddress_vector INT[]',
[(12, [1000], [1001])])
[(12, [1000], [1001]), (13, [1001], [1002]), (14, [1000, 1001], [1002])])
tok = tokenizer_factory()
tok.update_statistics(test_config)
assert temp_db_cursor.scalar("""SELECT count(*) FROM word
WHERE type = 'W' and word_id = 1000 and
(info->>'count')::int > 0""") == 1
assert temp_db_cursor.scalar("""SELECT count(*) FROM word
WHERE type = 'W' and word_id = 1001 and
(info->>'addr_count')::int > 0""") == 1
assert temp_db_cursor.row_set("""SELECT word_id,
(info->>'count')::int,
(info->>'addr_count')::int
FROM word
WHERE type = 'W'""") == \
{(1000, 2, None), (1001, 2, None), (1002, None, 2)}
def test_normalize_postcode(analyzer):

View File

@@ -40,7 +40,7 @@ def make_analyser(*variants, variant_only=False):
def get_normalized_variants(proc, name):
norm = Transliterator.createFromRules("test_norm", DEFAULT_NORMALIZATION)
return proc.compute_variants(norm.transliterate(name).strip())
return proc.compute_variants(norm.transliterate(name).strip())[0]
def test_no_variants():

View File

@@ -40,7 +40,7 @@ class TestMutationNoVariants:
def variants(self, name):
norm = Transliterator.createFromRules("test_norm", DEFAULT_NORMALIZATION)
return set(self.analysis.compute_variants(norm.transliterate(name).strip()))
return set(self.analysis.compute_variants(norm.transliterate(name).strip())[0])
@pytest.mark.parametrize('pattern', ('(capture)', ['a list']))
def test_bad_pattern(self, pattern):