osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-22 21:28:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

add secondary importance to API BDD tests

Browse Source 
Also fixes a path issue during API test DB creation that could
never possibly have worked.
This commit is contained in:
Sarah Hoffmann 2022-09-27 23:13:29 +02:00
parent abf349fb0d
commit 0a73ed7d64
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/bdd/api/search/params.feature
View File

@ -68,14 +68,15 @@ Feature: Search queries
| 0 | | 0 |
Then there are duplicates Then there are duplicates
@fail-legacy
Scenario: Search with bounded viewbox in right area Scenario: Search with bounded viewbox in right area
When sending json search query "bar" with address When sending json search query "post" with address
| bounded | viewbox | | bounded | viewbox |
| 1 | 9,47,10,48 | | 1 | 9,47,10,48 |
Then result addresses contain Then result addresses contain
| ID | town | | ID | town |
| 0 | Vaduz | | 0 | Vaduz |
When sending json search query "bar" with address When sending json search query "post" with address
| bounded | viewbox | | bounded | viewbox |
| 1 | 9.49712,47.17122,9.52605,47.16242 | | 1 | 9.49712,47.17122,9.52605,47.16242 |
Then result addresses contain Then result addresses contain
@ -118,18 +119,18 @@ Feature: Search queries
Then result has centroid in 9.49712,47.16242,9.52605,47.17122 Then result has centroid in 9.49712,47.16242,9.52605,47.17122
Scenario: Prefer results within viewbox Scenario: Prefer results within viewbox
When sending json search query "Gässle" with address
| accept-language |
| en |
Then result addresses contain
| ID | town |
| 0 | Balzers |
When sending json search query "Gässle" with address When sending json search query "Gässle" with address
| accept-language | viewbox | | accept-language | viewbox |
| en | 9.52413,47.10759,9.53140,47.10539 | | en | 9.52413,47.10759,9.53140,47.10539 |
Then result addresses contain Then result addresses contain
| ID | village | | ID | village |
| 0 | Triesen | | 0 | Triesen |
When sending json search query "Gässle" with address
| accept-language | viewbox |
| en | 9.45949,47.08421,9.54094,47.05466 |
Then result addresses contain
| ID | town |
| 0 | Balzers |
Scenario: viewboxes cannot be points Scenario: viewboxes cannot be points
When sending json search query "foo" When sending json search query "foo"

12
test/bdd/steps/nominatim_environment.py
View File

@ -201,19 +201,21 @@ class NominatimEnvironment:
self.api_db_done = True self.api_db_done = True
if not self._reuse_or_drop_db(self.api_test_db): if not self._reuse_or_drop_db(self.api_test_db):
testdata = Path('__file__') / '..' / '..' / 'testdb' testdata = (Path(__file__) / '..' / '..' / '..' / 'testdb').resolve()
self.test_env['NOMINATIM_WIKIPEDIA_DATA_PATH'] = str(testdata.resolve()) self.test_env['NOMINATIM_WIKIPEDIA_DATA_PATH'] = str(testdata)
simp_file = Path(self.website_dir.name) / 'secondary_importance.sql.gz'
simp_file.symlink_to(testdata / 'secondary_importance.sql.gz')
try: try:
self.run_nominatim('import', '--osm-file', str(self.api_test_file)) self.run_nominatim('import', '--osm-file', str(self.api_test_file))
self.run_nominatim('add-data', '--tiger-data', str((testdata / 'tiger').resolve())) self.run_nominatim('add-data', '--tiger-data', str(testdata / 'tiger'))
self.run_nominatim('freeze') self.run_nominatim('freeze')
if self.tokenizer == 'legacy': if self.tokenizer == 'legacy':
phrase_file = str((testdata / 'specialphrases_testdb.sql').resolve()) phrase_file = str(testdata / 'specialphrases_testdb.sql')
run_script(['psql', '-d', self.api_test_db, '-f', phrase_file]) run_script(['psql', '-d', self.api_test_db, '-f', phrase_file])
else: else:
csv_path = str((testdata / 'full_en_phrases_test.csv').resolve()) csv_path = str(testdata / 'full_en_phrases_test.csv')
self.run_nominatim('special-phrases', '--import-from-csv', csv_path) self.run_nominatim('special-phrases', '--import-from-csv', csv_path)
except: except:
self.db_drop_database(self.api_test_db) self.db_drop_database(self.api_test_db)

BIN
test/testdb/secondary_importance.sql.gz Normal file
View File

Binary file not shown.