restrict deduplication to results from placex

[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 0e5a8bfcd47d0b8ac13fa36a6290d1c383b5b858..c93b8ead3c2fda0a49320726d72bda6c4282bbb1 100644 (file)
--- a/test/python/api/search/test_db_search_builder.py
+++ b/test/python/api/search/test_db_search_builder.py
@@ -68,7 +68,7 @@ def test_country_search_with_country_restriction():
     assert set(search.countries.values) == {'en'}
 
 
     assert set(search.countries.values) == {'en'}
 
 

-def test_country_search_with_confllicting_country_restriction():
+def test_country_search_with_conflicting_country_restriction():

     q = make_query([(1, TokenType.COUNTRY, [(2, 'de'), (3, 'en')])])
     builder = SearchBuilder(q, SearchDetails.from_kwargs({'countries': 'fr'}))
 
     q = make_query([(1, TokenType.COUNTRY, [(2, 'de'), (3, 'en')])])
     builder = SearchBuilder(q, SearchDetails.from_kwargs({'countries': 'fr'}))
 


@@ -161,7 +161,7 @@ def test_category_only(kwargs):
     search = searches[0]
 
     assert isinstance(search, dbs.PoiSearch)
     search = searches[0]
 
     assert isinstance(search, dbs.PoiSearch)

-    assert search.categories.values == [('this', 'that')]
+    assert search.qualifiers.values == [('this', 'that')]

 
 
 @pytest.mark.parametrize('kwargs', [{'viewbox': '0,0,1,1'},
 
 
 @pytest.mark.parametrize('kwargs', [{'viewbox': '0,0,1,1'},


@@ -369,20 +369,6 @@ def test_infrequent_partials_in_name():
             {('name_vector', 'lookup_all'), ('nameaddress_vector', 'restrict')}
 
 
             {('name_vector', 'lookup_all'), ('nameaddress_vector', 'restrict')}
 
 

-def test_frequent_partials_in_name_but_not_in_address():
-    searches = make_counted_searches(10000, 1, 1, 1, num_address_parts=4)
-
-    assert len(searches) == 1
-    search = searches[0]
-
-    assert isinstance(search, dbs.PlaceSearch)
-    assert len(search.lookups) == 2
-    assert len(search.rankings) == 2
-
-    assert set((l.column, l.lookup_type) for l in search.lookups) == \
-            {('nameaddress_vector', 'lookup_all'), ('name_vector', 'restrict')}
-
-

 def test_frequent_partials_in_name_and_address():
     searches = make_counted_searches(9999, 1, 9999, 1)
 
 def test_frequent_partials_in_name_and_address():
     searches = make_counted_searches(9999, 1, 9999, 1)
 


@@ -398,7 +384,7 @@ def test_frequent_partials_in_name_and_address():
 
 
 def test_too_frequent_partials_in_name_and_address():
 
 
 def test_too_frequent_partials_in_name_and_address():

-    searches = make_counted_searches(10000, 1, 10000, 1)
+    searches = make_counted_searches(20000, 1, 10000, 1)

 
     assert len(searches) == 1
 
 
     assert len(searches) == 1