hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-07 02:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt tests to short_name demotion

Browse Source
This commit is contained in:
Sarah Hoffmann
2019-10-28 22:53:41 +01:00
parent 5292239714
commit e0de838b13
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/php/Nominatim/ParameterParserTest.php
View File

@@ -175,73 +175,73 @@ class ParameterParserTest extends \PHPUnit\Framework\TestCase
{ {
$oParams = new ParameterParser(array('accept-language' => '')); $oParams = new ParameterParser(array('accept-language' => ''));
$this->assertSame(array( $this->assertSame(array(
'short_name:default' => 'short_name:default',
'name:default' => 'name:default', 'name:default' => 'name:default',
'short_name' => 'short_name',
'name' => 'name', 'name' => 'name',
'brand' => 'brand', 'brand' => 'brand',
'official_name:default' => 'official_name:default', 'official_name:default' => 'official_name:default',
'short_name:default' => 'short_name:default',
'official_name' => 'official_name', 'official_name' => 'official_name',
'short_name' => 'short_name',
'ref' => 'ref', 'ref' => 'ref',
'type' => 'type' 'type' => 'type'
), $oParams->getPreferredLanguages('default')); ), $oParams->getPreferredLanguages('default'));
$oParams = new ParameterParser(array('accept-language' => 'de,en')); $oParams = new ParameterParser(array('accept-language' => 'de,en'));
$this->assertSame(array( $this->assertSame(array(
'short_name:de' => 'short_name:de',
'name:de' => 'name:de', 'name:de' => 'name:de',
'short_name:en' => 'short_name:en',
'name:en' => 'name:en', 'name:en' => 'name:en',
'short_name' => 'short_name',
'name' => 'name', 'name' => 'name',
'brand' => 'brand', 'brand' => 'brand',
'official_name:de' => 'official_name:de', 'official_name:de' => 'official_name:de',
'short_name:de' => 'short_name:de',
'official_name:en' => 'official_name:en', 'official_name:en' => 'official_name:en',
'short_name:en' => 'short_name:en',
'official_name' => 'official_name', 'official_name' => 'official_name',
'short_name' => 'short_name',
'ref' => 'ref', 'ref' => 'ref',
'type' => 'type' 'type' => 'type'
), $oParams->getPreferredLanguages('default')); ), $oParams->getPreferredLanguages('default'));
$oParams = new ParameterParser(array('accept-language' => 'fr-ca,fr;q=0.8,en-ca;q=0.5,en;q=0.3')); $oParams = new ParameterParser(array('accept-language' => 'fr-ca,fr;q=0.8,en-ca;q=0.5,en;q=0.3'));
$this->assertSame(array( $this->assertSame(array(
'short_name:fr-ca' => 'short_name:fr-ca',
'name:fr-ca' => 'name:fr-ca', 'name:fr-ca' => 'name:fr-ca',
'short_name:fr' => 'short_name:fr',
'name:fr' => 'name:fr', 'name:fr' => 'name:fr',
'short_name:en-ca' => 'short_name:en-ca',
'name:en-ca' => 'name:en-ca', 'name:en-ca' => 'name:en-ca',
'short_name:en' => 'short_name:en',
'name:en' => 'name:en', 'name:en' => 'name:en',
'short_name' => 'short_name',
'name' => 'name', 'name' => 'name',
'brand' => 'brand', 'brand' => 'brand',
'official_name:fr-ca' => 'official_name:fr-ca', 'official_name:fr-ca' => 'official_name:fr-ca',
'short_name:fr-ca' => 'short_name:fr-ca',
'official_name:fr' => 'official_name:fr', 'official_name:fr' => 'official_name:fr',
'short_name:fr' => 'short_name:fr',
'official_name:en-ca' => 'official_name:en-ca', 'official_name:en-ca' => 'official_name:en-ca',
'short_name:en-ca' => 'short_name:en-ca',
'official_name:en' => 'official_name:en', 'official_name:en' => 'official_name:en',
'short_name:en' => 'short_name:en',
'official_name' => 'official_name', 'official_name' => 'official_name',
'short_name' => 'short_name',
'ref' => 'ref', 'ref' => 'ref',
'type' => 'type', 'type' => 'type',
), $oParams->getPreferredLanguages('default')); ), $oParams->getPreferredLanguages('default'));
$oParams = new ParameterParser(array('accept-language' => 'ja_rm,zh_pinyin')); $oParams = new ParameterParser(array('accept-language' => 'ja_rm,zh_pinyin'));
$this->assertSame(array( $this->assertSame(array(
'short_name:ja_rm' => 'short_name:ja_rm',
'name:ja_rm' => 'name:ja_rm', 'name:ja_rm' => 'name:ja_rm',
'short_name:zh_pinyin' => 'short_name:zh_pinyin',
'name:zh_pinyin' => 'name:zh_pinyin', 'name:zh_pinyin' => 'name:zh_pinyin',
'short_name:ja' => 'short_name:ja',
'name:ja' => 'name:ja', 'name:ja' => 'name:ja',
'short_name:zh' => 'short_name:zh',
'name:zh' => 'name:zh', 'name:zh' => 'name:zh',
'short_name' => 'short_name',
'name' => 'name', 'name' => 'name',
'brand' => 'brand', 'brand' => 'brand',
'official_name:ja_rm' => 'official_name:ja_rm', 'official_name:ja_rm' => 'official_name:ja_rm',
'short_name:ja_rm' => 'short_name:ja_rm',
'official_name:zh_pinyin' => 'official_name:zh_pinyin', 'official_name:zh_pinyin' => 'official_name:zh_pinyin',
'short_name:zh_pinyin' => 'short_name:zh_pinyin',
'official_name:ja' => 'official_name:ja', 'official_name:ja' => 'official_name:ja',
'short_name:ja' => 'short_name:ja',
'official_name:zh' => 'official_name:zh', 'official_name:zh' => 'official_name:zh',
'short_name:zh' => 'short_name:zh',
'official_name' => 'official_name', 'official_name' => 'official_name',
'short_name' => 'short_name',
'ref' => 'ref', 'ref' => 'ref',
'type' => 'type', 'type' => 'type',
), $oParams->getPreferredLanguages('default')); ), $oParams->getPreferredLanguages('default'));