jenkins-bot has submitted this change and it was merged.
Change subject: Make data provider in MediaHandlerTest static
......................................................................
Make data provider in MediaHandlerTest static
Also, improve function names.
Follows-up Ie1cf501a6a0c8e688aca1a5577a293f526398dd3
Change-Id: I5eef5f193192041d7b0514eaa8b779c03e6647c7
---
M tests/phpunit/includes/media/MediaHandlerTest.php
1 file changed, 20 insertions(+), 6 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/media/MediaHandlerTest.php
b/tests/phpunit/includes/media/MediaHandlerTest.php
index 5fa609a..78ea953 100644
--- a/tests/phpunit/includes/media/MediaHandlerTest.php
+++ b/tests/phpunit/includes/media/MediaHandlerTest.php
@@ -19,24 +19,24 @@
"($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 @@
);
}
- 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 );
--
To view, visit https://gerrit.wikimedia.org/r/186083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5eef5f193192041d7b0514eaa8b779c03e6647c7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: M4tx <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
