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

use setExpectedException to make sure exceptions are really thrown

Browse Source
This commit is contained in:
Marc Tobias Metten
2018-02-24 18:14:34 +01:00
parent fd9345cda3
commit 146779340c
1 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,59 +45,60 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
{ {
$oParams = new ParameterParser([ $oParams = new ParameterParser([
'int1' => '5', 'int1' => '5',
'int2' => 'a', 'int2' => '-1',
'int3' => '-1', 'int3' => '',
'int4' => '', 'int4' => 0
'int5' => 0
]); ]);
$this->assertEquals(false, $oParams->getInt('non-exists')); $this->assertEquals(false, $oParams->getInt('non-exists'));
$this->assertEquals(999, $oParams->getInt('non-exists', 999)); $this->assertEquals(999, $oParams->getInt('non-exists', 999));
$this->assertEquals(5, $oParams->getInt('int1')); $this->assertEquals(5, $oParams->getInt('int1'));
try { $this->assertEquals(-1, $oParams->getInt('int2'));
$this->assertEquals(false, $oParams->getInt('int2')); $this->assertEquals(false, $oParams->getInt('int3'));
} catch (Exception $e) { $this->assertEquals(false, $oParams->getInt('int4')); // FIXME: should be 0 instead?
$this->assertEquals($e->getMessage(), "Integer number expected for parameter 'int2'"); }
}
$this->assertEquals(-1, $oParams->getInt('int3'));
$this->assertEquals(false, $oParams->getInt('int4')); public function testGetIntWithEmpytString()
$this->assertEquals(false, $oParams->getInt('int5')); // FIXME: should be 0 instead? {
$this->setExpectedException(Exception::class, "Integer number expected for parameter 'int5'");
(new ParameterParser(['int5' => 'a']))->getInt('int5');
} }
public function testGetFloat() public function testGetFloat()
{ {
$oParams = new ParameterParser([ $oParams = new ParameterParser([
'float1' => '1.0', 'float1' => '1.0',
'float2' => '-5', 'float2' => '-5',
'float3' => '-55.', 'float3' => '',
'float4' => 'a', 'float4' => 0
'float5' => '',
'float6' => 0
]); ]);
$this->assertEquals(false, $oParams->getFloat('non-exists')); $this->assertEquals(false, $oParams->getFloat('non-exists'));
$this->assertEquals(999, $oParams->getFloat('non-exists', 999)); $this->assertEquals(999, $oParams->getFloat('non-exists', 999));
$this->assertEquals(1, $oParams->getFloat('float1')); $this->assertEquals(1, $oParams->getFloat('float1'));
$this->assertEquals(-5, $oParams->getFloat('float2')); $this->assertEquals(-5, $oParams->getFloat('float2'));
$this->assertEquals(false, $oParams->getFloat('float3'));
try { $this->assertEquals(false, $oParams->getFloat('float4')); // FIXME: should be 0 instead?
$this->assertEquals(false, $oParams->getFloat('float3'));
} catch (Exception $e) {
$this->assertEquals($e->getMessage(), "Floating-point number expected for parameter 'float3'");
}
try {
$this->assertEquals(false, $oParams->getFloat('float4'));
} catch (Exception $e) {
$this->assertEquals($e->getMessage(), "Floating-point number expected for parameter 'float4'");
}
$this->assertEquals(false, $oParams->getFloat('float5'));
$this->assertEquals(false, $oParams->getFloat('float6')); // FIXME: should be 0 instead?
} }
public function testGetFloatWithString()
{
$this->setExpectedException(Exception::class, "Floating-point number expected for parameter 'float5'");
(new ParameterParser(['float5' => 'a']))->getFloat('float5');
}
public function testGetFloatWithInvalidNumber()
{
$this->setExpectedException(Exception::class, "Floating-point number expected for parameter 'float6'");
(new ParameterParser(['float6' => '-55.']))->getFloat('float6');
}
public function testGetString() public function testGetString()
{ {
@@ -115,14 +116,12 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
} }
public function testGetSet() public function testGetSet()
{ {
$oParams = new ParameterParser([ $oParams = new ParameterParser([
'val1' => 'foo', 'val1' => 'foo',
'val2' => 'FOO', 'val2' => '',
'val3' => '', 'val3' => 0
'val4' => 0
]); ]);
$this->assertEquals(false, $oParams->getSet('non-exists', ['foo', 'bar'])); $this->assertEquals(false, $oParams->getSet('non-exists', ['foo', 'bar']));
@@ -130,13 +129,15 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('default', $oParams->getSet('non-exists', ['foo', 'bar'], 'default')); $this->assertEquals('default', $oParams->getSet('non-exists', ['foo', 'bar'], 'default'));
$this->assertEquals('foo', $oParams->getSet('val1', ['foo', 'bar'])); $this->assertEquals('foo', $oParams->getSet('val1', ['foo', 'bar']));
try { $this->assertEquals(false, $oParams->getSet('val2', ['foo', 'bar']));
$this->assertEquals(false, $oParams->getSet('val2', ['foo', 'bar']));
} catch (Exception $e) {
$this->assertEquals($e->getMessage(), "Parameter 'val2' must be one of: foo, bar");
}
$this->assertEquals(false, $oParams->getSet('val3', ['foo', 'bar'])); $this->assertEquals(false, $oParams->getSet('val3', ['foo', 'bar']));
$this->assertEquals(false, $oParams->getSet('val4', ['foo', 'bar'])); }
public function testGetSetWithValueNotInSet()
{
$this->setExpectedException(Exception::class, "Parameter 'val4' must be one of: foo, bar");
(new ParameterParser(['val4' => 'faz']))->getSet('val4', ['foo', 'bar']);
} }
@@ -158,6 +159,7 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(false, $oParams->getStringList('list4')); $this->assertEquals(false, $oParams->getStringList('list4'));
} }
public function testGetPreferredLanguages() public function testGetPreferredLanguages()
{ {
$oParams = new ParameterParser(['accept-language' => '']); $oParams = new ParameterParser(['accept-language' => '']);