From 07818096dfb37bb960b01cd0e062193b201aeae4 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Mon, 5 Nov 2012 11:10:42 +0100
Subject: (bug 35204) set wgLanguageCode in unit tests

Setting $wgContLang without changing $wgLanguageCode accordingly is a
very bad idea.

This caused about 20 exceptions when using LanguageCode set to 'fr'
on my installation:

"MWException: Error in MediaWikiLangTestCase::setUp(): $wgLanguageCode
('fr') is different from $wgContLang->getCode() (en)"

Follow-up of I2987db68 (2b0edc8).

Change-Id: I56d3f1bfc78d6a2e40460533524e82f360490206
---
 tests/phpunit/includes/parser/MagicVariableTest.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'tests/phpunit/includes/parser/MagicVariableTest.php')

diff --git a/tests/phpunit/includes/parser/MagicVariableTest.php b/tests/phpunit/includes/parser/MagicVariableTest.php
index 611a45a04333..5f670fc54e8b 100644
--- a/tests/phpunit/includes/parser/MagicVariableTest.php
+++ b/tests/phpunit/includes/parser/MagicVariableTest.php
@@ -33,7 +33,10 @@ class MagicVariableTest extends MediaWikiTestCase {
 		parent::setUp();
 
 		$contLang = Language::factory( 'en' );
-		$this->setMwGlobals( 'wgContLang', $contLang );
+		$this->setMwGlobals( array(
+			'wgLanguageCode' => 'en',
+			'wgContLang' => $contLang,
+		) );
 
 		$this->testParser = new Parser();
 		$this->testParser->Options( ParserOptions::newFromUserAndLang( new User, $contLang ) );
@@ -78,7 +81,7 @@ class MagicVariableTest extends MediaWikiTestCase {
 	function testLocaldaytwoIsZeroPadded( $day ) {
 		$this->assertZeroPadded( 'localday2', $day );
 	}
-	
+
 	# month
 
 	/** @dataProvider MediaWikiProvide::Months */
@@ -109,7 +112,7 @@ class MagicVariableTest extends MediaWikiTestCase {
 	function testRevisiondaytwoIsZeroPadded( $day ) {
 		$this->assertZeroPadded( 'revisionday2', $day );
 	}
-	
+
 	# revision month
 
 	/** @dataProvider MediaWikiProvide::Months */
@@ -153,26 +156,26 @@ class MagicVariableTest extends MediaWikiTestCase {
 
 	/**
 	 * Main assertion helper for magic variables padding
-	 * @param $magic string Magic variable name 
+	 * @param $magic string Magic variable name
 	 * @param $value mixed Month or day
-	 * @param $format string sprintf format for $value 
+	 * @param $format string sprintf format for $value
 	 */
 	private function assertMagicPadding( $magic, $value, $format ) {
 		# Initialize parser timestamp as year 2010 at 12h34 56s.
 		# month and day are given by the caller ($value). Month < 12!
 		if( $value > 12 ) { $month = $value % 12; }
 		else { $month = $value; }
-	
+
 		$this->setParserTS(
 			sprintf( '2010%02d%02d123456', $month, $value )
 		);
 
-		# please keep the following commented line of code. It helps debugging.	
+		# please keep the following commented line of code. It helps debugging.
 		//print "\nDEBUG (value $value):" . sprintf( '2010%02d%02d123456', $value, $value ) . "\n";
 
 		# format expectation and test it
 		$expected = sprintf( $format, $value );
-		$this->assertMagic( $expected, $magic ); 
+		$this->assertMagic( $expected, $magic );
 	}
 
 	/** helper to set the parser timestamp and revision timestamp */
-- 
cgit v1.2.3