Follow up r87210

diff --git a/tests/phpunit/includes/ArticleTablesTest.php b/tests/phpunit/includes/ArticleTablesTest.php
index 6d7d05a..1caf587 100644 (file)
--- a/tests/phpunit/includes/ArticleTablesTest.php
+++ b/tests/phpunit/includes/ArticleTablesTest.php
@@ -4,21 +4,7 @@
  * @group Database
  * @group Destructive
  */
-class ArticleTablesTest extends MediaWikiTestCase {
-       
-       function setUp() {
-               global $wgLanguageCode;
-               
-               $this->languageCode = $wgLanguageCode;
-       }
-       
-       function tearDown() {
-               global $wgLanguageCode, $wgContLang, $wgLang;
-               $wgLanguageCode = $this->languageCode;
-               $wgContLang = Language::factory( $wgLanguageCode );
-               $wgLang = new StubUserLang;
-       }
-
+class ArticleTablesTest extends MediaWikiLangTestCase {
        /**
         * @group Broken
         */

diff --git a/tests/phpunit/includes/BlockTest.php b/tests/phpunit/includes/BlockTest.php
index 362c9ec..278dd92 100644 (file)
--- a/tests/phpunit/includes/BlockTest.php
+++ b/tests/phpunit/includes/BlockTest.php
@@ -3,17 +3,15 @@
 /**
  * @group Database
  */
-class BlockTest extends MediaWikiTestCase {
+class BlockTest extends MediaWikiLangTestCase {
        
        private $block, $madeAt;
        
        function setUp() {
                global $wgContLang;
+               parent::setUp();
                $wgContLang = Language::factory( 'en' );
        }
-
-       function tearDown() {
-       }
        
        function addDBData() {
                

diff --git a/tests/phpunit/includes/LocalFileTest.php b/tests/phpunit/includes/LocalFileTest.php
index 98c0de5..e08d4d7 100644 (file)
--- a/tests/phpunit/includes/LocalFileTest.php
+++ b/tests/phpunit/includes/LocalFileTest.php
@@ -7,9 +7,8 @@
 
 class LocalFileTest extends MediaWikiTestCase {
        function setUp() {
-               global $wgContLang, $wgCapitalLinks;
+               global $wgCapitalLinks;
 
-               $wgContLang = new Language;
                $wgCapitalLinks = true;
                $info = array(
                        'name' => 'test',

diff --git a/tests/phpunit/includes/api/ApiSetup.php b/tests/phpunit/includes/api/ApiSetup.php
index 1c8001e..7672faa 100644 (file)
--- a/tests/phpunit/includes/api/ApiSetup.php
+++ b/tests/phpunit/includes/api/ApiSetup.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class ApiTestSetup extends MediaWikiTestCase {
+abstract class ApiTestSetup extends MediaWikiLangTestCase {
        protected $user;
        protected $sysopUser;
        protected static $apiUrl;
@@ -8,6 +8,7 @@ abstract class ApiTestSetup extends MediaWikiTestCase {
        function setUp() {
                global $wgServer, $wgContLang, $wgAuth, $wgMemc, $wgRequest;
 
+               parent::setUp();
                self::$apiUrl = $wgServer . wfScript( 'api' );
 
                $wgMemc = new EmptyBagOStuff;

diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index 4907c79..54da690 100644 (file)
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -1,11 +1,12 @@
 <?php 
 
-abstract class ApiTestCase extends MediaWikiTestCase {
+abstract class ApiTestCase extends MediaWikiLangTestCase {
        public static $users;
 
        function setUp() {
                global $wgContLang, $wgAuth, $wgMemc, $wgRequest, $wgUser;
 
+               parent::setUp();
                $wgMemc = new EmptyBagOStuff();
                $wgContLang = Language::factory( 'en' );
                $wgAuth = new StubObject( 'wgAuth', 'AuthPlugin' );

diff --git a/tests/phpunit/includes/api/ApiTestCaseUpload.php b/tests/phpunit/includes/api/ApiTestCaseUpload.php
index 4824d7e..e51e721 100644 (file)
--- a/tests/phpunit/includes/api/ApiTestCaseUpload.php
+++ b/tests/phpunit/includes/api/ApiTestCaseUpload.php
@@ -19,14 +19,6 @@ abstract class ApiTestCaseUpload extends ApiTestCase {
                $this->clearFakeUploads();
        }
 
-       /**
-        * Fixture -- run after every test
-        * Clean up temporary files etc.
-        */
-       function tearDown() {
-       }
-
-
        /**
         * Helper function -- remove files and associated articles by Title
         * @param $title Title: title to be removed