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 4016a839860294eb05bb2167fe002e243453a1b5..d31b219b881ae6a05b4b4a1429ab86d256bd4a75 100644 (file)
--- a/test/php/Nominatim/TokenListTest.php
+++ b/test/php/Nominatim/TokenListTest.php
@@ -2,8 +2,6 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-// require_once(CONST_BasePath.'/lib/db.php');
-// require_once(CONST_BasePath.'/lib/cmd.php');

 require_once(CONST_BasePath.'/lib/TokenList.php');
 
 
 require_once(CONST_BasePath.'/lib/TokenList.php');
 
 


@@ -56,9 +54,18 @@ class TokenTest extends \PHPUnit\Framework\TestCase
     {
         $this->expectOutputRegex('/<p><tt>/');
 
     {
         $this->expectOutputRegex('/<p><tt>/');
 

-        $oDbStub = $this->getMockBuilder(\DB::class)
-                        ->setMethods(array('getAll'))
+        $oDbStub = $this->getMockBuilder(Nominatim\DB::class)
+                        ->setMethods(array('getAll', 'getDBQuotedList'))

                         ->getMock();
                         ->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();