X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/123a3c0347226b9b968fe75960fb660d7b6dda15..ac5a901daf8109cdd7880d23f765b5b4f5d0e665:/test/php/Nominatim/ParameterParserTest.php?ds=sidebyside diff --git a/test/php/Nominatim/ParameterParserTest.php b/test/php/Nominatim/ParameterParserTest.php index ddc06851..4265cffb 100644 --- a/test/php/Nominatim/ParameterParserTest.php +++ b/test/php/Nominatim/ParameterParserTest.php @@ -73,20 +73,23 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase $oParams = new ParameterParser([ 'float1' => '1.0', 'float2' => '-5', - 'float3' => '', - 'float4' => 0 + 'float3' => 0 ]); $this->assertSame(false, $oParams->getFloat('non-exists')); $this->assertSame(999, $oParams->getFloat('non-exists', 999)); $this->assertSame(1.0, $oParams->getFloat('float1')); $this->assertSame(-5.0, $oParams->getFloat('float2')); - $this->assertSame(false, $oParams->getFloat('float3')); // FIXME: should be 0 instead? - $this->assertSame(0.0, $oParams->getFloat('float4')); + $this->assertSame(0.0, $oParams->getFloat('float3')); } + public function testGetFloatWithEmptyString() + { + $this->setExpectedException(Exception::class, "Floating-point number expected for parameter 'float4'"); + (new ParameterParser(['float4' => '']))->getFloat('float4'); + } - public function testGetFloatWithString() + public function testGetFloatWithTextString() { $this->setExpectedException(Exception::class, "Floating-point number expected for parameter 'float5'"); (new ParameterParser(['float5' => 'a']))->getFloat('float5'); @@ -112,7 +115,7 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase $this->assertSame('default', $oParams->getString('non-exists', 'default')); $this->assertSame('abc', $oParams->getString('str1')); $this->assertSame(false, $oParams->getStringList('str2')); - $this->assertSame(false, $oParams->getStringList('str3')); // FIXME: should be 0 instead? + $this->assertSame(false, $oParams->getStringList('str3')); // sadly PHP magic treats 0 as false when returned } @@ -125,7 +128,6 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase ]); $this->assertSame(false, $oParams->getSet('non-exists', ['foo', 'bar'])); - // FIXME: unclear if the default value has to be part of the set $this->assertSame('default', $oParams->getSet('non-exists', ['foo', 'bar'], 'default')); $this->assertSame('foo', $oParams->getSet('val1', ['foo', 'bar'])); @@ -152,8 +154,7 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase $this->assertSame(false, $oParams->getStringList('non-exists')); $this->assertSame(['a', 'b'], $oParams->getStringList('non-exists', ['a', 'b'])); - // FIXME: unclear if empty string items should be removed - $this->assertSame(['', 'a', 'b', 'c', '', 'c', 'd'], $oParams->getStringList('list1')); + $this->assertSame(['a', 'b', 'c', 'c', 'd'], $oParams->getStringList('list1')); $this->assertSame(['a'], $oParams->getStringList('list2')); $this->assertSame(false, $oParams->getStringList('list3')); $this->assertSame(false, $oParams->getStringList('list4'));