Merge "Some fixes to our jQuery UI skin for buttons"

[lhc/web/wiklou.git] / tests / phpunit / MediaWikiLangTestCase.php

diff --git a/tests/phpunit/MediaWikiLangTestCase.php b/tests/phpunit/MediaWikiLangTestCase.php
index 1cd6a3b..6dd8ea3 100644 (file)
--- a/tests/phpunit/MediaWikiLangTestCase.php
+++ b/tests/phpunit/MediaWikiLangTestCase.php
@@ -10,15 +10,22 @@ abstract class MediaWikiLangTestCase extends MediaWikiTestCase {
        public function setUp() {
                global $wgLanguageCode, $wgLang, $wgContLang;
 
+               parent::setUp();
+
                self::$oldLang = $wgLang;
                self::$oldContLang = $wgContLang;
 
-               if( $wgLanguageCode != $wgContLang->getCode() ) die("nooo!");
+               if( $wgLanguageCode != $wgContLang->getCode() ) {
+                       throw new MWException("Error in MediaWikiLangTestCase::setUp(): " .
+                               "\$wgLanguageCode ('$wgLanguageCode') is different from " .
+                               "\$wgContLang->getCode() (" . $wgContLang->getCode() . ")" );
+               }
 
                $wgLanguageCode = 'en'; # For mainpage to be 'Main Page'
 
                $wgContLang = $wgLang = Language::factory( $wgLanguageCode );
                MessageCache::singleton()->disable();
+
        }
 
        public function tearDown() {
@@ -28,6 +35,8 @@ abstract class MediaWikiLangTestCase extends MediaWikiTestCase {
                $wgContLang = self::$oldContLang;
                $wgLanguageCode = $wgContLang->getCode();
                self::$oldContLang = self::$oldLang = null;
+
+               parent::tearDown();
        }
 
 }