Merge "Implement static public Parser::getExternalLinkRel"

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

diff --git a/tests/phpunit/includes/LanguageConverterTest.php b/tests/phpunit/includes/LanguageConverterTest.php
index 3ee39a1..eb8912d 100644 (file)
--- a/tests/phpunit/includes/LanguageConverterTest.php
+++ b/tests/phpunit/includes/LanguageConverterTest.php
@@ -1,27 +1,33 @@
 <?php
 
-class LanguageConverterTest extends MediaWikiTestCase {
+class LanguageConverterTest extends MediaWikiLangTestCase {
        protected $lang = null;
        protected $lc = null;
 
-       function setUp() {
-               global $wgMemc, $wgRequest, $wgUser, $wgContLang;
+       protected function setUp() {
+               parent::setUp();
+
+               $this->setMwGlobals( array(
+                       'wgContLang' => Language::factory( 'tg' ),
+                       'wgLanguageCode' => 'tg',
+                       'wgDefaultLanguageVariant' => false,
+                       'wgMemc' => new EmptyBagOStuff,
+                       'wgRequest' => new FauxRequest( array() ),
+                       'wgUser' => new User,
+               ) );
 
-               $wgUser = new User;
-               $wgRequest = new FauxRequest( array() );
-               $wgMemc = new FakeMemCachedClient;
-               $wgContLang = Language::factory( 'tg' );
                $this->lang = new LanguageToTest();
-               $this->lc = new TestConverter( $this->lang, 'tg',
-                                                                          array( 'tg', 'tg-latn' ) );
+               $this->lc = new TestConverter(
+                       $this->lang, 'tg',
+                       array( 'tg', 'tg-latn' )
+               );
        }
 
-       function tearDown() {
-               global $wgMemc, $wgContLang;
-               unset( $wgMemc );
+       protected function tearDown() {
                unset( $this->lc );
                unset( $this->lang );
-               $wgContLang = Language::factory( 'en' );
+
+               parent::tearDown();
        }
 
        function testGetPreferredVariantDefaults() {
@@ -60,7 +66,8 @@ class LanguageConverterTest extends MediaWikiTestCase {
                global $wgUser;
 
                $wgUser = new User;
-               $wgUser->setId( 1 );
+               $wgUser->load(); // from 'defaults'
+               $wgUser->mId = 1;
                $wgUser->mDataLoaded = true;
                $wgUser->mOptionsLoaded = true;
                $wgUser->setOption( 'variant', 'tg-latn' );
@@ -69,13 +76,13 @@ class LanguageConverterTest extends MediaWikiTestCase {
        }
 
        function testGetPreferredVariantHeaderUserVsUrl() {
-               global $wgRequest, $wgUser, $wgContLang;
+               global $wgContLang, $wgRequest, $wgUser;
 
                $wgContLang = Language::factory( 'tg-latn' );
                $wgRequest->setVal( 'variant', 'tg' );
                $wgUser = User::newFromId( "admin" );
                $wgUser->setId( 1 );
-               $wgUser->mDataLoaded = true;
+               $wgUser->mFrom = 'defaults';
                $wgUser->mOptionsLoaded = true;
                $wgUser->setOption( 'variant', 'tg-latn' ); // The user's data is ignored
                                                                                                  // because the variant is set in the URL.