Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/php/Nominatim/StatusTest.php b/test/php/Nominatim/StatusTest.php
index eb4ad68aae25b2d84f9e844416c40efdff946878..9e03a970fd2aa1211c234460918dd119cf6a7cc0 100644 (file)
--- a/test/php/Nominatim/StatusTest.php
+++ b/test/php/Nominatim/StatusTest.php
@@ -2,8 +2,10 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require_once(CONST_BasePath.'/lib/db.php');
-require_once(CONST_BasePath.'/lib/Status.php');
+@define('CONST_TokenizerDir', dirname(__FILE__));
+
+require_once(CONST_LibDir.'/DB.php');
+require_once(CONST_LibDir.'/Status.php');

 
 
 class StatusTest extends \PHPUnit\Framework\TestCase
 
 
 class StatusTest extends \PHPUnit\Framework\TestCase


@@ -23,65 +25,27 @@ class StatusTest extends \PHPUnit\Framework\TestCase
     public function testNoDatabaseConnectionFail()
     {
         $this->expectException(\Exception::class);
     public function testNoDatabaseConnectionFail()
     {
         $this->expectException(\Exception::class);

-        $this->expectExceptionMessage('No database');
+        $this->expectExceptionMessage('Database connection failed');

         $this->expectExceptionCode(700);
 
         $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());
-
-        $oDB = null;
-        $oStatus = new Status($oDB);
-        $this->assertEquals('No database', $oStatus->status());
-    }
-
-
-    public function testModuleFail()
-    {
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Module call failed');
-        $this->expectExceptionCode(702);
-
-        // stub has getOne method but doesn't return anything
-        $oDbStub = $this->getMockBuilder(\DB::class)
-                        ->setMethods(array('getOne'))
+        $oDbStub = $this->getMockBuilder(Nominatim\DB::class)
+                        ->setMethods(array('connect'))

                         ->getMock();
 
                         ->getMock();
 

-        $oStatus = new Status($oDbStub);
-        $this->assertNull($oStatus->status());
-    }
-
-
-    public function testWordIdQueryFail()
-    {
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('No value');
-        $this->expectExceptionCode(704);
-
-        $oDbStub = $this->getMockBuilder(\DB::class)
-                        ->setMethods(array('getOne'))
-                        ->getMock();
-
-        // 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);
         $oStatus = new Status($oDbStub);

-        $this->assertNull($oStatus->status());
+        $this->assertEquals('No database', $oStatus->status());

     }
 
     }
 

-

     public function testOK()
     {
     public function testOK()
     {

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

                         ->getMock();
 
         $oDbStub->method('getOne')
                         ->getMock();
 
         $oDbStub->method('getOne')


@@ -96,10 +60,10 @@ class StatusTest extends \PHPUnit\Framework\TestCase
 
     public function testDataDate()
     {
 
     public function testDataDate()
     {

-        $oDbStub = $this->getMockBuilder(\DB::class)
+        $oDbStub = $this->getMockBuilder(Nominatim\DB::class)

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

-     
+

         $oDbStub->method('getOne')
                 ->willReturn(1519430221);
 
         $oDbStub->method('getOne')
                 ->willReturn(1519430221);