Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[StatusTest] Replace ReflectionMethod with TestingAccessWrapper

Browse source 
TestingAccessWrapper wraps the reflection codes and avoids invoke() etc.

Change-Id: I2cfa6c1f28228a431e6783b18f7549c1507c022f
This commit is contained in:
Umherirrender 2020-10-30 14:58:20 +01:00
parent 32491cb005
commit e2613e9f1d
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tests/phpunit/includes/StatusTest.php
View file

@ -1,5 +1,7 @@
<?php
use Wikimedia\TestingAccessWrapper;
/**
* @author Addshore
*/
@ -291,12 +293,10 @@ class StatusTest extends MediaWikiLangTestCase {
* @covers Status::cleanParams
*/
public function testCleanParams( $cleanCallback, $params, $expected ) {
$method = new ReflectionMethod( Status::class, 'cleanParams' );
$method->setAccessible( true );
$status = new Status();
$status = TestingAccessWrapper::newFromObject( new Status() );
$status->cleanCallback = $cleanCallback;
$this->assertEquals( $expected, $method->invoke( $status, $params ) );
$this->assertEquals( $expected, $status->cleanParams( $params ) );
}
public static function provideCleanParams() {
@ -540,14 +540,12 @@ class StatusTest extends MediaWikiLangTestCase {
* @covers Status::getErrorMessage
*/
public function testGetErrorMessage() {
$method = new ReflectionMethod( Status::class, 'getErrorMessage' );
$method->setAccessible( true );
$status = new Status();
$status = TestingAccessWrapper::newFromObject( new Status() );
$key = 'foo';
$params = [ 'bar' ];
/** @var Message $message */
$message = $method->invoke( $status, array_merge( [ $key ], $params ) );
$message = $status->getErrorMessage( array_merge( [ $key ], $params ) );
$this->assertInstanceOf( Message::class, $message );
$this->assertEquals( $key, $message->getKey() );
$this->assertEquals( $params, $message->getParams() );
@ -557,14 +555,12 @@ class StatusTest extends MediaWikiLangTestCase {
* @covers Status::getErrorMessage
*/
public function testGetErrorMessageComplexParam() {
$method = new ReflectionMethod( Status::class, 'getErrorMessage' );
$method->setAccessible( true );
$status = new Status();
$status = TestingAccessWrapper::newFromObject( new Status() );
$key = 'foo';
$params = [ 'bar', Message::numParam( 5 ) ];
/** @var Message $message */
$message = $method->invoke( $status, array_merge( [ $key ], $params ) );
$message = $status->getErrorMessage( array_merge( [ $key ], $params ) );
$this->assertInstanceOf( Message::class, $message );
$this->assertEquals( $key, $message->getKey() );
$this->assertEquals( $params, $message->getParams() );
@ -574,15 +570,12 @@ class StatusTest extends MediaWikiLangTestCase {
* @covers Status::getErrorMessageArray
*/
public function testGetErrorMessageArray() {
$method = new ReflectionMethod( Status::class, 'getErrorMessageArray' );
$method->setAccessible( true );
$status = new Status();
$status = TestingAccessWrapper::newFromObject( new Status() );
$key = 'foo';
$params = [ 'bar' ];
/** @var Message[] $messageArray */
$messageArray = $method->invoke(
$status,
$messageArray = $status->getErrorMessageArray(
[
array_merge( [ $key ], $params ),
array_merge( [ $key ], $params )