From 4afa4e7dce12a4e9c0c1ce3c5a185f6a2378cf7c Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Wed, 9 Mar 2016 00:46:51 +0100
Subject: [PATCH] MediaWikiTestCase::assertException() was removed

Deprecated since 1.22. No uses in core or Gerrit extensions remaining.

Change-Id: Icae4077078c73d766d3c1c9e9e569922151296d9
---
 RELEASE-NOTES-1.27                  |  1 +
 tests/phpunit/MediaWikiTestCase.php | 27 ---------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 4d7f444536..2f8f53a1b3 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -245,6 +245,7 @@ HHVM 3.1.
 * Language::getLanguageNames() was removed (deprecated since 1.20).
 * Language::getTranslatedLanguageNames() was removed (deprecated since 1.20).
 * Language::specialPage() was removed (deprecated since 1.24).
+* MediaWikiTestCase::assertException() was removed (deprecated since 1.22).
 * OutputPage::getHeadItems() was removed (deprecated since 1.24).
 * OutputPage::getScript() was removed (deprecated since 1.24).
 * OutputPage::out() was removed (deprecated since 1.22).
diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 045c3d4bed..dc6990260a 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1321,33 +1321,6 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 		return $loaded;
 	}
 
-	/**
-	 * Asserts that an exception of the specified type occurs when running
-	 * the provided code.
-	 *
-	 * @since 1.21
-	 * @deprecated since 1.22 Use setExpectedException
-	 *
-	 * @param callable $code
-	 * @param string $expected
-	 * @param string $message
-	 */
-	protected function assertException( $code, $expected = 'Exception', $message = '' ) {
-		$pokemons = null;
-
-		try {
-			call_user_func( $code );
-		} catch ( Exception $pokemons ) {
-			// Gotta Catch 'Em All!
-		}
-
-		if ( $message === '' ) {
-			$message = 'An exception of type "' . $expected . '" should have been thrown';
-		}
-
-		$this->assertInstanceOf( $expected, $pokemons, $message );
-	}
-
 	/**
 	 * Asserts that the given string is a valid HTML snippet.
 	 * Wraps the given string in the required top level tags and
-- 
2.20.1