replace BreakType enum with simple char constants

[nominatim.git] / test / python / api / search / test_db_search_builder.py

diff --git a/test/python/api/search/test_db_search_builder.py b/test/python/api/search/test_db_search_builder.py
index 68f71298c6b64f10a846796562bd658fdfdf7cc3..9d70a90e135b1d3f5975a2de4901a627cd55f786 100644 (file)
--- a/test/python/api/search/test_db_search_builder.py
+++ b/test/python/api/search/test_db_search_builder.py
@@ -9,11 +9,12 @@ Tests for creating abstract searches from token assignments.
 """
 import pytest
 
 """
 import pytest
 

-from nominatim.api.search.query import Token, TokenRange, BreakType, PhraseType, TokenType, QueryStruct, Phrase
-from nominatim.api.search.db_search_builder import SearchBuilder
-from nominatim.api.search.token_assignment import TokenAssignment
-from nominatim.api.types import SearchDetails
-import nominatim.api.search.db_searches as dbs
+from nominatim_api.search.query import Token, TokenRange, PhraseType, TokenType, QueryStruct, Phrase
+import nominatim_api.search.query as qmod
+from nominatim_api.search.db_search_builder import SearchBuilder
+from nominatim_api.search.token_assignment import TokenAssignment
+from nominatim_api.types import SearchDetails
+import nominatim_api.search.db_searches as dbs

 
 class MyToken(Token):
     def get_category(self):
 
 class MyToken(Token):
     def get_category(self):


@@ -24,8 +25,8 @@ def make_query(*args):
     q = QueryStruct([Phrase(PhraseType.NONE, '')])
 
     for _ in range(max(inner[0] for tlist in args for inner in tlist)):
     q = QueryStruct([Phrase(PhraseType.NONE, '')])
 
     for _ in range(max(inner[0] for tlist in args for inner in tlist)):

-        q.add_node(BreakType.WORD, PhraseType.NONE)
-    q.add_node(BreakType.END, PhraseType.NONE)
+        q.add_node(qmod.BREAK_WORD, PhraseType.NONE)
+    q.add_node(qmod.BREAK_END, PhraseType.NONE)

 
     for start, tlist in enumerate(args):
         for end, ttype, tinfo in tlist:
 
     for start, tlist in enumerate(args):
         for end, ttype, tinfo in tlist:


@@ -33,7 +34,7 @@ def make_query(*args):
                 q.add_token(TokenRange(start, end), ttype,
                             MyToken(penalty=0.5 if ttype == TokenType.PARTIAL else 0.0,
                                     token=tid, count=1, addr_count=1,
                 q.add_token(TokenRange(start, end), ttype,
                             MyToken(penalty=0.5 if ttype == TokenType.PARTIAL else 0.0,
                                     token=tid, count=1, addr_count=1,

-                                    lookup_word=word, is_indexed=True))
+                                    lookup_word=word))

 
 
     return q
 
 
     return q


@@ -393,18 +394,18 @@ def make_counted_searches(name_part, name_full, address_part, address_full,
                           num_address_parts=1):
     q = QueryStruct([Phrase(PhraseType.NONE, '')])
     for i in range(1 + num_address_parts):
                           num_address_parts=1):
     q = QueryStruct([Phrase(PhraseType.NONE, '')])
     for i in range(1 + num_address_parts):

-        q.add_node(BreakType.WORD, PhraseType.NONE)
-    q.add_node(BreakType.END, PhraseType.NONE)
+        q.add_node(qmod.BREAK_WORD, PhraseType.NONE)
+    q.add_node(qmod.BREAK_END, PhraseType.NONE)

 
     q.add_token(TokenRange(0, 1), TokenType.PARTIAL,
 
     q.add_token(TokenRange(0, 1), TokenType.PARTIAL,

-                MyToken(0.5, 1, name_part, 1, 'name_part', True))
+                MyToken(0.5, 1, name_part, 1, 'name_part'))

     q.add_token(TokenRange(0, 1), TokenType.WORD,
     q.add_token(TokenRange(0, 1), TokenType.WORD,

-                MyToken(0, 101, name_full, 1, 'name_full', True))
+                MyToken(0, 101, name_full, 1, 'name_full'))

     for i in range(num_address_parts):
         q.add_token(TokenRange(i + 1, i + 2), TokenType.PARTIAL,
     for i in range(num_address_parts):
         q.add_token(TokenRange(i + 1, i + 2), TokenType.PARTIAL,

-                    MyToken(0.5, 2, address_part, 1, 'address_part', True))
+                    MyToken(0.5, 2, address_part, 1, 'address_part'))

         q.add_token(TokenRange(i + 1, i + 2), TokenType.WORD,
         q.add_token(TokenRange(i + 1, i + 2), TokenType.WORD,

-                    MyToken(0, 102, address_full, 1, 'address_full', True))
+                    MyToken(0, 102, address_full, 1, 'address_full'))

 
     builder = SearchBuilder(q, SearchDetails())
 
 
     builder = SearchBuilder(q, SearchDetails())