From 92d6102e517b1215da11f0a10224ef753cd8632e Mon Sep 17 00:00:00 2001 From: Platonides Date: Thu, 31 May 2012 23:07:24 +0200 Subject: [PATCH] Inherit DumpTestCase from MediaWikiLangTestCase, since backup_PageTest expect the ContentLanguage to be English (backupTextPassTest and backup_LogTest also get the change, but don't require it) Change-Id: I8b3482df011bccd9fe520ba07c8b8d70de3b9dbb --- tests/phpunit/maintenance/DumpTestCase.php | 4 ++-- tests/phpunit/maintenance/backupTextPassTest.php | 2 +- tests/phpunit/maintenance/backup_PageTest.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/maintenance/DumpTestCase.php b/tests/phpunit/maintenance/DumpTestCase.php index b73c4a9f2c..976fd6bed5 100644 --- a/tests/phpunit/maintenance/DumpTestCase.php +++ b/tests/phpunit/maintenance/DumpTestCase.php @@ -3,7 +3,7 @@ /** * Base TestCase for dumps */ -abstract class DumpTestCase extends MediaWikiTestCase { +abstract class DumpTestCase extends MediaWikiLangTestCase { /** * exception to be rethrown once in sound PHPUnit surrounding @@ -72,7 +72,7 @@ abstract class DumpTestCase extends MediaWikiTestCase { * * Clears $wgUser, and reports errors from addDBData to PHPUnit */ - protected function setUp() { + public function setUp() { global $wgUser; parent::setUp(); diff --git a/tests/phpunit/maintenance/backupTextPassTest.php b/tests/phpunit/maintenance/backupTextPassTest.php index 972fc7392d..0d7f155f3f 100644 --- a/tests/phpunit/maintenance/backupTextPassTest.php +++ b/tests/phpunit/maintenance/backupTextPassTest.php @@ -73,7 +73,7 @@ class TextPassDumperTest extends DumpTestCase { } - protected function setUp() { + public function setUp() { parent::setUp(); // Since we will restrict dumping by page ranges (to allow diff --git a/tests/phpunit/maintenance/backup_PageTest.php b/tests/phpunit/maintenance/backup_PageTest.php index 205700e429..3850c4a0f9 100644 --- a/tests/phpunit/maintenance/backup_PageTest.php +++ b/tests/phpunit/maintenance/backup_PageTest.php @@ -65,7 +65,7 @@ class BackupDumperPageTest extends DumpTestCase { } - protected function setUp() { + public function setUp() { parent::setUp(); // Since we will restrict dumping by page ranges (to allow -- 2.20.1