X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Flibs%2FJavaScriptMinifierTest.php;h=12b2c04ab6a93586878314ad30dfcdb8c32ea909;hb=a620ccb99ce905d8d8afd51fce2bdb7647cad958;hp=3787962affd7ddcb30ce537b6fc76d5567c65444;hpb=bdfe02223205923d923923dd420ba0dd863cd0fe;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
index 3787962aff..12b2c04ab6 100644
--- a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
+++ b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
@@ -10,7 +10,7 @@ class JavaScriptMinifierTest extends PHPUnit_Framework_TestCase {
 			[ "/* Foo *\n*bar\n*/", "" ],
 
 			/**
-			 * Slashes used inside block comments (bug 26931).
+			 * Slashes used inside block comments (T28931).
 			 * At some point there was a bug that caused this comment to be ended at '* /',
 			 * causing /M... to be left as the beginning of a regex.
 			 */
@@ -59,8 +59,22 @@ class JavaScriptMinifierTest extends PHPUnit_Framework_TestCase {
 			[ "0xFF.\nx;", "0xFF.x;" ],
 			[ "5.3.\nx;", "5.3.x;" ],
 
+			// Cover failure case for incomplete hex literal
+			[ "0x;", false, false ],
+
+			// Cover failure case for number with no digits after E
+			[ "1.4E", false, false ],
+
+			// Cover failure case for number with several E
+			[ "1.4EE2", false, false ],
+			[ "1.4EE", false, false ],
+
+			// Cover failure case for number with several E (nonconsecutive)
+			// FIXME: This is invalid, but currently tolerated
+			[ "1.4E2E3", "1.4E2 E3", false ],
+
 			// Semicolon insertion between an expression having an inline
-			// comment after it, and a statement on the next line (bug 27046).
+			// comment after it, and a statement on the next line (T29046).
 			[
 				"var a = this //foo bar \n for ( b = 0; c < d; b++ ) {}",
 				"var a=this\nfor(b=0;c<d;b++){}"
@@ -127,7 +141,7 @@ class JavaScriptMinifierTest extends PHPUnit_Framework_TestCase {
 			// newline insertion after 1000 chars: break after the "++", not before
 			[ str_repeat( ';', 996 ) . "if(x++);", str_repeat( ';', 996 ) . "if(x++\n);" ],
 
-			// Unicode letter characters should pass through ok in identifiers (bug 31187)
+			// Unicode letter characters should pass through ok in identifiers (T33187)
 			[ "var KaŝSkatolVal = {}", 'var KaŝSkatolVal={}' ],
 
 			// Per spec unicode char escape values should work in identifiers,
@@ -138,6 +152,7 @@ class JavaScriptMinifierTest extends PHPUnit_Framework_TestCase {
 			[ "var a = 5.;", "var a=5.;" ],
 			[ "5.0.toString();", "5.0.toString();" ],
 			[ "5..toString();", "5..toString();" ],
+			// Cover failure case for too many decimal points
 			[ "5...toString();", false ],
 			[ "5.\n.toString();", '5..toString();' ],
 
@@ -153,8 +168,9 @@ class JavaScriptMinifierTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * @dataProvider provideCases
 	 * @covers JavaScriptMinifier::minify
+	 * @covers JavaScriptMinifier::parseError
 	 */
-	public function testJavaScriptMinifierOutput( $code, $expectedOutput, $expectedValid = true ) {
+	public function testMinifyOutput( $code, $expectedOutput, $expectedValid = true ) {
 		$minified = JavaScriptMinifier::minify( $code );
 
 		// JSMin+'s parser will throw an exception if output is not valid JS.