Merge pull request #2542 from lonvia/update-phpunit

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

diff --git a/test/php/Nominatim/DatabaseErrorTest.php b/test/php/Nominatim/DatabaseErrorTest.php
index 7b461894f3f9c2efa96637850ed4eee7cb3cae56..6e70ac25d7cb5eeef1eaed359de671a147220ce3 100644 (file)
--- a/test/php/Nominatim/DatabaseErrorTest.php
+++ b/test/php/Nominatim/DatabaseErrorTest.php
@@ -2,8 +2,8 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require_once(CONST_BasePath.'/lib/init-website.php');
-require_once(CONST_BasePath.'/lib/DatabaseError.php');
+require_once(CONST_LibDir.'/init-website.php');
+require_once(CONST_LibDir.'/DatabaseError.php');

 
 class DatabaseErrorTest extends \PHPUnit\Framework\TestCase
 {
 
 class DatabaseErrorTest extends \PHPUnit\Framework\TestCase
 {


@@ -26,6 +26,6 @@ class DatabaseErrorTest extends \PHPUnit\Framework\TestCase
     public function testSqlObjectDump()
     {
         $oErr = new DatabaseError('Sql error', 123, null, array('one' => 'two'));
     public function testSqlObjectDump()
     {
         $oErr = new DatabaseError('Sql error', 123, null, array('one' => 'two'));

-        $this->assertRegExp('/two/', $oErr->getSqlDebugDump());
+        $this->assertStringContainsString('two', $oErr->getSqlDebugDump());

     }
 }
     }
 }