Merge pull request #2181 from lonvia/port-more-tool-functions-to-python

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

diff --git a/test/php/Nominatim/LibTest.php b/test/php/Nominatim/LibTest.php
index 7e8cbcc345dc98f9e3ea022a2cb34b2c9e56f289..5111b32641901d8fc9db42007acb4ce70d8a5e5e 100644 (file)
--- a/test/php/Nominatim/LibTest.php
+++ b/test/php/Nominatim/LibTest.php
@@ -2,8 +2,8 @@
 
 namespace Nominatim;
 
-require_once(CONST_BasePath.'/lib/lib.php');
-require_once(CONST_BasePath.'/lib/ClassTypes.php');
+require_once(CONST_LibDir.'/lib.php');
+require_once(CONST_LibDir.'/ClassTypes.php');
 
 class LibTest extends \PHPUnit\Framework\TestCase
 {
@@ -15,26 +15,6 @@ class LibTest extends \PHPUnit\Framework\TestCase
         $this->assertSame("''", addQuotes(''));
     }
 
-
-    public function testCreatePointsAroundCenter()
-    {
-        // you might say we're creating a circle
-        $aPoints = createPointsAroundCenter(0, 0, 2);
-
-        $this->assertEquals(
-            101,
-            count($aPoints)
-        );
-        $this->assertEquals(
-            array(
-             array('', 0, 2),
-             array('', 0.12558103905863, 1.9960534568565),
-             array('', 0.25066646712861, 1.984229402629)
-            ),
-            array_splice($aPoints, 0, 3)
-        );
-    }
-
     public function testParseLatLon()
     {
         // no coordinates expected
@@ -98,8 +78,8 @@ class LibTest extends \PHPUnit\Framework\TestCase
 
         foreach ($aQueries as $sQuery) {
             $aRes = parseLatLon($sQuery);
-            $this->assertEquals(40.446, $aRes[1], 'degrees decimal ' . $sQuery, 0.01);
-            $this->assertEquals(-79.982, $aRes[2], 'degrees decimal ' . $sQuery, 0.01);
+            $this->assertEqualsWithDelta(40.446, $aRes[1], 0.01, 'degrees decimal ' . $sQuery);
+            $this->assertEqualsWithDelta(-79.982, $aRes[2], 0.01, 'degrees decimal ' . $sQuery);
             $this->assertEquals($sQuery, $aRes[0]);
         }
     }
@@ -132,12 +112,4 @@ class LibTest extends \PHPUnit\Framework\TestCase
         // start == end
         $this->closestHouseNumberEvenOddOther(50, 50, 0.5, array('even' => 50, 'odd' => 50, 'other' => 50));
     }
-
-    public function testGetSearchRankLabel()
-    {
-        $this->assertEquals('unknown', getSearchRankLabel(null));
-        $this->assertEquals('continent', getSearchRankLabel(0));
-        $this->assertEquals('continent', getSearchRankLabel(1));
-        $this->assertEquals('other: 30', getSearchRankLabel(30));
-    }
 }