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

Make data provider in MediaHandlerTest static

Browse source 
Also, improve function names.

Follows-up Ie1cf501a6a0c8e688aca1a5577a293f526398dd3
Change-Id: I5eef5f193192041d7b0514eaa8b779c03e6647c7
This commit is contained in:
m4tx 2015-01-20 22:11:33 +01:00
parent e473cc1a41
commit c88254e8aa
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tests/phpunit/includes/media/MediaHandlerTest.php
View file

@ -19,24 +19,24 @@ class MediaHandlerTest extends MediaWikiTestCase {
"($width, $height, $max) wanted: {$expected}x$y, got: {z$result}x$y2" );
}
public function provideTestFitBoxWidth() {
public static function provideTestFitBoxWidth() {
return array_merge(
$this->provideTestFitBoxWidthSingle( 50, 50, array(
static::generateTestFitBoxWidthData( 50, 50, array(
50 => 50,
17 => 17,
18 => 18 )
),
$this->provideTestFitBoxWidthSingle( 366, 300, array(
static::generateTestFitBoxWidthData( 366, 300, array(
50 => 61,
17 => 21,
18 => 22 )
),
$this->provideTestFitBoxWidthSingle( 300, 366, array(
static::generateTestFitBoxWidthData( 300, 366, array(
50 => 41,
17 => 14,
18 => 15 )
),
$this->provideTestFitBoxWidthSingle( 100, 400, array(
static::generateTestFitBoxWidthData( 100, 400, array(
50 => 12,
17 => 4,
18 => 4 )
@ -44,7 +44,21 @@ class MediaHandlerTest extends MediaWikiTestCase {
);
}
private function provideTestFitBoxWidthSingle( $width, $height, $tests ) {
/**
* Generate single test cases by combining the dimensions and tests contents
*
* It creates:
* [$width, $height, $max, $expected],
* [$width, $height, $max2, $expected2], ...
* out of parameters:
* $width, $height, { $max => $expected, $max2 => $expected2, ... }
*
* @param $width int
* @param $height int
* @param $tests array associative array of $max => $expected values
* @return array
*/
private static function generateTestFitBoxWidthData( $width, $height, $tests ) {
$result = array();
foreach ( $tests as $max => $expected ) {
$result[] = array( $width, $height, $max, $expected );