From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 28 Jul 2011 00:14:49 +0000 (+0000)
Subject: Followup r93344: forgot to fix test. In other news: inline data providing is eww.
X-Git-Tag: 1.31.0-rc.0~28580
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=6bf0914fbdb055c573d15a1e05be7740f61fa51d;p=lhc%2Fweb%2Fwiklou.git

Followup r93344: forgot to fix test. In other news: inline data providing is eww.
---

diff --git a/tests/phpunit/includes/ImageFunctionsTest.php b/tests/phpunit/includes/ImageFunctionsTest.php
deleted file mode 100644
index d6518b04de..0000000000
--- a/tests/phpunit/includes/ImageFunctionsTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-class ImageFunctionsTest extends MediaWikiTestCase {
-	function testFitBoxWidth() {
-		$vals = array(
-			array(
-				'width' => 50,
-				'height' => 50,
-				'tests' => array(
-					50 => 50,
-					17 => 17,
-					18 => 18 ) ),
-			array(
-				'width' => 366,
-				'height' => 300,
-				'tests' => array(
-					50 => 61,
-					17 => 21,
-					18 => 22 ) ),
-			array(
-				'width' => 300,
-				'height' => 366,
-				'tests' => array(
-					50 => 41,
-					17 => 14,
-					18 => 15 ) ),
-			array(
-				'width' => 100,
-				'height' => 400,
-				'tests' => array(
-					50 => 12,
-					17 => 4,
-					18 => 4 ) ) );
-		foreach ( $vals as $row ) {
-			$tests = $row['tests'];
-			$height = $row['height'];
-			$width = $row['width'];
-			foreach ( $tests as $max => $expected ) {
-				$y = round( $expected * $height / $width );
-				$result = wfFitBoxWidth( $width, $height, $max );
-				$y2 = round( $result * $height / $width );
-				$this->assertEquals( $expected,
-					$result,
-					"($width, $height, $max) wanted: {$expected}x$y, got: {$result}x$y2" );
-			}
-		}
-	}
-}
-
-
diff --git a/tests/phpunit/includes/media/MediaHandlerTest.php b/tests/phpunit/includes/media/MediaHandlerTest.php
new file mode 100644
index 0000000000..99df4f80f9
--- /dev/null
+++ b/tests/phpunit/includes/media/MediaHandlerTest.php
@@ -0,0 +1,50 @@
+<?php
+
+class MediaHandlerTest extends MediaWikiTestCase {
+	function testFitBoxWidth() {
+		$vals = array(
+			array(
+				'width' => 50,
+				'height' => 50,
+				'tests' => array(
+					50 => 50,
+					17 => 17,
+					18 => 18 ) ),
+			array(
+				'width' => 366,
+				'height' => 300,
+				'tests' => array(
+					50 => 61,
+					17 => 21,
+					18 => 22 ) ),
+			array(
+				'width' => 300,
+				'height' => 366,
+				'tests' => array(
+					50 => 41,
+					17 => 14,
+					18 => 15 ) ),
+			array(
+				'width' => 100,
+				'height' => 400,
+				'tests' => array(
+					50 => 12,
+					17 => 4,
+					18 => 4 ) ) );
+		foreach ( $vals as $row ) {
+			$tests = $row['tests'];
+			$height = $row['height'];
+			$width = $row['width'];
+			foreach ( $tests as $max => $expected ) {
+				$y = round( $expected * $height / $width );
+				$result = MediaHandler::fitBoxWidth( $width, $height, $max );
+				$y2 = round( $result * $height / $width );
+				$this->assertEquals( $expected,
+					$result,
+					"($width, $height, $max) wanted: {$expected}x$y, got: {$result}x$y2" );
+			}
+		}
+	}
+}
+
+