From d9dd04b6f8cbec983f3f633bd098de30d686c451 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Fri, 8 Mar 2013 17:09:06 +0100 Subject: [PATCH] fix MessageCacheTest for non-english wikis MessageCacheTest::addDBData is called before setUp, so wgLanguageCode and wgContLang are not set to 'en', which result in mediawiki pages created as $key/en. When the test runs, the language is set correctly and mediawiki is searching under $key, and does not find anything. Set wgLanguageCode and wgContLang at the begin of addDBData 1) MessageCacheTest::testMessageFallbacks with data set #0 ('FallbackLanguageTest-Full', 'ab', 'ab') Message fallback failed. Failed asserting that false matches expected 'ab'. Change-Id: I8e70b7b424df6a9ad98bfb6c228809f4b4437d1e --- tests/phpunit/includes/cache/MessageCacheTest.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/phpunit/includes/cache/MessageCacheTest.php b/tests/phpunit/includes/cache/MessageCacheTest.php index 89021ddfac..4cc8bd2dad 100644 --- a/tests/phpunit/includes/cache/MessageCacheTest.php +++ b/tests/phpunit/includes/cache/MessageCacheTest.php @@ -12,6 +12,12 @@ class MessageCacheTest extends MediaWikiLangTestCase { } function addDBData() { + // be sure english messages under $key, not $key/en + $this->setMwGlobals( array( + 'wgLanguageCode' => 'en', + 'wgContLang' => Language::factory( 'en' ), + ) ); + // Set up messages and fallbacks ab -> ru -> en $this->makePage( 'FallbackLanguageTest-Full', 'ab' ); $this->makePage( 'FallbackLanguageTest-Full', 'ru' ); -- 2.20.1