Use setMwGlobals on execption tests

Simplify $wgOut handling by setting the global with setMwGlobals

Change-Id: I64bf23e657ea82316e1cd71df6491322e537d5d1

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 ) {

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 @@ class ErrorPageErrorTest extends MediaWikiTestCase {
 		$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();
 	}
 
-
-
 }

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 ) {