Merge "rdbms: make safeWaitForMasterPos() respect "waitTimeout""

[lhc/web/wiklou.git] / tests / phpunit / includes / db / LBFactoryTest.php

diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index e52dac6..356ebe5 100644 (file)
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -25,7 +25,9 @@
 
 use Wikimedia\Rdbms\LBFactorySimple;
 use Wikimedia\Rdbms\LBFactoryMulti;
+use Wikimedia\Rdbms\LoadBalancer;
 use Wikimedia\Rdbms\ChronologyProtector;
+use Wikimedia\Rdbms\DatabaseMysqli;
 use Wikimedia\Rdbms\MySQLMasterPos;
 use Wikimedia\Rdbms\DatabaseDomain;
 
@@ -41,7 +43,7 @@ class LBFactoryTest extends MediaWikiTestCase {
         * @dataProvider getLBFactoryClassProvider
         */
        public function testGetLBFactoryClass( $expected, $deprecated ) {
-               $mockDB = $this->getMockBuilder( 'DatabaseMysqli' )
+               $mockDB = $this->getMockBuilder( DatabaseMysqli::class )
                        ->disableOriginalConstructor()
                        ->getMock();
 
@@ -129,7 +131,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 
                $factory = new LBFactorySimple( [
                        'servers' => $servers,
-                       'loadMonitorClass' => 'LoadMonitorNull'
+                       'loadMonitorClass' => LoadMonitorNull::class
                ] );
                $lb = $factory->getMainLB();
 
@@ -174,7 +176,7 @@ class LBFactoryTest extends MediaWikiTestCase {
                                'test-db1'  => $wgDBserver,
                                'test-db2'  => $wgDBserver
                        ],
-                       'loadMonitorClass' => 'LoadMonitorNull'
+                       'loadMonitorClass' => LoadMonitorNull::class
                ] );
                $lb = $factory->getMainLB();
 
@@ -199,14 +201,14 @@ class LBFactoryTest extends MediaWikiTestCase {
                $now = microtime( true );
 
                // Master DB 1
-               $mockDB1 = $this->getMockBuilder( 'DatabaseMysqli' )
+               $mockDB1 = $this->getMockBuilder( DatabaseMysqli::class )
                        ->disableOriginalConstructor()
                        ->getMock();
                $mockDB1->method( 'writesOrCallbacksPending' )->willReturn( true );
                $mockDB1->method( 'lastDoneWrites' )->willReturn( $now );
                $mockDB1->method( 'getMasterPos' )->willReturn( $m1Pos );
                // Load balancer for master DB 1
-               $lb1 = $this->getMockBuilder( 'LoadBalancer' )
+               $lb1 = $this->getMockBuilder( LoadBalancer::class )
                        ->disableOriginalConstructor()
                        ->getMock();
                $lb1->method( 'getConnection' )->willReturn( $mockDB1 );
@@ -224,14 +226,14 @@ class LBFactoryTest extends MediaWikiTestCase {
                $lb1->method( 'getMasterPos' )->willReturn( $m1Pos );
                $lb1->method( 'getServerName' )->with( 0 )->willReturn( 'master1' );
                // Master DB 2
-               $mockDB2 = $this->getMockBuilder( 'DatabaseMysqli' )
+               $mockDB2 = $this->getMockBuilder( DatabaseMysqli::class )
                        ->disableOriginalConstructor()
                        ->getMock();
                $mockDB2->method( 'writesOrCallbacksPending' )->willReturn( true );
                $mockDB2->method( 'lastDoneWrites' )->willReturn( $now );
                $mockDB2->method( 'getMasterPos' )->willReturn( $m2Pos );
                // Load balancer for master DB 2
-               $lb2 = $this->getMockBuilder( 'LoadBalancer' )
+               $lb2 = $this->getMockBuilder( LoadBalancer::class )
                        ->disableOriginalConstructor()
                        ->getMock();
                $lb2->method( 'getConnection' )->willReturn( $mockDB2 );
@@ -277,7 +279,7 @@ class LBFactoryTest extends MediaWikiTestCase {
                // (b) Second HTTP request
 
                // Load balancer for master DB 1
-               $lb1 = $this->getMockBuilder( 'LoadBalancer' )
+               $lb1 = $this->getMockBuilder( LoadBalancer::class )
                        ->disableOriginalConstructor()
                        ->getMock();
                $lb1->method( 'getServerCount' )->willReturn( 2 );
@@ -285,7 +287,7 @@ class LBFactoryTest extends MediaWikiTestCase {
                $lb1->expects( $this->once() )
                        ->method( 'waitFor' )->with( $this->equalTo( $m1Pos ) );
                // Load balancer for master DB 2
-               $lb2 = $this->getMockBuilder( 'LoadBalancer' )
+               $lb2 = $this->getMockBuilder( LoadBalancer::class )
                        ->disableOriginalConstructor()
                        ->getMock();
                $lb2->method( 'getServerCount' )->willReturn( 2 );
@@ -337,7 +339,7 @@ class LBFactoryTest extends MediaWikiTestCase {
                        'hostsByName' => [
                                'test-db1' => $wgDBserver,
                        ],
-                       'loadMonitorClass' => 'LoadMonitorNull',
+                       'loadMonitorClass' => LoadMonitorNull::class,
                        'localDomain' => new DatabaseDomain( $wgDBname, null, $wgDBprefix )
                ] );
        }
@@ -374,14 +376,14 @@ class LBFactoryTest extends MediaWikiTestCase {
                $db = $lb->getConnection( DB_MASTER, [], '' );
 
                $this->assertEquals(
-                       $wgDBname,
+                       '',
                        $db->getDomainId(),
-                       'Main domain ID handle used; same DB name'
+                       'Null domain ID handle used'
                );
                $this->assertEquals(
-                       $wgDBname,
+                       '',
                        $db->getDBname(),
-                       'Main domain ID handle used; same DB name'
+                       'Null domain ID handle used'
                );
                $this->assertEquals(
                        '',
@@ -444,16 +446,16 @@ class LBFactoryTest extends MediaWikiTestCase {
                $dbname = 'unittest-domain'; // explodes if DB is selected
                $factory = $this->newLBFactoryMulti(
                        [ 'localDomain' => ( new DatabaseDomain( $dbname, null, '' ) )->getId() ],
-                       [ 'dbFilePath' => $dbPath ]
+                       [
+                               'dbFilePath' => $dbPath,
+                               'dbName' => 'do_not_select_me' // explodes if DB is selected
+                       ]
                );
                $lb = $factory->getMainLB();
                /** @var Database $db */
                $db = $lb->getConnection( DB_MASTER, [], '' );
 
-               $this->assertEquals(
-                       $wgDBname,
-                       $db->getDomainID()
-               );
+               $this->assertEquals( '', $db->getDomainID(), "Null domain used" );
 
                $this->assertEquals(
                        $this->quoteTable( $db, 'page' ),
@@ -501,7 +503,7 @@ class LBFactoryTest extends MediaWikiTestCase {
                        } catch ( \Wikimedia\Rdbms\DBConnectionError $e ) {
                                // expected
                        }
-                       $this->assertInstanceOf( '\Wikimedia\Rdbms\DBConnectionError', $e );
+                       $this->assertInstanceOf( \Wikimedia\Rdbms\DBConnectionError::class, $e );
                        $this->assertFalse( $db->isOpen() );
                } else {
                        \MediaWiki\suppressWarnings();