wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-24 10:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace @expectedException with $this->expectException()

Browse source 
The @expectedException annotation got deprecated in PHPUnit 7.5, and
removed in PHPUnit 8.0. This was done because the annotation does have
two disadvantages:
* The class name is encoded in string, where it is not easy to find for
  all IDEs and tools.
* it did not allow to say exactly *when* the exception is expected.

Change-Id: I85f0b5f44b2f400a121115d402b64827ea534c32
This commit is contained in:
Thiemo Kreuz 2019-02-19 09:52:31 +01:00
parent 7a8b1ae811
commit 3993a7ea15
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tests/phpunit/AbuseFilterParserTest.php
View file

@ -585,11 +585,13 @@ class AbuseFilterParserTest extends MediaWikiTestCase {
* @covers AbuseFilterParser::castFloat
* @covers AbuseFilterParser::castBool
* @dataProvider oneParamFuncs
* @expectedException AFPUserVisibleException
* @expectedExceptionMessageRegExp /^No parameters given to function/
*/
public function testNoParamsException( $func ) {
$parser = self::getParser();
$this->setExpectedException(
AFPUserVisibleException::class,
'No parameters given to function'
);
$parser->parse( "$func()" );
}
@ -639,14 +641,19 @@ class AbuseFilterParserTest extends MediaWikiTestCase {
* @covers AbuseFilterParser::funcStrPos
* @covers AbuseFilterParser::funcSetVar
* @dataProvider twoParamsFuncs
* @expectedException AFPUserVisibleException
* @expectedExceptionMessageRegExp /^Not enough arguments to function [^ ]+ called at character \d+.\nExpected 2 arguments, got 1/
*/
public function testNotEnoughArgsExceptionTwo( $func ) {
$parser = self::getParser();
// Nevermind if the argument can't be string since we check the amount
// of parameters before anything else.
$parser->parse( "$func('foo')" );
$code = "$func('foo')";
$length = strlen( $code );
$this->setExpectedException(
AFPUserVisibleException::class,
"Not enough arguments to function $func called at character $length.\n" .
'Expected 2 arguments, got 1'
);
$parser->parse( $code );
}
/**
@ -678,11 +685,14 @@ class AbuseFilterParserTest extends MediaWikiTestCase {
* @covers AbuseFilterParser::checkEnoughArguments
* @covers AbuseFilterParser::funcStrReplace
* @dataProvider threeParamsFuncs
* @expectedException AFPUserVisibleException
* @expectedExceptionMessageRegExp /^Not enough arguments to function [^ ]+ called at character \d+.\nExpected 3 arguments, got 2/
*/
public function testNotEnoughArgsExceptionThree( $func ) {
$parser = self::getParser();
$this->setExpectedException(
AFPUserVisibleException::class,
"Not enough arguments to function $func called at character 25.\n" .
'Expected 3 arguments, got 2'
);
// Nevermind if the argument can't be string since we check the amount
// of parameters before anything else.
$parser->parse( "$func('foo', 'bar')" );