From: Platonides <platonides@users.mediawiki.org>
Date: Wed, 11 Aug 2010 21:22:40 +0000 (+0000)
Subject: Made tests more independent. Some items were only working before previous ones left... 
X-Git-Tag: 1.31.0-rc.0~35542
X-Git-Url: http://git.cyclocoop.org/%22.%20generer_url_ecrire%28%22sites_tous%22%2C%22%22%29.%20%22?a=commitdiff_plain;h=b35aab334cc2bbb6132054aede35052523735cd2;p=lhc%2Fweb%2Fwiklou.git

Made tests more independent. Some items were only working before previous ones left in the appropiate state, or because the installation language was English.
---

diff --git a/maintenance/tests/ApiWatchTest.php b/maintenance/tests/ApiWatchTest.php
index 6153643f3d..c673c70377 100644
--- a/maintenance/tests/ApiWatchTest.php
+++ b/maintenance/tests/ApiWatchTest.php
@@ -6,8 +6,18 @@ class ApiWatchTest extends ApiTestSetup {
 		ini_set( 'log_errors', 1 );
 		ini_set( 'error_reporting', 1 );
 		ini_set( 'display_errors', 1 );
+
+		global $wgMemc;
+		$wgMemc = new FakeMemCachedClient;
 	}
 
+	function tearDown() {
+		global $wgMemc;
+
+		$wgMemc = null;
+	}
+
+
 	function doApiRequest( $params, $data = null ) {
 		$_SESSION = isset( $data[2] ) ? $data[2] : array();
 
diff --git a/maintenance/tests/ExtraParserTest.php b/maintenance/tests/ExtraParserTest.php
index 15a692da9d..a772d31e37 100644
--- a/maintenance/tests/ExtraParserTest.php
+++ b/maintenance/tests/ExtraParserTest.php
@@ -3,7 +3,19 @@
  * Parser-related tests that don't suit for parserTests.txt
  */
  
- class ExtraParserTest extends PHPUnit_Framework_TestCase {
+class ExtraParserTest extends PHPUnit_Framework_TestCase {
+
+	function setUp() {
+		global $wgMemc;
+
+		$wgMemc = new FakeMemCachedClient;
+	}
+
+	function tearDown() {
+		global $wgMemc;
+
+		$wgMemc = null;
+	}
 
 	// Bug 8689 - Long numeric lines kill the parser
 	function testBug8689() {
@@ -15,4 +27,4 @@
 		$this->assertEquals( "<p>$longLine</p>", 
 			$parser->parse( $longLine, $t, $options )->getText() );
 	}
- }
\ No newline at end of file
+ }
diff --git a/maintenance/tests/LanguageConverterTest.php b/maintenance/tests/LanguageConverterTest.php
index 7903efd82a..c37d2f683f 100644
--- a/maintenance/tests/LanguageConverterTest.php
+++ b/maintenance/tests/LanguageConverterTest.php
@@ -17,10 +17,11 @@ class LanguageConverterTest extends PHPUnit_Framework_TestCase {
 	}
 
 	function tearDown() {
-		global $wgMemc;
+		global $wgMemc, $wgContLang;
 		unset( $wgMemc );
 		unset( $this->lc );
 		unset( $this->lang );
+		$wgContLang = null;
 	}
 
 	function testGetPreferredVariantDefaults() {
diff --git a/maintenance/tests/MessageTest.php b/maintenance/tests/MessageTest.php
index a0bc9660fb..aed21162f3 100644
--- a/maintenance/tests/MessageTest.php
+++ b/maintenance/tests/MessageTest.php
@@ -1,6 +1,13 @@
 <?php
 
 class MessageTest extends PHPUnit_Framework_TestCase {
+
+	function setUp() {
+		global $wgContLanguageCode;
+		
+		$wgContLanguageCode = 'en'; # For mainpage to be 'Main Page'
+	}
+
 	function testExists() {
 		$this->assertTrue( Message::key( 'mainpage' )->exists() );
 		$this->assertTrue( Message::key( 'mainpage' )->params( array() )->exists() );
@@ -30,4 +37,4 @@ class MessageTest extends PHPUnit_Framework_TestCase {
 	function testInLanguageThrows() {
 		Message::key( 'foo' )->inLanguage( 123 );
 	}
-}
\ No newline at end of file
+}
diff --git a/maintenance/tests/SearchDbTest.php b/maintenance/tests/SearchDbTest.php
index 370b0c45aa..e727b65a3e 100644
--- a/maintenance/tests/SearchDbTest.php
+++ b/maintenance/tests/SearchDbTest.php
@@ -24,6 +24,7 @@ class SearchDbTest extends SearchEngineTest {
 		}
 		unset( $this->db );
 		unset( $this->search );
+		$GLOBALS['wgContLang'] = null;
 	}
 }
 
diff --git a/maintenance/tests/SearchUpdateTest.php b/maintenance/tests/SearchUpdateTest.php
index b3c405c8e0..a4fc357aef 100644
--- a/maintenance/tests/SearchUpdateTest.php
+++ b/maintenance/tests/SearchUpdateTest.php
@@ -62,7 +62,7 @@ class SearchUpdateTest extends PHPUnit_Framework_TestCase {
 	}
 
 	function setUp() {
-		global $wgSearchType, $wgDBtype, $wgLBFactoryConf, $wgDBservers;
+		global $wgSearchType, $wgDBtype, $wgLBFactoryConf, $wgDBservers, $wgContLang;
 
 		self::$searchType  = $wgSearchType;
 		self::$dbtype      = $wgDBtype;
@@ -73,6 +73,7 @@ class SearchUpdateTest extends PHPUnit_Framework_TestCase {
 		$wgDBtype = 'mock';
 		$wgLBFactoryConf['class'] = 'LBFactory_Simple';
 		$wgDBservers = null;
+		$wgContLang = Language::factory( 'en' );
 		LBFactory::destroyInstance();
 	}
 
@@ -85,6 +86,7 @@ class SearchUpdateTest extends PHPUnit_Framework_TestCase {
 		$wgDBtype = self::$dbtype;
 		$wgLBFactoryConf = self::$factoryconf;
 		$wgDBservers = self::$dbservers;
+		$wgContLang = null;
 	}
 
 	function testUpdateText() {
diff --git a/maintenance/tests/TitlePermissionTest.php b/maintenance/tests/TitlePermissionTest.php
index 4d34e6fc75..f451974e74 100644
--- a/maintenance/tests/TitlePermissionTest.php
+++ b/maintenance/tests/TitlePermissionTest.php
@@ -10,7 +10,12 @@ class TitlePermissionTest extends PhpUnit_Framework_TestCase {
 	static $altUserName;
 
 	function setUp() {
-		global $wgLocaltimezone, $wgLocalTZoffset;
+		global $wgLocaltimezone, $wgLocalTZoffset, $wgMemc, $wgContLang, $wgLang, $wgMessageCache;
+
+		$wgMemc = new FakeMemCachedClient;
+		$wgMessageCache = new MessageCache( $wgMemc, true, 3600 );
+		$wgContLang = $wgLang = Language::factory( 'en' );
+
 		self::$userName = "Useruser";
 		self::$altUserName = "Altuseruser";
 		date_default_timezone_set( $wgLocaltimezone );
@@ -39,6 +44,11 @@ class TitlePermissionTest extends PhpUnit_Framework_TestCase {
 		}
 	}
 
+	function tearDown() {
+		global $wgMemc, $wgContLang, $wgLang;
+		$wgMemc = $wgContLang = $wgLang = null;
+	}
+
 	function setUserPerm( $perm ) {
 		if ( is_array( $perm ) ) {
 			self::$user->mRights = $perm;
@@ -638,4 +648,4 @@ class TitlePermissionTest extends PhpUnit_Framework_TestCase {
 		#   $user->blockedFor() == ''
 		#   $user->mBlock->mExpiry == 'infinity'
 	}
-}
\ No newline at end of file
+}
diff --git a/maintenance/tests/UploadTest.php b/maintenance/tests/UploadTest.php
index 059126f389..41c9d80d56 100644
--- a/maintenance/tests/UploadTest.php
+++ b/maintenance/tests/UploadTest.php
@@ -7,7 +7,9 @@ class UploadTest extends PHPUnit_Framework_TestCase {
 
 
 	function setUp() {
+		global $wgContLang;
 		parent::setup();
+		$wgContLang = Language::factory( 'en' );
 		$this->upload = new UploadTestHandler;
 	}