hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-07 18:44:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unit tests for class types

Browse Source
This commit is contained in:
Sarah Hoffmann
2018-07-12 23:59:29 +02:00
parent be58b929f2
commit b17019a21c
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib.php
View File

@@ -1,7 +1,5 @@
<?php <?php
require_once(CONST_BasePath.'/lib/ClassTypes.php');
function fail($sError, $sUserError = false) function fail($sError, $sUserError = false)
{ {
if (!$sUserError) $sUserError = $sError; if (!$sUserError) $sUserError = $sError;

11
test/php/Nominatim/LibTest.php
View File

@@ -3,12 +3,13 @@
namespace Nominatim; namespace Nominatim;
require_once '../../lib/lib.php'; require_once '../../lib/lib.php';
require_once '../../lib/ClassTypes.php';
class LibTest extends \PHPUnit_Framework_TestCase class LibTest extends \PHPUnit_Framework_TestCase
{ {
public function testGetClassTypesWithImportance() public function testGetClassTypesWithImportance()
{ {
$aClasses = getClassTypesWithImportance(); $aClasses = ClassTypes\getListWithImportance();
$this->assertGreaterThan( $this->assertGreaterThan(
200, 200,
@@ -31,22 +32,22 @@ class LibTest extends \PHPUnit_Framework_TestCase
public function testGetResultDiameter() public function testGetResultDiameter()
{ {
$aResult = array(); $aResult = array('class' => '', 'type' => '');
$this->assertEquals( $this->assertEquals(
0.0001, 0.0001,
getResultDiameter($aResult) ClassTypes\getProperty($aResult, 'defdiameter', 0.0001)
); );
$aResult = array('class' => 'place', 'type' => 'country'); $aResult = array('class' => 'place', 'type' => 'country');
$this->assertEquals( $this->assertEquals(
15, 15,
getResultDiameter($aResult) ClassTypes\getProperty($aResult, 'defdiameter', 0.0001)
); );
$aResult = array('class' => 'boundary', 'type' => 'administrative', 'admin_level' => 6); $aResult = array('class' => 'boundary', 'type' => 'administrative', 'admin_level' => 6);
$this->assertEquals( $this->assertEquals(
0.32, 0.32,
getResultDiameter($aResult) ClassTypes\getProperty($aResult, 'defdiameter', 0.0001)
); );
} }