X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fdb%2FLBFactoryTest.php;h=e84998ccf2a926b9799305415cdfb404c1b8f0f8;hb=fe0af6cad57821dc5b8741edfed77242d543ccaa;hp=de861b68859b289213b59d43d05beb720eaebb3c;hpb=a14133e55c0d4bceca030a9bdb373f3ff84c15ed;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index de861b6885..e84998ccf2 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -23,6 +23,7 @@
  * @copyright © 2013 Wikimedia Foundation Inc.
  */
 
+use Wikimedia\Rdbms\LBFactory;
 use Wikimedia\Rdbms\LBFactorySimple;
 use Wikimedia\Rdbms\LBFactoryMulti;
 use Wikimedia\Rdbms\LoadBalancer;
@@ -33,13 +34,14 @@ use Wikimedia\Rdbms\DatabaseDomain;
 
 /**
  * @group Database
+ * @covers \Wikimedia\Rdbms\LBFactory
  * @covers \Wikimedia\Rdbms\LBFactorySimple
  * @covers \Wikimedia\Rdbms\LBFactoryMulti
  */
 class LBFactoryTest extends MediaWikiTestCase {
 
 	/**
-	 * @covers MWLBFactory::getLBFactoryClass
+	 * @covers MWLBFactory::getLBFactoryClass()
 	 * @dataProvider getLBFactoryClassProvider
 	 */
 	public function testGetLBFactoryClass( $expected, $deprecated ) {
@@ -75,8 +77,8 @@ class LBFactoryTest extends MediaWikiTestCase {
 	}
 
 	/**
-	 * @covers LBFactory::getLocalDomainID()
-	 * @covers LBFactory::resolveDomainID()
+	 * @covers \Wikimedia\Rdbms\LBFactory::getLocalDomainID()
+	 * @covers \Wikimedia\Rdbms\LBFactory::resolveDomainID()
 	 */
 	public function testLBFactorySimpleServer() {
 		global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir;
@@ -606,7 +608,15 @@ class LBFactoryTest extends MediaWikiTestCase {
 			$this->assertFalse( $db->isOpen() );
 		} else {
 			\Wikimedia\suppressWarnings();
-			$this->assertFalse( $db->selectDB( 'garbage-db' ) );
+			try {
+				$this->assertFalse( $db->selectDB( 'garbage-db' ) );
+				$this->fail( "No error thrown." );
+			} catch ( \Wikimedia\Rdbms\DBExpectedError $e ) {
+				$this->assertEquals(
+					"Could not select database 'garbage-db'.",
+					$e->getMessage()
+				);
+			}
 			\Wikimedia\restoreWarnings();
 		}
 	}
@@ -627,7 +637,6 @@ class LBFactoryTest extends MediaWikiTestCase {
 		$time = 1526522031;
 		$agentId = md5( 'Ramsey\'s Loyal Presa Canario' );
 
-		$lbFactory = $this->newLBFactoryMulti();
 		$this->assertEquals(
 			'3@542#c47dcfb0566e7d7bc110a6128a45c93a',
 			LBFactory::makeCookieValueFromCPIndex( 3, 542, $agentId )