X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4e2fe6427ce03a0ed3c5fdfe384f7867ef52fcca..764dcd7f6459c08aafd5cf2fcb7902cc2868cb30:/test/php/Nominatim/DatabaseErrorTest.php?ds=sidebyside diff --git a/test/php/Nominatim/DatabaseErrorTest.php b/test/php/Nominatim/DatabaseErrorTest.php index 25b4aa0b..7b461894 100644 --- a/test/php/Nominatim/DatabaseErrorTest.php +++ b/test/php/Nominatim/DatabaseErrorTest.php @@ -10,7 +10,7 @@ class DatabaseErrorTest extends \PHPUnit\Framework\TestCase public function testSqlMessage() { - $oSqlStub = $this->getMockBuilder(\DB_Error::class) + $oSqlStub = $this->getMockBuilder(PDOException::class) ->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()); - - // causes a circular reference warning during dump - // $this->assertRegExp('/Mock_DB_Error/', $oErr->getSqlDebugDump()); } 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()); } - - 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')); - } }