X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a5d35d6e84d5de5f6ae98d09a7863cf50a84f586..979aebbfcd0bbdac322dfe7fadeadd88f06fb58a:/test/php/Nominatim/StatusTest.php diff --git a/test/php/Nominatim/StatusTest.php b/test/php/Nominatim/StatusTest.php index 448940db..5f8bac64 100644 --- a/test/php/Nominatim/StatusTest.php +++ b/test/php/Nominatim/StatusTest.php @@ -1,19 +1,29 @@ setExpectedException(Exception::class, 'No database', 700); + $this->expectException(\Exception::class); + $this->expectExceptionMessage('No database'); + $this->expectExceptionCode(700); $oDB = null; $oStatus = new Status($oDB); @@ -22,55 +32,29 @@ class StatusTest extends \PHPUnit\Framework\TestCase public function testNoDatabaseConnectionFail() { - $this->setExpectedException(Exception::class, 'No database', 700); + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Database connection failed'); + $this->expectExceptionCode(700); - // causes 'Non-static method should not be called statically, assuming $this from incompatible context' - // failure on travis - // $oDB = \DB::connect('', false); // returns a DB_Error instance - - $oDB = new \DB_Error; - $oStatus = new Status($oDB); - $this->assertEquals('No database', $oStatus->status()); + $oDbStub = $this->getMockBuilder(Nominatim\DB::class) + ->setMethods(array('connect')) + ->getMock(); - $oDB = null; - $oStatus = new Status($oDB); - $this->assertEquals('No database', $oStatus->status()); - } - - - public function testModuleFail() - { - $this->setExpectedException(Exception::class, 'Module call failed', 702); - - // stub has getOne method but doesn't return anything - $oDbStub = $this->getMock(\DB::class, array('getOne')); - - $oStatus = new Status($oDbStub); - $this->assertNull($oStatus->status()); - } - - - public function testWordIdQueryFail() - { - $this->setExpectedException(Exception::class, 'No value', 704); - - $oDbStub = $this->getMock(\DB::class, array('getOne')); - - // return no word_id - $oDbStub->method('getOne') - ->will($this->returnCallback(function ($sql) { - if (preg_match("/make_standard_name\('a'\)/", $sql)) return 'a'; - if (preg_match('/SELECT word_id, word_token/', $sql)) return null; + $oDbStub->method('connect') + ->will($this->returnCallback(function () { + throw new \Nominatim\DatabaseError('psql connection problem', 500, null, 'unknown database'); })); + $oStatus = new Status($oDbStub); - $this->assertNull($oStatus->status()); + $this->assertEquals('No database', $oStatus->status()); } - public function testOK() { - $oDbStub = $this->getMock(\DB::class, array('getOne')); + $oDbStub = $this->getMockBuilder(Nominatim\DB::class) + ->setMethods(array('connect', 'getOne')) + ->getMock(); $oDbStub->method('getOne') ->will($this->returnCallback(function ($sql) { @@ -84,8 +68,10 @@ class StatusTest extends \PHPUnit\Framework\TestCase public function testDataDate() { - $oDbStub = $this->getMock(\DB::class, array('getOne')); - + $oDbStub = $this->getMockBuilder(Nominatim\DB::class) + ->setMethods(array('getOne')) + ->getMock(); + $oDbStub->method('getOne') ->willReturn(1519430221);