Merge "Make SpecialPageTestBase always call parent::tearDown"

[lhc/web/wiklou.git] / tests / phpunit / includes / api / ApiErrorFormatterTest.php

diff --git a/tests/phpunit/includes/api/ApiErrorFormatterTest.php b/tests/phpunit/includes/api/ApiErrorFormatterTest.php
index d47481c..f36faf7 100644 (file)
--- a/tests/phpunit/includes/api/ApiErrorFormatterTest.php
+++ b/tests/phpunit/includes/api/ApiErrorFormatterTest.php
@@ -555,6 +555,10 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
         * @param array $expect
         */
        public function testGetMessageFromException_BC( $exception, $options, $expect ) {
+               if ( $exception instanceof UsageException ) {
+                       $this->hideDeprecated( 'UsageException::getMessageArray' );
+               }
+
                $result = new ApiResult( 8388608 );
                $formatter = new ApiErrorFormatter_BackCompat( $result );
 
@@ -575,11 +579,11 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
        }
 
        public static function provideGetMessageFromException() {
-               MediaWiki\suppressWarnings();
+               Wikimedia\suppressWarnings();
                $usageException = new UsageException(
                        '<b>Something broke!</b>', 'ue-code', 0, [ 'xxx' => 'yyy', 'baz' => 23 ]
                );
-               MediaWiki\restoreWarnings();
+               Wikimedia\restoreWarnings();
 
                return [
                        'Normal exception' => [