Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/171634
Change subject: Use setMwGlobals on execption tests
......................................................................
Use setMwGlobals on execption tests
Simplify $wgOut handling by setting the global with setMwGlobals
Change-Id: I64bf23e657ea82316e1cd71df6491322e537d5d1
---
M tests/phpunit/includes/exception/BadTitleErrorTest.php
M tests/phpunit/includes/exception/ErrorPageErrorTest.php
M tests/phpunit/includes/exception/ThrottledErrorTest.php
3 files changed, 6 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/34/171634/1
diff --git a/tests/phpunit/includes/exception/BadTitleErrorTest.php
b/tests/phpunit/includes/exception/BadTitleErrorTest.php
index 003efd2..500b7e4 100644
--- a/tests/phpunit/includes/exception/BadTitleErrorTest.php
+++ b/tests/phpunit/includes/exception/BadTitleErrorTest.php
@@ -5,23 +5,8 @@
*/
class BadTitleErrorTest extends MediaWikiTestCase {
- protected $wgOut;
-
- protected function setUp() {
- parent::setUp();
- global $wgOut;
- $this->wgOut = clone $wgOut;
- }
-
- protected function tearDown() {
- parent::tearDown();
- global $wgOut;
- $wgOut = $this->wgOut;
- }
-
public function testExceptionSetsStatusCode() {
- global $wgOut;
- $wgOut = $this->getMockWgOut();
+ $this->setMwGlobals( 'wgOut', $this->getMockWgOut() );
try {
throw new BadTitleError();
} catch ( BadTitleError $e ) {
diff --git a/tests/phpunit/includes/exception/ErrorPageErrorTest.php
b/tests/phpunit/includes/exception/ErrorPageErrorTest.php
index 13dcf33..9c4e4a0 100644
--- a/tests/phpunit/includes/exception/ErrorPageErrorTest.php
+++ b/tests/phpunit/includes/exception/ErrorPageErrorTest.php
@@ -6,20 +6,6 @@
*/
class ErrorPageErrorTest extends MediaWikiTestCase {
- private $wgOut;
-
- protected function setUp() {
- parent::setUp();
- global $wgOut;
- $this->wgOut = clone $wgOut;
- }
-
- protected function tearDown() {
- global $wgOut;
- $wgOut = $this->wgOut;
- parent::tearDown();
- }
-
private function getMockMessage() {
$mockMessage = $this->getMockBuilder( 'Message' )
->disableOriginalConstructor()
@@ -48,20 +34,18 @@
$title = 'Foo';
$params = array( 'Baz' );
- global $wgOut;
- $wgOut = $this->getMockBuilder( 'OutputPage' )
+ $mock = $this->getMockBuilder( 'OutputPage' )
->disableOriginalConstructor()
->getMock();
- $wgOut->expects( $this->once() )
+ $mock->expects( $this->once() )
->method( 'showErrorPage' )
->with( $title, $mockMessage, $params );
- $wgOut->expects( $this->once() )
+ $mock->expects( $this->once() )
->method( 'output' );
+ $this->setMwGlobals( 'wgOut', $mock );
$e = new ErrorPageError( $title, $mockMessage, $params );
$e->report();
}
-
-
}
diff --git a/tests/phpunit/includes/exception/ThrottledErrorTest.php
b/tests/phpunit/includes/exception/ThrottledErrorTest.php
index bdb143f..a1cf84b 100644
--- a/tests/phpunit/includes/exception/ThrottledErrorTest.php
+++ b/tests/phpunit/includes/exception/ThrottledErrorTest.php
@@ -6,23 +6,8 @@
*/
class ThrottledErrorTest extends MediaWikiTestCase {
- protected $wgOut;
-
- protected function setUp() {
- parent::setUp();
- global $wgOut;
- $this->wgOut = clone $wgOut;
- }
-
- protected function tearDown() {
- parent::tearDown();
- global $wgOut;
- $wgOut = $this->wgOut;
- }
-
public function testExceptionSetsStatusCode() {
- global $wgOut;
- $wgOut = $this->getMockWgOut();
+ $this->setMwGlobals( 'wgOut', $this->getMockWgOut() );
try {
throw new ThrottledError();
} catch ( ThrottledError $e ) {
--
To view, visit https://gerrit.wikimedia.org/r/171634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64bf23e657ea82316e1cd71df6491322e537d5d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
