Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/php/Nominatim/DebugTest.php b/test/php/Nominatim/DebugTest.php
index 7ed08122f8e32db2270c497e90c553d4deabaab2..7ef1dba336836be7f6f6626a75f36943e6edb472 100644 (file)
--- a/test/php/Nominatim/DebugTest.php
+++ b/test/php/Nominatim/DebugTest.php
@@ -2,19 +2,23 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-use Exception;
+require_once(CONST_BasePath.'/lib/DebugHtml.php');

 
 

-require_once('../../lib/DebugHtml.php');
-
-class DebugTest extends \PHPUnit_Framework_TestCase
+class DebugTest extends \PHPUnit\Framework\TestCase

 {
 {

+

     protected function setUp()
     {
     protected function setUp()
     {

-        $this->oWithDebuginfo = $this->getMock(Geocode::class, array('debugInfo'));
+        $this->oWithDebuginfo = $this->getMockBuilder(\GeococdeMock::class)
+                                    ->setMethods(array('debugInfo'))
+                                    ->getMock();

         $this->oWithDebuginfo->method('debugInfo')
                   ->willReturn(array('key1' => 'val1', 'key2' => 'val2', 'key3' => 'val3'));
 
         $this->oWithDebuginfo->method('debugInfo')
                   ->willReturn(array('key1' => 'val1', 'key2' => 'val2', 'key3' => 'val3'));
 

-        $this->oWithToString = $this->getMock(Geocode::class, array('__toString'));
+
+        $this->oWithToString = $this->getMockBuilder(\SomeMock::class)
+                                    ->setMethods(array('__toString'))
+                                    ->getMock();

         $this->oWithToString->method('__toString')->willReturn('me as string');
     }
 
         $this->oWithToString->method('__toString')->willReturn('me as string');
     }
 


@@ -179,19 +183,19 @@ EOT
 
         // header are taken from first group item, thus no key3 gets printed
         $aGroups = array(
 
         // header are taken from first group item, thus no key3 gets printed
         $aGroups = array(

-            'group1' => array(
-                array('key1' => 'val1', 'key2' => 'val2'),
-                array('key1' => 'one', 'key2' => 'two', 'unknown' => 1),
-            ),
-            'group2' => array(
-                array('key1' => 'val1', 'key2' => 'val2', 'key3' => 'val3'),
-            )
-        );
+                    'group1' => array(
+                                 array('key1' => 'val1', 'key2' => 'val2'),
+                                 array('key1' => 'one', 'key2' => 'two', 'unknown' => 1),
+                                ),
+                    'group2' => array(
+                                 array('key1' => 'val1', 'key2' => 'val2', 'key3' => 'val3'),
+                                )
+                   );

         Debug::printGroupTable('Table3', $aGroups);
 
         $aGroups = array(
         Debug::printGroupTable('Table3', $aGroups);
 
         $aGroups = array(

-            'group1' => array($this->oWithDebuginfo, $this->oWithDebuginfo),
-        );
+                    'group1' => array($this->oWithDebuginfo, $this->oWithDebuginfo),
+                   );

         Debug::printGroupTable('Table4', $aGroups);
     }
 }
         Debug::printGroupTable('Table4', $aGroups);
     }
 }