From 10cd6f1b6ad05b21067d52f998da47fb927ded69 Mon Sep 17 00:00:00 2001
From: Platonides <platonides@users.mediawiki.org>
Date: Sun, 1 May 2011 19:32:49 +0000
Subject: [PATCH] Fix the old XmlTest.php test bug in the dateMenu() when the
 wiki is configured for a languange other than English Other tests were
 running before and messing with the Language objects.

---
 tests/phpunit/MediaWikiLangTestCase.php       | 32 +++++++++++++++++++
 .../includes/LanguageConverterTest.php        |  4 ++-
 tests/phpunit/includes/MessageTest.php        | 11 +------
 tests/phpunit/includes/SampleTest.php         |  2 +-
 tests/phpunit/includes/XmlTest.php            | 15 +++++++++
 5 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 tests/phpunit/MediaWikiLangTestCase.php

diff --git a/tests/phpunit/MediaWikiLangTestCase.php b/tests/phpunit/MediaWikiLangTestCase.php
new file mode 100644
index 0000000000..9c514bbede
--- /dev/null
+++ b/tests/phpunit/MediaWikiLangTestCase.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Base class that store and restore the Language objects
+ */
+class MediaWikiLangTestCase extends MediaWikiTestCase {
+	private static $oldLang;
+	private static $oldContLang;
+
+	public function setUp() {
+		global $wgLanguageCode, $wgLang, $wgContLang;
+		
+		self::$oldLang = $wgLang;
+		self::$oldContLang = $wgContLang;
+		
+		if( $wgLanguageCode != $wgContLang->getCode() ) die("nooo!");
+				
+		$wgLanguageCode = 'en'; # For mainpage to be 'Main Page'
+
+		$wgContLang = $wgLang = Language::factory( $wgLanguageCode );
+		MessageCache::singleton()->disable();
+	}
+	
+	public function tearDown() {
+		global $wgContLang, $wgLang, $wgLanguageCode;
+		$wgLang = self::$oldLang;
+		
+		$wgContLang = self::$oldContLang;
+		$wgLanguageCode = $wgContLang->getCode();
+	}
+	
+}
diff --git a/tests/phpunit/includes/LanguageConverterTest.php b/tests/phpunit/includes/LanguageConverterTest.php
index d26db94f88..d084540c9c 100644
--- a/tests/phpunit/includes/LanguageConverterTest.php
+++ b/tests/phpunit/includes/LanguageConverterTest.php
@@ -1,10 +1,12 @@
 <?php
 
-class LanguageConverterTest extends MediaWikiTestCase {
+
+class LanguageConverterTest extends MediaWikiLangTestCase {
 	protected $lang = null;
 	protected $lc = null;
 
 	function setUp() {
+		parent::setUp();
 		global $wgMemc, $wgRequest, $wgUser, $wgContLang;
 
 		$wgUser = new User;
diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php
index c562611272..02e03edad1 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -1,15 +1,6 @@
 <?php
 
-class MessageTest extends MediaWikiTestCase {
-
-	function setUp() {
-		global $wgLanguageCode, $wgLang, $wgContLang;
-
-		$wgLanguageCode = 'en'; # For mainpage to be 'Main Page'
-		//Note that a Stub Object is not enough for this test
-		$wgContLang = $wgLang = Language::factory( $wgLanguageCode );
-		MessageCache::singleton()->disable();
-	}
+class MessageTest extends MediaWikiLangTestCase {
 
 	function testExists() {
 		$this->assertTrue( wfMessage( 'mainpage' )->exists() );
diff --git a/tests/phpunit/includes/SampleTest.php b/tests/phpunit/includes/SampleTest.php
index fa7c4d5b91..fc7881aa27 100644
--- a/tests/phpunit/includes/SampleTest.php
+++ b/tests/phpunit/includes/SampleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class TestSample extends MediaWikiTestCase {
+class TestSample extends MediaWikiLangTestCase {
 
 	/**
 	 * Anything that needs to happen before your tests should go here.
diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php
index d9647e51a4..d0c364e778 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -1,6 +1,21 @@
 <?php
 
 class XmlTest extends MediaWikiTestCase {
+	private static $oldLang;
+
+	public function setUp() {
+		global $wgLang, $wgLanguageCode;
+		
+		self::$oldLang = $wgLang;
+		$wgLanguageCode = 'en';
+		$wgLang = Language::factory( $wgLanguageCode );
+	}
+	
+	public function tearDown() {
+		global $wgContLang, $wgLanguageCode;
+		$wgLang = self::$oldLang;
+		$wgLanguageCode = $wgLang->getCode();
+	}
 
 	public function testExpandAttributes() {
 		$this->assertNull( Xml::expandAttributes(null),
-- 
2.20.1