Merge "EditPage: Don't set 'hookaborted' error if the hook set a better error"

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

diff --git a/tests/phpunit/includes/WikiMapTest.php b/tests/phpunit/includes/WikiMapTest.php
index df05671..6fe9218 100644 (file)
--- a/tests/phpunit/includes/WikiMapTest.php
+++ b/tests/phpunit/includes/WikiMapTest.php
@@ -1,4 +1,5 @@
 <?php
+
 use Wikimedia\Rdbms\DatabaseDomain;
 
 /**
@@ -235,7 +236,7 @@ class WikiMapTest extends MediaWikiLangTestCase {
                $this->assertEquals( $wiki, WikiMap::getWikiFromUrl( $url ) );
        }
 
-       public function provideGetWikiIdFromDomain() {
+       public function provideGetWikiIdFromDbDomain() {
                return [
                        [ 'db-prefix_', 'db-prefix_' ],
                        [ wfWikiID(), wfWikiID() ],
@@ -248,10 +249,10 @@ class WikiMapTest extends MediaWikiLangTestCase {
        }
 
        /**
-        * @dataProvider provideGetWikiIdFromDomain
+        * @dataProvider provideGetWikiIdFromDbDomain
         * @covers WikiMap::getWikiIdFromDbDomain()
         */
-       public function testGetWikiIdFromDomain( $domain, $wikiId ) {
+       public function testGetWikiIdFromDbDomain( $domain, $wikiId ) {
                $this->assertEquals( $wikiId, WikiMap::getWikiIdFromDbDomain( $domain ) );
        }
 
@@ -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() ) );
        }