X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fmedia%2FSVGMetadataExtractorTest.php;h=7aef246fccdd8b5f4e61d4740ccdfd62acec0ebf;hb=a0b490bbe7a87b54de49f075c59befa8232b2237;hp=6fbb47401bfc2c40867b61e3a3008671ca537c1a;hpb=6f680554ceb988f3895184167d5006d722a0afb3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
index 6fbb47401b..7aef246fcc 100644
--- a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
@@ -26,6 +26,17 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase {
 		$this->assertMetadata( $infile, $expected );
 	}
 
+	/**
+	 * @dataProvider provideSvgUnits
+	 */
+	public function testScaleSVGUnit( $inUnit, $expected ) {
+		$this->assertEquals(
+			$expected,
+			SVGReader::scaleSVGUnit( $inUnit ),
+			'SVG unit conversion and scaling failure'
+		);
+	}
+
 	function assertMetadata( $infile, $expected ) {
 		try {
 			$data = SVGMetadataExtractor::getMetadata( $infile );
@@ -123,6 +134,16 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase {
 					'translations' => []
 				],
 			],
+			[
+				"$base/comma_separated_viewbox.svg",
+				[
+					'width' => 512,
+					'height' => 594,
+					'originalWidth' => '100%',
+					'originalHeight' => '100%',
+					'translations' => []
+				],
+			],
 		];
 	}
 
@@ -152,4 +173,34 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase {
 			],
 		];
 	}
+
+	public static function provideSvgUnits() {
+		return [
+			[ '1' , 1 ],
+			[ '1.1' , 1.1 ],
+			[ '0.1' , 0.1 ],
+			[ '.1' , 0.1 ],
+			[ '1e2' , 100 ],
+			[ '1E2' , 100 ],
+			[ '+1' , 1 ],
+			[ '-1' , -1 ],
+			[ '-1.1' , -1.1 ],
+			[ '1e+2' , 100 ],
+			[ '1e-2' , 0.01 ],
+			[ '10px' , 10 ],
+			[ '10pt' , 10 * 1.25 ],
+			[ '10pc' , 10 * 15 ],
+			[ '10mm' , 10 * 3.543307 ],
+			[ '10cm' , 10 * 35.43307 ],
+			[ '10in' , 10 * 90 ],
+			[ '10em' , 10 * 16 ],
+			[ '10ex' , 10 * 12 ],
+			[ '10%' , 51.2 ],
+			[ '10 px' , 10 ],
+			// Invalid values
+			[ '1e1.1', 10 ],
+			[ '10bp', 10 ],
+			[ 'p10', null ],
+		];
+	}
 }