]> git.openstreetmap.org Git - nominatim.git/blobdiff - test/php/Nominatim/ParameterParserTest.php
Merge remote-tracking branch 'upstream/master'
[nominatim.git] / test / php / Nominatim / ParameterParserTest.php
index ec9e3fea02b04e40aebdf14441deb6b683b033ae..4265cffbb6f068d472f3e941237e4677582cad36 100644 (file)
@@ -16,11 +16,6 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
 {
 
 
-    protected function setUp()
-    {
-    }
-
-
     public function testGetBool()
     {
         $oParams = new ParameterParser([
@@ -31,13 +26,13 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
                                         'bool5' => ''
                                        ]);
 
-        $this->assertEquals(false, $oParams->getBool('non-exists'));
-        $this->assertEquals(true, $oParams->getBool('non-exists', true));
-        $this->assertEquals(true, $oParams->getBool('bool1'));
-        $this->assertEquals(false, $oParams->getBool('bool2'));
-        $this->assertEquals(true, $oParams->getBool('bool3'));
-        $this->assertEquals(true, $oParams->getBool('bool4'));
-        $this->assertEquals(false, $oParams->getBool('bool5'));
+        $this->assertSame(false, $oParams->getBool('non-exists'));
+        $this->assertSame(true, $oParams->getBool('non-exists', true));
+        $this->assertSame(true, $oParams->getBool('bool1'));
+        $this->assertSame(false, $oParams->getBool('bool2'));
+        $this->assertSame(true, $oParams->getBool('bool3'));
+        $this->assertSame(true, $oParams->getBool('bool4'));
+        $this->assertSame(false, $oParams->getBool('bool5'));
     }
 
 
@@ -45,59 +40,68 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
     {
         $oParams = new ParameterParser([
                                         'int1' => '5',
-                                        'int2' => 'a',
-                                        'int3' => '-1',
-                                        'int4' => '',
-                                        'int5' => 0
+                                        'int2' => '-1',
+                                        'int3' => 0
                                        ]);
 
-        $this->assertEquals(false, $oParams->getInt('non-exists'));
-        $this->assertEquals(999, $oParams->getInt('non-exists', 999));
-        $this->assertEquals(5, $oParams->getInt('int1'));
-
-        try {
-            $this->assertEquals(false, $oParams->getInt('int2'));
-        } catch (Exception $e) {
-            $this->assertEquals($e->getMessage(), "Integer number expected for parameter 'int2'");
-        }
-        $this->assertEquals(-1, $oParams->getInt('int3'));
-        $this->assertEquals(false, $oParams->getInt('int4'));
-        $this->assertEquals(false, $oParams->getInt('int5')); // FIXME: should be 0 instead?
+        $this->assertSame(false, $oParams->getInt('non-exists'));
+        $this->assertSame(999, $oParams->getInt('non-exists', 999));
+        $this->assertSame(5, $oParams->getInt('int1'));
+
+        $this->assertSame(-1, $oParams->getInt('int2'));
+        $this->assertSame(0, $oParams->getInt('int3'));
+    }
+
+
+    public function testGetIntWithNonNumber()
+    {
+        $this->setExpectedException(Exception::class, "Integer number expected for parameter 'int4'");
+        (new ParameterParser(['int4' => 'a']))->getInt('int4');
+    }
+
+
+    public function testGetIntWithEmpytString()
+    {
+        $this->setExpectedException(Exception::class, "Integer number expected for parameter 'int5'");
+        (new ParameterParser(['int5' => '']))->getInt('int5');
     }
 
 
     public function testGetFloat()
     {
+
         $oParams = new ParameterParser([
                                         'float1' => '1.0',
                                         'float2' => '-5',
-                                        'float3' => '-55.',
-                                        'float4' => 'a',
-                                        'float5' => '',
-                                        'float6' => 0
+                                        'float3' => 0
                                        ]);
 
-        $this->assertEquals(false, $oParams->getFloat('non-exists'));
-        $this->assertEquals(999, $oParams->getFloat('non-exists', 999));
-        $this->assertEquals(1, $oParams->getFloat('float1'));
-        $this->assertEquals(-5, $oParams->getFloat('float2'));
-
-        try {
-            $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?
+        $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(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 testGetFloatWithTextString()
+    {
+        $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()
     {
@@ -107,36 +111,35 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
                                         'str3' => '0'
                                        ]);
 
-        $this->assertEquals(false, $oParams->getString('non-exists'));
-        $this->assertEquals('default', $oParams->getString('non-exists', 'default'));
-        $this->assertEquals('abc', $oParams->getString('str1'));
-        $this->assertEquals(false, $oParams->getStringList('str2'));
-        $this->assertEquals(false, $oParams->getStringList('str3')); // FIXME: should be 0 instead?
+        $this->assertSame(false, $oParams->getString('non-exists'));
+        $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')); // sadly PHP magic treats 0 as false when returned
     }
 
 
-
     public function testGetSet()
     {
         $oParams = new ParameterParser([
                                         'val1' => 'foo',
-                                        'val2' => 'FOO',
-                                        'val3' => '',
-                                        'val4' => 0
+                                        'val2' => '',
+                                        'val3' => 0
                                        ]);
 
-        $this->assertEquals(false, $oParams->getSet('non-exists', ['foo', 'bar']));
-        // FIXME: unclear if the default value has to be part of the set
-        $this->assertEquals('default', $oParams->getSet('non-exists', ['foo', 'bar'], 'default'));
-        $this->assertEquals('foo', $oParams->getSet('val1', ['foo', 'bar']));
-
-        try {
-            $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('val4', ['foo', 'bar']));
+        $this->assertSame(false, $oParams->getSet('non-exists', ['foo', 'bar']));
+        $this->assertSame('default', $oParams->getSet('non-exists', ['foo', 'bar'], 'default'));
+        $this->assertSame('foo', $oParams->getSet('val1', ['foo', 'bar']));
+
+        $this->assertSame(false, $oParams->getSet('val2', ['foo', 'bar']));
+        $this->assertSame(0, $oParams->getSet('val3', ['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']);
     }
 
 
@@ -149,66 +152,66 @@ class ParameterParserTest extends \PHPUnit_Framework_TestCase
                                         'list4' => '0'
                                        ]);
 
-        $this->assertEquals(false, $oParams->getStringList('non-exists'));
-        $this->assertEquals(['a', 'b'], $oParams->getStringList('non-exists', ['a', 'b']));
-        // FIXME: unclear if empty string items should be removed
-        $this->assertEquals(['', 'a', 'b', 'c', '', 'c', 'd'], $oParams->getStringList('list1'));
-        $this->assertEquals(['a'], $oParams->getStringList('list2'));
-        $this->assertEquals(false, $oParams->getStringList('list3'));
-        $this->assertEquals(false, $oParams->getStringList('list4'));
+        $this->assertSame(false, $oParams->getStringList('non-exists'));
+        $this->assertSame(['a', 'b'], $oParams->getStringList('non-exists', ['a', 'b']));
+        $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'));
     }
 
+
     public function testGetPreferredLanguages()
     {
         $oParams = new ParameterParser(['accept-language' => '']);
-        $this->assertEquals([
-                             'brand' => 'brand',
-                             'ref' => 'ref',
-                             'type' => 'type',
-                             'name' => 'name',
-                             'name:default' => 'name:default',
-                             'short_name' => 'short_name',
-                             'short_name:default' => 'short_name:default',
-                             'official_name' => 'official_name',
-                             'official_name:default' => 'official_name:default',
-                            ], $oParams->getPreferredLanguages('default'));
+        $this->assertSame([
+                           'short_name:default' => 'short_name:default',
+                           'name:default' => 'name:default',
+                           'short_name' => 'short_name',
+                           'name' => 'name',
+                           'brand' => 'brand',
+                           'official_name:default' => 'official_name:default',
+                           'official_name' => 'official_name',
+                           'ref' => 'ref',
+                           'type' => 'type'
+                          ], $oParams->getPreferredLanguages('default'));
 
         $oParams = new ParameterParser(['accept-language' => 'de,en']);
-        $this->assertEquals([
-                             'brand' => 'brand',
-                             'ref' => 'ref',
-                             'type' => 'type',
-                             'name' => 'name',
-                             'name:de' => 'name:de',
-                             'name:en' => 'name:en',
-                             'short_name' => 'short_name',
-                             'short_name:de' => 'short_name:de',
-                             'short_name:en' => 'short_name:en',
-                             'official_name' => 'official_name',
-                             'official_name:de' => 'official_name:de',
-                             'official_name:en' => 'official_name:en',
-                            ], $oParams->getPreferredLanguages('default'));
+        $this->assertSame([
+                           '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',
+                           'official_name:en' => 'official_name:en',
+                           'official_name' => 'official_name',
+                           'ref' => 'ref',
+                           'type' => 'type'
+                          ], $oParams->getPreferredLanguages('default'));
 
         $oParams = new ParameterParser(['accept-language' => 'fr-ca,fr;q=0.8,en-ca;q=0.5,en;q=0.3']);
-        $this->assertEquals([
-                             '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',
-                             'official_name:fr' => 'official_name:fr',
-                             'official_name:en-ca' => 'official_name:en-ca',
-                             'official_name:en' => 'official_name:en',
-                             'official_name' => 'official_name',
-                             'ref' => 'ref',
-                             'type' => 'type',
-                            ], $oParams->getPreferredLanguages('default'));
+        $this->assertSame([
+                           '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',
+                           'official_name:fr' => 'official_name:fr',
+                           'official_name:en-ca' => 'official_name:en-ca',
+                           'official_name:en' => 'official_name:en',
+                           'official_name' => 'official_name',
+                           'ref' => 'ref',
+                           'type' => 'type',
+                          ], $oParams->getPreferredLanguages('default'));
     }
 }