From 3065ece7a20f1333396b32b199524f3f96eb54c3 Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Wed, 25 Jan 2012 03:45:01 +0000
Subject: [PATCH] Fix broken unit test * r109993 broke the test by overwriting
 namespaces it tried to preserve * tearDown should always have the opposite
 order of the overrides in setUp * Adding wgLanguageCode while at it, no
 reason not to, just in case.

-- Follows-up r109993
---
 tests/phpunit/includes/HtmlTest.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php
index 8de7272876..b5e88db49c 100644
--- a/tests/phpunit/includes/HtmlTest.php
+++ b/tests/phpunit/includes/HtmlTest.php
@@ -4,6 +4,7 @@
 class HtmlTest extends MediaWikiTestCase {
 	private static $oldLang;
 	private static $oldContLang;
+	private static $oldLanguageCode;
 	private static $oldNamespaces;
 
 	public function setUp() {
@@ -11,6 +12,8 @@ class HtmlTest extends MediaWikiTestCase {
 		
 		self::$oldLang = $wgLang;
 		self::$oldContLang = $wgContLang;
+		self::$oldNamespaces = $wgContLang->namespaceNames;
+		self::$oldLanguageCode = $wgLanguageCode;
 		
 		$wgLanguageCode = 'en';
 		$wgContLang = $wgLang = Language::factory( $wgLanguageCode );
@@ -18,7 +21,6 @@ class HtmlTest extends MediaWikiTestCase {
 		// Hardcode namespaces during test runs,
 		// so that html output based on existing namespaces
 		// can be properly evaluated.
-		self::$oldNamespaces = $wgContLang->namespaceNames;
 		$wgContLang->namespaceNames = array(
 			-2 => 'Media',
 			-1 => 'Special',
@@ -41,10 +43,11 @@ class HtmlTest extends MediaWikiTestCase {
 	
 	public function tearDown() {
 		global $wgLang, $wgContLang, $wgLanguageCode;
+
+		$wgContLang->namespaceNames = self::$oldNamespaces;
 		$wgLang = self::$oldLang;
 		$wgContLang = self::$oldContLang;
-		$wgLanguageCode = $wgContLang->getCode();
-		$wgContLang->namespaceNames = self::$oldNamespaces;
+		$wgLanguageCode = self::$oldLanguageCode;
 	}
 
 	public function testExpandAttributesSkipsNullAndFalse() {
-- 
2.20.1