X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fdb%2FLBFactoryTest.php;h=4097760ad6154bf76b296aa90e0a088cf7182498;hp=e46a0ddbf9930c3fb60f380eaa064314bcf94bb0;hb=39f0f919c5708f4c672a8eb7e0891f50bf16883e;hpb=b13cb679d36f738a8ad9f72186d1457b8aa6c03a

diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index e46a0ddbf9..4097760ad6 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -25,8 +25,11 @@
 
 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;
 
 /**
  * @group Database
@@ -40,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();
 
@@ -128,7 +131,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 
 		$factory = new LBFactorySimple( [
 			'servers' => $servers,
-			'loadMonitorClass' => 'LoadMonitorNull'
+			'loadMonitorClass' => LoadMonitorNull::class
 		] );
 		$lb = $factory->getMainLB();
 
@@ -173,7 +176,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 				'test-db1'  => $wgDBserver,
 				'test-db2'  => $wgDBserver
 			],
-			'loadMonitorClass' => 'LoadMonitorNull'
+			'loadMonitorClass' => LoadMonitorNull::class
 		] );
 		$lb = $factory->getMainLB();
 
@@ -198,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 );
@@ -223,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 );
@@ -276,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 );
@@ -284,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 );
@@ -314,7 +317,8 @@ class LBFactoryTest extends MediaWikiTestCase {
 	}
 
 	private function newLBFactoryMulti( array $baseOverride = [], array $serverOverride = [] ) {
-		global $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, $wgDBtype, $wgSQLiteDataDir;
+		global $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, $wgDBprefix, $wgDBtype;
+		global $wgSQLiteDataDir;
 
 		return new LBFactoryMulti( $baseOverride + [
 			'sectionsByDB' => [],
@@ -325,6 +329,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 			],
 			'serverTemplate' => $serverOverride + [
 				'dbname' => $wgDBname,
+				'tablePrefix' => $wgDBprefix,
 				'user' => $wgDBuser,
 				'password' => $wgDBpassword,
 				'type' => $wgDBtype,
@@ -334,8 +339,8 @@ class LBFactoryTest extends MediaWikiTestCase {
 			'hostsByName' => [
 				'test-db1' => $wgDBserver,
 			],
-			'loadMonitorClass' => 'LoadMonitorNull',
-			'localDomain' => wfWikiID()
+			'loadMonitorClass' => LoadMonitorNull::class,
+			'localDomain' => new DatabaseDomain( $wgDBname, null, $wgDBprefix )
 		] );
 	}
 
@@ -361,7 +366,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 		if ( $wgDBtype !== 'sqlite' ) {
 			$db = $lb->getConnectionRef( DB_MASTER );
 			$this->assertEquals(
-				$wgDBname,
+				wfWikiID(),
 				$db->getDomainID()
 			);
 			unset( $db );
@@ -369,34 +374,45 @@ class LBFactoryTest extends MediaWikiTestCase {
 
 		/** @var Database $db */
 		$db = $lb->getConnection( DB_MASTER, [], '' );
-		$lb->reuseConnection( $db ); // don't care
 
 		$this->assertEquals(
 			'',
-			$db->getDomainID()
+			$db->getDomainId(),
+			'Null domain ID handle used'
+		);
+		$this->assertEquals(
+			'',
+			$db->getDBname(),
+			'Null domain ID handle used'
+		);
+		$this->assertEquals(
+			'',
+			$db->tablePrefix(),
+			'Main domain ID handle used; prefix is empty though'
 		);
-
 		$this->assertEquals(
 			$this->quoteTable( $db, 'page' ),
 			$db->tableName( 'page' ),
 			"Correct full table name"
 		);
-
 		$this->assertEquals(
 			$this->quoteTable( $db, $wgDBname ) . '.' . $this->quoteTable( $db, 'page' ),
 			$db->tableName( "$wgDBname.page" ),
 			"Correct full table name"
 		);
-
 		$this->assertEquals(
 			$this->quoteTable( $db, 'nice_db' ) . '.' . $this->quoteTable( $db, 'page' ),
 			$db->tableName( 'nice_db.page' ),
 			"Correct full table name"
 		);
 
+		$lb->reuseConnection( $db ); // don't care
+
+		$db = $lb->getConnection( DB_MASTER ); // local domain connection
 		$factory->setDomainPrefix( 'my_' );
+
 		$this->assertEquals(
-			'',
+			"$wgDBname-my_",
 			$db->getDomainID()
 		);
 		$this->assertEquals(
@@ -415,7 +431,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 	}
 
 	public function testTrickyDomain() {
-		global $wgDBtype;
+		global $wgDBtype, $wgDBname;
 
 		if ( $wgDBtype === 'sqlite' ) {
 			$tmpDir = $this->getNewTempDirectory();
@@ -427,20 +443,19 @@ class LBFactoryTest extends MediaWikiTestCase {
 			$dbPath = null;
 		}
 
-		$dbname = 'unittest-domain';
+		$dbname = 'unittest-domain'; // explodes if DB is selected
 		$factory = $this->newLBFactoryMulti(
-			[ 'localDomain' => $dbname ],
-			[ 'dbname' => $dbname, 'dbFilePath' => $dbPath ]
+			[ 'localDomain' => ( new DatabaseDomain( $dbname, null, '' ) )->getId() ],
+			[
+				'dbFilePath' => $dbPath,
+				'dbName' => 'do_not_select_me' // explodes if DB is selected
+			]
 		);
 		$lb = $factory->getMainLB();
 		/** @var Database $db */
 		$db = $lb->getConnection( DB_MASTER, [], '' );
-		$lb->reuseConnection( $db ); // don't care
 
-		$this->assertEquals(
-			'',
-			$db->getDomainID()
-		);
+		$this->assertEquals( '', $db->getDomainID(), "Null domain used" );
 
 		$this->assertEquals(
 			$this->quoteTable( $db, 'page' ),
@@ -460,7 +475,10 @@ class LBFactoryTest extends MediaWikiTestCase {
 			"Correct full table name"
 		);
 
+		$lb->reuseConnection( $db ); // don't care
+
 		$factory->setDomainPrefix( 'my_' );
+		$db = $lb->getConnection( DB_MASTER, [], "$wgDBname-my_" );
 
 		$this->assertEquals(
 			$this->quoteTable( $db, 'my_page' ),
@@ -472,7 +490,6 @@ class LBFactoryTest extends MediaWikiTestCase {
 			$db->tableName( 'other_nice_db.page' ),
 			"Correct full table name"
 		);
-
 		$this->assertEquals(
 			$this->quoteTable( $db, 'garbage-db' ) . '.' . $this->quoteTable( $db, 'page' ),
 			$db->tableName( 'garbage-db.page' ),
@@ -486,14 +503,16 @@ 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();
+			\Wikimedia\suppressWarnings();
 			$this->assertFalse( $db->selectDB( 'garbage-db' ) );
-			\MediaWiki\restoreWarnings();
+			\Wikimedia\restoreWarnings();
 		}
 
+		$lb->reuseConnection( $db ); // don't care
+
 		$factory->closeAll();
 		$factory->destroy();
 	}