Merge "Date range filtering in Special:NewFiles"

[lhc/web/wiklou.git] / tests / phpunit / includes / exception / BadTitleErrorTest.php

diff --git a/tests/phpunit/includes/exception/BadTitleErrorTest.php b/tests/phpunit/includes/exception/BadTitleErrorTest.php
index 6f9804d..e6a1812 100644 (file)
--- a/tests/phpunit/includes/exception/BadTitleErrorTest.php
+++ b/tests/phpunit/includes/exception/BadTitleErrorTest.php
@@ -1,31 +1,15 @@
 <?php
 /**
  * @covers BadTitleError
- * @author Adam Shorland
+ * @author Addshore
  */
 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();
-               try{
+               $this->setMwGlobals( 'wgOut', $this->getMockWgOut() );
+               try {
                        throw new BadTitleError();
-               }
-               catch( BadTitleError $e ) {
+               } catch ( BadTitleError $e ) {
                        $e->report();
                        $this->assertTrue( true );
                }