X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FWikiMapTest.php;h=6850a24545c1934bc8d61a22dc7c0fad56008ce4;hb=d71db83e748fc4e68ba2105ff5501b986589cebe;hp=e87e434f94eef4a8f63d966df047dc6106283694;hpb=3110946330d98b7d61ab5b1899c09db723a152a3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/WikiMapTest.php b/tests/phpunit/includes/WikiMapTest.php
index e87e434f94..6850a24545 100644
--- a/tests/phpunit/includes/WikiMapTest.php
+++ b/tests/phpunit/includes/WikiMapTest.php
@@ -1,4 +1,5 @@
 <?php
+
 use Wikimedia\Rdbms\DatabaseDomain;
 
 /**
@@ -237,13 +238,13 @@ class WikiMapTest extends MediaWikiLangTestCase {
 
 	public function provideGetWikiIdFromDomain() {
 		return [
-			[ 'db-prefix', 'db-prefix' ],
+			[ 'db-prefix_', 'db-prefix_' ],
 			[ wfWikiID(), wfWikiID() ],
-			[ new DatabaseDomain( 'db-dash', null, 'prefix' ), 'db-dash-prefix' ],
+			[ new DatabaseDomain( 'db-dash', null, 'prefix_' ), 'db-dash-prefix_' ],
 			[ wfWikiID(), wfWikiID() ],
-			[ new DatabaseDomain( 'db-dash', null, 'prefix' ), 'db-dash-prefix' ],
-			[ new DatabaseDomain( 'db', 'mediawiki', 'prefix' ), 'db-prefix' ], // schema ignored
-			[ new DatabaseDomain( 'db', 'custom', 'prefix' ), 'db-custom-prefix' ],
+			[ new DatabaseDomain( 'db-dash', null, 'prefix_' ), 'db-dash-prefix_' ],
+			[ new DatabaseDomain( 'db', 'mediawiki', 'prefix_' ), 'db-prefix_' ], // schema ignored
+			[ new DatabaseDomain( 'db', 'custom', 'prefix_' ), 'db-custom-prefix_' ],
 		];
 	}
 
@@ -260,16 +261,19 @@ class WikiMapTest extends MediaWikiLangTestCase {
 	 * @covers WikiMap::getCurrentWikiDbDomain()
 	 */
 	public function testIsCurrentWikiDomain() {
-		$this->assertTrue( WikiMap::isCurrentWikiDbDomain( wfWikiID() ) );
+		$this->setMwGlobals( 'wgDBmwschema', 'mediawiki' );
+
+		$localDomain = WikiMap::getCurrentWikiDbDomain()->getId();
+		$this->assertTrue( WikiMap::isCurrentWikiDbDomain( $localDomain ) );
 
-		$localDomain = DatabaseDomain::newFromId( wfWikiID() );
+		$localDomain = DatabaseDomain::newFromId( $localDomain );
 		$domain1 = new DatabaseDomain(
 			$localDomain->getDatabase(), 'someschema', $localDomain->getTablePrefix() );
 		$domain2 = new DatabaseDomain(
 			$localDomain->getDatabase(), null, $localDomain->getTablePrefix() );
 
-		$this->assertTrue( WikiMap::isCurrentWikiDbDomain( $domain1 ), 'Schema ignored' );
-		$this->assertTrue( WikiMap::isCurrentWikiDbDomain( $domain2 ), 'Schema ignored' );
+		$this->assertFalse( WikiMap::isCurrentWikiDbDomain( $domain1 ), 'Schema not ignored' );
+		$this->assertFalse( WikiMap::isCurrentWikiDbDomain( $domain2 ), 'Null schema not ignored' );
 
 		$this->assertTrue( WikiMap::isCurrentWikiDbDomain( WikiMap::getCurrentWikiDbDomain() ) );
 	}
@@ -279,15 +283,15 @@ class WikiMapTest extends MediaWikiLangTestCase {
 			[ 'db', 'db', null, '' ],
 			[ 'db-schema-','db', 'schema', '' ],
 			[ 'db','db', 'mediawiki', '' ], // common b/c case
-			[ 'db-prefix', 'db', null, 'prefix' ],
-			[ 'db-schema-prefix', 'db', 'schema', 'prefix' ],
-			[ 'db-prefix', 'db', 'mediawiki', 'prefix' ], // common b/c case
+			[ 'db-prefix_', 'db', null, 'prefix_' ],
+			[ 'db-schema-prefix_', 'db', 'schema', 'prefix_' ],
+			[ 'db-prefix_', 'db', 'mediawiki', 'prefix_' ], // common b/c case
 			// Bad hyphen cases (best effort support)
 			[ 'db-stuff', 'db-stuff', null, '' ],
-			[ 'db-stuff-prefix', 'db-stuff', null, 'prefix' ],
+			[ 'db-stuff-prefix_', 'db-stuff', null, 'prefix_' ],
 			[ 'db-stuff-schema-', 'db-stuff', 'schema', '' ],
-			[ 'db-stuff-schema-prefix', 'db-stuff', 'schema', 'prefix' ],
-			[ 'db-stuff-prefix', 'db-stuff', 'mediawiki', 'prefix' ] // common b/c case
+			[ 'db-stuff-schema-prefix_', 'db-stuff', 'schema', 'prefix_' ],
+			[ 'db-stuff-prefix_', 'db-stuff', 'mediawiki', 'prefix_' ] // common b/c case
 		];
 	}