namespace Nominatim;
-use Exception;
-
-require_once('../../lib/ParameterParser.php');
+require_once(CONST_LibDir.'/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
{
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');
}
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');
}
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'));
}
{
$oParams = new ParameterParser(array('accept-language' => ''));
$this->assertSame(array(
- 'short_name:default' => 'short_name:default',
'name:default' => 'name:default',
- 'short_name' => 'short_name',
'name' => 'name',
'brand' => 'brand',
'official_name:default' => 'official_name:default',
+ 'short_name:default' => 'short_name:default',
'official_name' => 'official_name',
+ 'short_name' => 'short_name',
'ref' => 'ref',
'type' => 'type'
), $oParams->getPreferredLanguages('default'));
$oParams = new ParameterParser(array('accept-language' => 'de,en'));
$this->assertSame(array(
- 'short_name:de' => 'short_name:de',
'name:de' => 'name:de',
- 'short_name:en' => 'short_name:en',
'name:en' => 'name:en',
- 'short_name' => 'short_name',
'name' => 'name',
'brand' => 'brand',
'official_name:de' => 'official_name:de',
+ 'short_name:de' => 'short_name:de',
'official_name:en' => 'official_name:en',
+ 'short_name:en' => 'short_name:en',
'official_name' => 'official_name',
+ 'short_name' => 'short_name',
'ref' => 'ref',
'type' => 'type'
), $oParams->getPreferredLanguages('default'));
$oParams = new ParameterParser(array('accept-language' => 'fr-ca,fr;q=0.8,en-ca;q=0.5,en;q=0.3'));
$this->assertSame(array(
- 'short_name:fr-ca' => 'short_name:fr-ca',
'name:fr-ca' => 'name:fr-ca',
- 'short_name:fr' => 'short_name:fr',
'name:fr' => 'name:fr',
- 'short_name:en-ca' => 'short_name:en-ca',
'name:en-ca' => 'name:en-ca',
- 'short_name:en' => 'short_name:en',
'name:en' => 'name:en',
- 'short_name' => 'short_name',
'name' => 'name',
'brand' => 'brand',
'official_name:fr-ca' => 'official_name:fr-ca',
+ 'short_name:fr-ca' => 'short_name:fr-ca',
'official_name:fr' => 'official_name:fr',
+ 'short_name:fr' => 'short_name:fr',
'official_name:en-ca' => 'official_name:en-ca',
+ 'short_name:en-ca' => 'short_name:en-ca',
'official_name:en' => 'official_name:en',
+ 'short_name:en' => 'short_name:en',
+ 'official_name' => 'official_name',
+ 'short_name' => 'short_name',
+ 'ref' => 'ref',
+ 'type' => 'type',
+ ), $oParams->getPreferredLanguages('default'));
+
+ $oParams = new ParameterParser(array('accept-language' => 'ja_rm,zh_pinyin'));
+ $this->assertSame(array(
+ 'name:ja_rm' => 'name:ja_rm',
+ 'name:zh_pinyin' => 'name:zh_pinyin',
+ 'name:ja' => 'name:ja',
+ 'name:zh' => 'name:zh',
+ 'name' => 'name',
+ 'brand' => 'brand',
+ 'official_name:ja_rm' => 'official_name:ja_rm',
+ 'short_name:ja_rm' => 'short_name:ja_rm',
+ 'official_name:zh_pinyin' => 'official_name:zh_pinyin',
+ 'short_name:zh_pinyin' => 'short_name:zh_pinyin',
+ 'official_name:ja' => 'official_name:ja',
+ 'short_name:ja' => 'short_name:ja',
+ 'official_name:zh' => 'official_name:zh',
+ 'short_name:zh' => 'short_name:zh',
'official_name' => 'official_name',
+ 'short_name' => 'short_name',
'ref' => 'ref',
'type' => 'type',
), $oParams->getPreferredLanguages('default'));
}
+
+ public function testHasSetAny()
+ {
+ $oParams = new ParameterParser(array(
+ 'one' => '',
+ 'two' => 0,
+ 'three' => '0',
+ 'four' => '1',
+ 'five' => 'anystring'
+ ));
+ $this->assertFalse($oParams->hasSetAny(array()));
+ $this->assertFalse($oParams->hasSetAny(array('')));
+ $this->assertFalse($oParams->hasSetAny(array('unknown')));
+ $this->assertFalse($oParams->hasSetAny(array('one', 'two', 'three')));
+ $this->assertTrue($oParams->hasSetAny(array('one', 'four')));
+ $this->assertTrue($oParams->hasSetAny(array('four')));
+ $this->assertTrue($oParams->hasSetAny(array('five')));
+ }
}
projects / nominatim.git / blobdiff