X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9454761cca4bb3a2b0fa997797054d67078a2fcc..817e5ba51eb8b8a4fbb5a430139b974a67f601cf:/test/php/Nominatim/ParameterParserTest.php?ds=sidebyside diff --git a/test/php/Nominatim/ParameterParserTest.php b/test/php/Nominatim/ParameterParserTest.php index 0cbc60c5..ee2f5e18 100644 --- a/test/php/Nominatim/ParameterParserTest.php +++ b/test/php/Nominatim/ParameterParserTest.php @@ -2,17 +2,15 @@ namespace Nominatim; -use Exception; - -require_once('../../lib/ParameterParser.php'); +require_once(CONST_BasePath.'/lib/ParameterParser.php'); function userError($sError) { - throw new Exception($sError); + throw new \Exception($sError); } -class ParameterParserTest extends \PHPUnit_Framework_TestCase +class ParameterParserTest extends \PHPUnit\Framework\TestCase { @@ -55,14 +53,18 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase public function testGetIntWithNonNumber() { - $this->setExpectedException(Exception::class, "Integer number expected for parameter 'int4'"); + $this->expectException(\Exception::class); + $this->expectExceptionMessage("Integer number expected for parameter 'int4'"); + (new ParameterParser(array('int4' => 'a')))->getInt('int4'); } public function testGetIntWithEmpytString() { - $this->setExpectedException(Exception::class, "Integer number expected for parameter 'int5'"); + $this->expectException(\Exception::class); + $this->expectExceptionMessage("Integer number expected for parameter 'int5'"); + (new ParameterParser(array('int5' => '')))->getInt('int5'); } @@ -85,20 +87,26 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase public function testGetFloatWithEmptyString() { - $this->setExpectedException(Exception::class, "Floating-point number expected for parameter 'float4'"); + $this->expectException(\Exception::class); + $this->expectExceptionMessage("Floating-point number expected for parameter 'float4'"); + (new ParameterParser(array('float4' => '')))->getFloat('float4'); } public function testGetFloatWithTextString() { - $this->setExpectedException(Exception::class, "Floating-point number expected for parameter 'float5'"); + $this->expectException(\Exception::class); + $this->expectExceptionMessage("Floating-point number expected for parameter 'float5'"); + (new ParameterParser(array('float5' => 'a')))->getFloat('float5'); } public function testGetFloatWithInvalidNumber() { - $this->setExpectedException(Exception::class, "Floating-point number expected for parameter 'float6'"); + $this->expectException(\Exception::class); + $this->expectExceptionMessage("Floating-point number expected for parameter 'float6'"); + (new ParameterParser(array('float6' => '-55.')))->getFloat('float6'); } @@ -138,7 +146,9 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase public function testGetSetWithValueNotInSet() { - $this->setExpectedException(Exception::class, "Parameter 'val4' must be one of: foo, bar"); + $this->expectException(\Exception::class); + $this->expectExceptionMessage("Parameter 'val4' must be one of: foo, bar"); + (new ParameterParser(array('val4' => 'faz')))->getSet('val4', array('foo', 'bar')); } @@ -213,5 +223,27 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase 'ref' => 'ref', 'type' => 'type', ), $oParams->getPreferredLanguages('default')); + + $oParams = new ParameterParser(array('accept-language' => 'ja_rm,zh_pinyin')); + $this->assertSame(array( + 'short_name:ja_rm' => 'short_name:ja_rm', + 'name:ja_rm' => 'name:ja_rm', + 'short_name:zh_pinyin' => 'short_name:zh_pinyin', + 'name:zh_pinyin' => 'name:zh_pinyin', + 'short_name:ja' => 'short_name:ja', + 'name:ja' => 'name:ja', + 'short_name:zh' => 'short_name:zh', + 'name:zh' => 'name:zh', + 'short_name' => 'short_name', + 'name' => 'name', + 'brand' => 'brand', + 'official_name:ja_rm' => 'official_name:ja_rm', + 'official_name:zh_pinyin' => 'official_name:zh_pinyin', + 'official_name:ja' => 'official_name:ja', + 'official_name:zh' => 'official_name:zh', + 'official_name' => 'official_name', + 'ref' => 'ref', + 'type' => 'type', + ), $oParams->getPreferredLanguages('default')); } }