Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/php/Nominatim/DatabaseErrorTest.php b/test/php/Nominatim/DatabaseErrorTest.php
index 25b4aa0bfa1aeba60e45caa76887d951ea5d6ed3..da15649347cc73ae293f83b6acbb1037614b4c42 100644 (file)
--- a/test/php/Nominatim/DatabaseErrorTest.php
+++ b/test/php/Nominatim/DatabaseErrorTest.php
@@ -2,15 +2,15 @@
 
 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
 {
 
     public function testSqlMessage()
     {
 
 class DatabaseErrorTest extends \PHPUnit\Framework\TestCase
 {
 
     public function testSqlMessage()
     {

-        $oSqlStub = $this->getMockBuilder(\DB_Error::class)
+        $oSqlStub = $this->getMockBuilder(PDOException::class)

                     ->setMethods(array('getMessage'))
                     ->getMock();
 
                     ->setMethods(array('getMessage'))
                     ->getMock();
 


@@ -21,9 +21,6 @@ class DatabaseErrorTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('Sql error', $oErr->getMessage());
         $this->assertEquals(123, $oErr->getCode());
         $this->assertEquals('Unknown table.', $oErr->getSqlError());
         $this->assertEquals('Sql error', $oErr->getMessage());
         $this->assertEquals(123, $oErr->getCode());
         $this->assertEquals('Unknown table.', $oErr->getSqlError());

-
-        // causes a circular reference warning during dump
-        // $this->assertRegExp('/Mock_DB_Error/', $oErr->getSqlDebugDump());

     }
 
     public function testSqlObjectDump()
     }
 
     public function testSqlObjectDump()


@@ -31,14 +28,4 @@ class DatabaseErrorTest extends \PHPUnit\Framework\TestCase
         $oErr = new DatabaseError('Sql error', 123, null, array('one' => 'two'));
         $this->assertRegExp('/two/', $oErr->getSqlDebugDump());
     }
         $oErr = new DatabaseError('Sql error', 123, null, array('one' => 'two'));
         $this->assertRegExp('/two/', $oErr->getSqlDebugDump());
     }

-
-    public function testChksqlThrows()
-    {
-        $this->expectException(DatabaseError::class);
-        $this->expectExceptionMessage('My custom error message');
-        $this->expectExceptionCode(500);
-
-        $oDB = new \DB_Error;
-        $this->assertEquals(false, chksql($oDB, 'My custom error message'));
-    }

 }
 }