Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / php / Nominatim / LibTest.php

diff --git a/test/php/Nominatim/LibTest.php b/test/php/Nominatim/LibTest.php
index 533188adea7c98e612a1d645e68eccb8c1864cc2..d2237b602657939b44aadc158792c66701469403 100644 (file)
--- a/test/php/Nominatim/LibTest.php
+++ b/test/php/Nominatim/LibTest.php
@@ -2,13 +2,13 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require_once '../../lib/lib.php';
+require_once(CONST_BasePath.'/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(
             200,
 
         $this->assertGreaterThan(
             200,


@@ -31,22 +31,22 @@ class LibTest extends \PHPUnit_Framework_TestCase
 
     public function testGetResultDiameter()
     {
 
     public function testGetResultDiameter()
     {

-        $aResult = array();
+        $aResult = array('class' => '', 'type' => '');

         $this->assertEquals(
             0.0001,
         $this->assertEquals(
             0.0001,

-            getResultDiameter($aResult)
+            ClassTypes\getProperty($aResult, 'defdiameter', 0.0001)

         );
 
         $aResult = array('class' => 'place', 'type' => 'country');
         $this->assertEquals(
             15,
         );
 
         $aResult = array('class' => 'place', 'type' => 'country');
         $this->assertEquals(
             15,

-            getResultDiameter($aResult)
+            ClassTypes\getProperty($aResult, 'defdiameter', 0.0001)

         );
 
         $aResult = array('class' => 'boundary', 'type' => 'administrative', 'admin_level' => 6);
         $this->assertEquals(
             0.32,
         );
 
         $aResult = array('class' => 'boundary', 'type' => 'administrative', 'admin_level' => 6);
         $this->assertEquals(
             0.32,

-            getResultDiameter($aResult)
+            ClassTypes\getProperty($aResult, 'defdiameter', 0.0001)

         );
     }
 
         );
     }