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 ee6f94f237e83e0c09a66c760b6e476437b2c482..55ae1aaa055eaf93dfb4693bdf9c9b33edf77381 100644 (file)
--- a/test/php/Nominatim/LibTest.php
+++ b/test/php/Nominatim/LibTest.php
@@ -3,12 +3,13 @@
 namespace Nominatim;
 
 require_once '../../lib/lib.php';
+require_once '../../lib/ClassTypes.php';
 
 class LibTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetClassTypesWithImportance()
     {
-        $aClasses = getClassTypesWithImportance();
+        $aClasses = ClassTypes\getListWithImportance();
 
         $this->assertGreaterThan(
             200,
@@ -31,22 +32,22 @@ class LibTest extends \PHPUnit_Framework_TestCase
 
     public function testGetResultDiameter()
     {
-        $aResult = array();
+        $aResult = array('class' => '', 'type' => '');
         $this->assertEquals(
             0.0001,
-            getResultDiameter($aResult)
+            ClassTypes\getProperty($aResult, 'defdiameter', 0.0001)
         );
 
         $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,
-            getResultDiameter($aResult)
+            ClassTypes\getProperty($aResult, 'defdiameter', 0.0001)
         );
     }
 
@@ -70,9 +71,9 @@ class LibTest extends \PHPUnit_Framework_TestCase
         );
         $this->assertEquals(
             array(
-             ['', 0, 2],
-             ['', 0.12558103905863, 1.9960534568565],
-             ['', 0.25066646712861, 1.984229402629]
+             array('', 0, 2),
+             array('', 0.12558103905863, 1.9960534568565),
+             array('', 0.25066646712861, 1.984229402629)
             ),
             array_splice($aPoints, 0, 3)
         );
@@ -96,9 +97,9 @@ class LibTest extends \PHPUnit_Framework_TestCase
         );
         $this->assertEquals(
             array(
-             [10, 21],
-             [10.062790519529, 20.998026728428],
-             [10.125333233564, 20.992114701314]
+             array(10, 21),
+             array(10.062790519529, 20.998026728428),
+             array(10.125333233564, 20.992114701314)
             ),
             array_splice($aPoints, 0, 3)
         );
@@ -106,11 +107,11 @@ class LibTest extends \PHPUnit_Framework_TestCase
         // POLYGON
         $this->assertEquals(
             array(
-             ['30', '10'],
-             ['40', '40'],
-             ['20', '40'],
-             ['10', '20'],
-             ['30', '10']
+             array('30', '10'),
+             array('40', '40'),
+             array('20', '40'),
+             array('10', '20'),
+             array('30', '10')
             ),
             geometryText2Points('POLYGON((30 10, 40 40, 20 40, 10 20, 30 10))', $fRadius)
         );
@@ -118,10 +119,10 @@ class LibTest extends \PHPUnit_Framework_TestCase
         // MULTIPOLYGON
         $this->assertEquals(
             array(
-             ['30', '20'], // first polygon only
-             ['45', '40'],
-             ['10', '40'],
-             ['30', '20'],
+             array('30', '20'), // first polygon only
+             array('45', '40'),
+             array('10', '40'),
+             array('30', '20'),
             ),
             geometryText2Points('MULTIPOLYGON(((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))', $fRadius)
         );
@@ -190,15 +191,15 @@ class LibTest extends \PHPUnit_Framework_TestCase
 
     private function closestHouseNumberEvenOddOther($startnumber, $endnumber, $fraction, $aExpected)
     {
-        foreach (['even', 'odd', 'other'] as $itype) {
+        foreach (array('even', 'odd', 'other') as $itype) {
             $this->assertEquals(
                 $aExpected[$itype],
-                closestHouseNumber([
+                closestHouseNumber(array(
                                     'startnumber' => $startnumber,
                                     'endnumber' => $endnumber,
                                     'fraction' => $fraction,
                                     'interpolationtype' => $itype
-                                   ]),
+                                   )),
                 "$startnumber => $endnumber, $fraction, $itype"
             );
         }
@@ -206,14 +207,14 @@ class LibTest extends \PHPUnit_Framework_TestCase
 
     public function testClosestHouseNumber()
     {
-        $this->closestHouseNumberEvenOddOther(50, 100, 0.5, ['even' => 76, 'odd' => 75, 'other' => 75]);
+        $this->closestHouseNumberEvenOddOther(50, 100, 0.5, array('even' => 76, 'odd' => 75, 'other' => 75));
         // upper bound
-        $this->closestHouseNumberEvenOddOther(50, 100, 1.5, ['even' => 100, 'odd' => 100, 'other' => 100]);
+        $this->closestHouseNumberEvenOddOther(50, 100, 1.5, array('even' => 100, 'odd' => 100, 'other' => 100));
         // lower bound
-        $this->closestHouseNumberEvenOddOther(50, 100, -0.5, ['even' => 50, 'odd' => 50, 'other' => 50]);
+        $this->closestHouseNumberEvenOddOther(50, 100, -0.5, array('even' => 50, 'odd' => 50, 'other' => 50));
         // fraction 0
-        $this->closestHouseNumberEvenOddOther(50, 100, 0, ['even' => 50, 'odd' => 51, 'other' => 50]);
+        $this->closestHouseNumberEvenOddOther(50, 100, 0, array('even' => 50, 'odd' => 51, 'other' => 50));
         // start == end
-        $this->closestHouseNumberEvenOddOther(50, 50, 0.5, ['even' => 50, 'odd' => 50, 'other' => 50]);
+        $this->closestHouseNumberEvenOddOther(50, 50, 0.5, array('even' => 50, 'odd' => 50, 'other' => 50));
     }
 }