Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/php/Nominatim/TokenListTest.php b/test/php/Nominatim/TokenListTest.php
index 38f13e184db8ea73ad8261b18b205d32d3b37085..d31b219b881ae6a05b4b4a1429ab86d256bd4a75 100644 (file)
--- a/test/php/Nominatim/TokenListTest.php
+++ b/test/php/Nominatim/TokenListTest.php
@@ -2,17 +2,16 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-@define('CONST_BasePath', '../../');
+require_once(CONST_BasePath.'/lib/TokenList.php');

 
 

-require_once '../../lib/db.php';
-require_once '../../lib/cmd.php';
-require_once '../../lib/TokenList.php';

 
 

-class TokenTest extends \PHPUnit_Framework_TestCase
+class TokenTest extends \PHPUnit\Framework\TestCase

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

-        $this->oNormalizer = $this->getMock(\MockNormalizer::class, array('transliterate'));
+        $this->oNormalizer = $this->getMockBuilder(\MockNormalizer::class)
+                                  ->setMethods(array('transliterate'))
+                                  ->getMock();

         $this->oNormalizer->method('transliterate')
                           ->will($this->returnCallback(function ($text) {
                               return strtolower($text);
         $this->oNormalizer->method('transliterate')
                           ->will($this->returnCallback(function ($text) {
                               return strtolower($text);


@@ -55,7 +54,18 @@ class TokenTest extends \PHPUnit_Framework_TestCase
     {
         $this->expectOutputRegex('/<p><tt>/');
 
     {
         $this->expectOutputRegex('/<p><tt>/');
 

-        $oDbStub = $this->getMock(\DB::class, array('getAll'));
+        $oDbStub = $this->getMockBuilder(Nominatim\DB::class)
+                        ->setMethods(array('getAll', 'getDBQuotedList'))
+                        ->getMock();
+
+        $oDbStub->method('getDBQuotedList')
+                ->will($this->returnCallback(function ($aVals) {
+                    return array_map(function ($sVal) {
+                        return "'".$sVal."'";
+                    }, $aVals);
+                }));
+
+

         $oDbStub->method('getAll')
                 ->will($this->returnCallback(function ($sql) {
                     $aResults = array();
         $oDbStub->method('getAll')
                 ->will($this->returnCallback(function ($sql) {
                     $aResults = array();