X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fdb%2FLBFactoryTest.php;h=f00499f35d2901e903bbf75738ecd246ede19747;hp=1296bb64b537aa4d2328f1a1bac62528798c7aeb;hb=9e8439e79d67788916d488f645108f79016d9aca;hpb=3e49b37b689a58d9eb475eb0a4ae2d2aa8f5300a

diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index 1296bb64b5..f00499f35d 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -23,7 +23,6 @@
  * @copyright © 2013 Wikimedia Foundation Inc.
  */
 
-use Wikimedia\AtEase\AtEase;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 use Wikimedia\Rdbms\LBFactory;
@@ -33,6 +32,7 @@ use Wikimedia\Rdbms\LoadBalancer;
 use Wikimedia\Rdbms\ChronologyProtector;
 use Wikimedia\Rdbms\MySQLMasterPos;
 use Wikimedia\Rdbms\DatabaseDomain;
+use Wikimedia\Rdbms\LoadMonitorNull;
 
 /**
  * @group Database
@@ -111,7 +111,6 @@ class LBFactoryTest extends MediaWikiTestCase {
 		$this->assertSame( $factory->getLocalDomainID(), $factory->resolveDomainID( false ) );
 
 		$factory->shutdown();
-		$lb->closeAll();
 	}
 
 	public function testLBFactorySimpleServers() {
@@ -161,7 +160,6 @@ class LBFactoryTest extends MediaWikiTestCase {
 			'cluster master set' );
 
 		$factory->shutdown();
-		$lb->closeAll();
 	}
 
 	public function testLBFactoryMultiConns() {
@@ -189,7 +187,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 		};
 
 		$factory = $this->newLBFactoryMultiLBs();
-		$this->assertEquals( 0, $countLBsFunc( $factory ) );
+		$this->assertSame( 0, $countLBsFunc( $factory ) );
 		$dbw = $factory->getMainLB()->getConnection( DB_MASTER );
 		$this->assertEquals( 1, $countLBsFunc( $factory ) );
 		// Test that LoadBalancer instances made during pre-commit callbacks in do not
@@ -210,7 +208,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 
 		$called = 0;
 		$factory = $this->newLBFactoryMultiLBs();
-		$this->assertEquals( 0, $countLBsFunc( $factory ) );
+		$this->assertSame( 0, $countLBsFunc( $factory ) );
 		$dbw = $factory->getMainLB()->getConnection( DB_MASTER );
 		$this->assertEquals( 1, $countLBsFunc( $factory ) );
 		// Test that LoadBalancer instances made during pre-commit callbacks in do not
@@ -475,19 +473,18 @@ class LBFactoryTest extends MediaWikiTestCase {
 		unset( $db );
 
 		/** @var IMaintainableDatabase $db */
-		$db = $lb->getConnection( DB_MASTER, [], $lb::DOMAIN_ANY );
+		$db = $lb->getConnection( DB_MASTER, [], '' );
 
-		$this->assertEquals(
+		$this->assertSame(
 			'',
 			$db->getDomainId(),
 			'Null domain ID handle used'
 		);
-		$this->assertEquals(
-			'',
+		$this->assertNull(
 			$db->getDBname(),
 			'Null domain ID handle used'
 		);
-		$this->assertEquals(
+		$this->assertSame(
 			'',
 			$db->tablePrefix(),
 			'Main domain ID handle used; prefix is empty though'
@@ -555,9 +552,9 @@ class LBFactoryTest extends MediaWikiTestCase {
 		);
 		$lb = $factory->getMainLB();
 		/** @var IMaintainableDatabase $db */
-		$db = $lb->getConnection( DB_MASTER, [], $lb::DOMAIN_ANY );
+		$db = $lb->getConnection( DB_MASTER, [], '' );
 
-		$this->assertEquals( '', $db->getDomainID(), "Null domain used" );
+		$this->assertSame( '', $db->getDomainID(), "Null domain used" );
 
 		$this->assertEquals(
 			$this->quoteTable( $db, 'page' ),
@@ -623,16 +620,16 @@ class LBFactoryTest extends MediaWikiTestCase {
 		);
 		$lb = $factory->getMainLB();
 		/** @var IDatabase $db */
-		$db = $lb->getConnection( DB_MASTER, [], $lb::DOMAIN_ANY );
+		$db = $lb->getConnection( DB_MASTER, [], '' );
 
-		AtEase::suppressWarnings();
+		\Wikimedia\suppressWarnings();
 		try {
-			$this->assertFalse( $db->selectDomain( 'garbagedb' ) );
+			$this->assertFalse( $db->selectDB( 'garbage-db' ) );
 			$this->fail( "No error thrown." );
 		} catch ( \Wikimedia\Rdbms\DBQueryError $e ) {
-			$this->assertRegExp( '/[\'"]garbagedb[\'"]/', $e->getMessage() );
+			$this->assertRegExp( '/[\'"]garbage-db[\'"]/', $e->getMessage() );
 		}
-		AtEase::restoreWarnings();
+		\Wikimedia\restoreWarnings();
 	}
 
 	/**
@@ -651,12 +648,12 @@ class LBFactoryTest extends MediaWikiTestCase {
 		);
 		$lb = $factory->getMainLB();
 
-		if ( !$factory->getMainLB()->getServerAttributes( 0 )[Database::ATTR_DB_IS_FILE] ) {
-			$this->markTestSkipped( "Not applicable per ATTR_DB_IS_FILE" );
+		if ( !$lb->getConnection( DB_MASTER )->databasesAreIndependent() ) {
+			$this->markTestSkipped( "Not applicable per databasesAreIndependent()" );
 		}
 
 		/** @var IDatabase $db */
-		$this->assertNotNull( $lb->getConnection( DB_MASTER, [], $lb::DOMAIN_ANY ) );
+		$lb->getConnection( DB_MASTER, [], '' );
 	}
 
 	/**
@@ -680,7 +677,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 		}
 
 		$db = $lb->getConnection( DB_MASTER );
-		$db->selectDomain( 'garbage-db' );
+		$db->selectDB( 'garbage-db' );
 	}
 
 	/**
@@ -719,7 +716,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 		$lb->forEachOpenConnection( function () use ( &$n ) {
 			++$n;
 		} );
-		$this->assertEquals( 0, $n, "Connections closed" );
+		$this->assertSame( 0, $n, "Connections closed" );
 
 		$conn2 = $lb->getConnectionRef( DB_MASTER );
 		$this->assertEquals(