X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fupload%2FUploadBaseTest.php;h=6be272fb617d2bf29f95b88d8160e8f3077c7797;hb=69ae945e8d39972a07bea89ddb64bc0189b43ac2;hp=d81ddd38828fb2df6ff83fc8519b8272f7a5ddb0;hpb=202f695f671bb1b6c25ebec219da348e9935692e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/upload/UploadBaseTest.php b/tests/phpunit/includes/upload/UploadBaseTest.php
index d81ddd3882..6be272fb61 100644
--- a/tests/phpunit/includes/upload/UploadBaseTest.php
+++ b/tests/phpunit/includes/upload/UploadBaseTest.php
@@ -397,6 +397,46 @@ class UploadBaseTest extends MediaWikiTestCase {
 		// @codingStandardsIgnoreEnd
 	}
 
+	/**
+	 * @dataProvider provideDetectScriptInSvg
+	 */
+	public function testDetectScriptInSvg( $svg, $expected, $message ) {
+		// This only checks some weird cases, most tests are in testCheckSvgScriptCallback() above
+		$result = $this->upload->detectScriptInSvg( $svg, false );
+		$this->assertSame( $expected, $result, $message );
+	}
+
+	public static function provideDetectScriptInSvg() {
+		global $IP;
+		return [
+			[
+				"$IP/tests/phpunit/data/upload/buggynamespace-original.svg",
+				false,
+				'SVG with a weird but valid namespace definition created by Adobe Illustrator'
+			],
+			[
+				"$IP/tests/phpunit/data/upload/buggynamespace-okay.svg",
+				false,
+				'SVG with a namespace definition created by Adobe Illustrator and mangled by Inkscape'
+			],
+			[
+				"$IP/tests/phpunit/data/upload/buggynamespace-okay2.svg",
+				false,
+				'SVG with a namespace definition created by Adobe Illustrator and mangled by Inkscape (twice)'
+			],
+			[
+				"$IP/tests/phpunit/data/upload/buggynamespace-bad.svg",
+				[ 'uploadscriptednamespace', 'i' ],
+				'SVG with a namespace definition using an undefined entity'
+			],
+			[
+				"$IP/tests/phpunit/data/upload/buggynamespace-evilhtml.svg",
+				[ 'uploadscriptednamespace', 'http://www.w3.org/1999/xhtml' ],
+				'SVG with an html namespace encoded as an entity'
+			],
+		];
+	}
+
 	/**
 	 * @dataProvider provideCheckXMLEncodingMissmatch
 	 */
@@ -442,4 +482,11 @@ class UploadTestHandler extends UploadBase {
 		);
 		return [ $check->wellFormed, $check->filterMatch ];
 	}
+
+	/**
+	 * Same as parent function, but override visibility to 'public'.
+	 */
+	public function detectScriptInSvg( $filename, $partial ) {
+		return parent::detectScriptInSvg( $filename, $partial );
+	}
 }