Update to MediaWiki 1.24.2

1 files changed, 140 insertions, 0 deletions

diff --git a/tests/phpunit/includes/media/BitmapScalingTest.php b/tests/phpunit/includes/media/BitmapScalingTest.php
new file mode 100644
index 00000000..1972c969
--- /dev/null
+++ b/tests/phpunit/includes/media/BitmapScalingTest.php
@@ -0,0 +1,140 @@
+<?php
+
+/**
+ * @group Media
+ */
+class BitmapScalingTest extends MediaWikiTestCase {
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->setMwGlobals( array(
+			'wgMaxImageArea' => 1.25e7, // 3500x3500
+			'wgCustomConvertCommand' => 'dummy', // Set so that we don't get client side rendering
+		) );
+	}
+
+	/**
+	 * @dataProvider provideNormaliseParams
+	 * @covers BitmapHandler::normaliseParams
+	 */
+	public function testNormaliseParams( $fileDimensions, $expectedParams, $params, $msg ) {
+		$file = new FakeDimensionFile( $fileDimensions );
+		$handler = new BitmapHandler;
+		$valid = $handler->normaliseParams( $file, $params );
+		$this->assertTrue( $valid );
+		$this->assertEquals( $expectedParams, $params, $msg );
+	}
+
+	public static function provideNormaliseParams() {
+		return array(
+			/* Regular resize operations */
+			array(
+				array( 1024, 768 ),
+				array(
+					'width' => 512, 'height' => 384,
+					'physicalWidth' => 512, 'physicalHeight' => 384,
+					'page' => 1,
+				),
+				array( 'width' => 512 ),
+				'Resizing with width set',
+			),
+			array(
+				array( 1024, 768 ),
+				array(
+					'width' => 512, 'height' => 384,
+					'physicalWidth' => 512, 'physicalHeight' => 384,
+					'page' => 1,
+				),
+				array( 'width' => 512, 'height' => 768 ),
+				'Resizing with height set too high',
+			),
+			array(
+				array( 1024, 768 ),
+				array(
+					'width' => 512, 'height' => 384,
+					'physicalWidth' => 512, 'physicalHeight' => 384,
+					'page' => 1,
+				),
+				array( 'width' => 1024, 'height' => 384 ),
+				'Resizing with height set',
+			),
+
+			/* Very tall images */
+			array(
+				array( 1000, 100 ),
+				array(
+					'width' => 5, 'height' => 1,
+					'physicalWidth' => 5, 'physicalHeight' => 1,
+					'page' => 1,
+				),
+				array( 'width' => 5 ),
+				'Very wide image',
+			),
+
+			array(
+				array( 100, 1000 ),
+				array(
+					'width' => 1, 'height' => 10,
+					'physicalWidth' => 1, 'physicalHeight' => 10,
+					'page' => 1,
+				),
+				array( 'width' => 1 ),
+				'Very high image',
+			),
+			array(
+				array( 100, 1000 ),
+				array(
+					'width' => 1, 'height' => 5,
+					'physicalWidth' => 1, 'physicalHeight' => 10,
+					'page' => 1,
+				),
+				array( 'width' => 10, 'height' => 5 ),
+				'Very high image with height set',
+			),
+			/* Max image area */
+			array(
+				array( 4000, 4000 ),
+				array(
+					'width' => 5000, 'height' => 5000,
+					'physicalWidth' => 4000, 'physicalHeight' => 4000,
+					'page' => 1,
+				),
+				array( 'width' => 5000 ),
+				'Bigger than max image size but doesn\'t need scaling',
+			),
+		);
+	}
+
+	/**
+	 * @covers BitmapHandler::doTransform
+	 */
+	public function testTooBigImage() {
+		$file = new FakeDimensionFile( array( 4000, 4000 ) );
+		$handler = new BitmapHandler;
+		$params = array( 'width' => '3700' ); // Still bigger than max size.
+		$this->assertEquals( 'TransformParameterError',
+			get_class( $handler->doTransform( $file, 'dummy path', '', $params ) ) );
+	}
+
+	/**
+	 * @covers BitmapHandler::doTransform
+	 */
+	public function testTooBigMustRenderImage() {
+		$file = new FakeDimensionFile( array( 4000, 4000 ) );
+		$file->mustRender = true;
+		$handler = new BitmapHandler;
+		$params = array( 'width' => '5000' ); // Still bigger than max size.
+		$this->assertEquals( 'TransformParameterError',
+			get_class( $handler->doTransform( $file, 'dummy path', '', $params ) ) );
+	}
+
+	/**
+	 * @covers BitmapHandler::getImageArea
+	 */
+	public function testImageArea() {
+		$file = new FakeDimensionFile( array( 7, 9 ) );
+		$handler = new BitmapHandler;
+		$this->assertEquals( 63, $handler->getImageArea( $file ) );
+	}
+}