X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FHtmlTest.php;h=1c62d0324af4a8a7a4004eae9724d7811e51fb11;hb=de7af7ac2c651d747221dd322fa9e40956681cb9;hp=4e010d42a3efb830063b0ad39dfee5e67a4688df;hpb=3222fabc4e7a9082181b39d32d641c3f0cdac5eb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php
index 4e010d42a3..1c62d0324a 100644
--- a/tests/phpunit/includes/HtmlTest.php
+++ b/tests/phpunit/includes/HtmlTest.php
@@ -37,7 +37,6 @@ class HtmlTest extends MediaWikiTestCase {
 			'wgLanguageCode' => $langCode,
 			'wgContLang' => $langObj,
 			'wgLang' => $langObj,
-			'wgHtml5' => true,
 			'wgWellFormedXml' => false,
 		) );
 	}
@@ -70,6 +69,31 @@ class HtmlTest extends MediaWikiTestCase {
 		);
 	}
 
+	public function dataXmlMimeType() {
+		return array(
+			// ( $mimetype, $isXmlMimeType )
+			# HTML is not an XML MimeType
+			array( 'text/html', false ),
+			# XML is an XML MimeType
+			array( 'text/xml', true ),
+			array( 'application/xml', true ),
+			# XHTML is an XML MimeType
+			array( 'application/xhtml+xml', true ),
+			# Make sure other +xml MimeTypes are supported
+			# SVG is another random MimeType even though we don't use it
+			array( 'image/svg+xml', true ),
+			# Complete random other MimeTypes are not XML
+			array( 'text/plain', false ),
+		);
+	}
+
+	/**
+	 * @dataProvider dataXmlMimeType
+	 */
+	public function testXmlMimeType( $mimetype, $isXmlMimeType ) {
+		$this->assertEquals( $isXmlMimeType, Html::isXmlMimeType( $mimetype ) );
+	}
+
 	public function testExpandAttributesSkipsNullAndFalse() {
 
 		### EMPTY ########
@@ -117,14 +141,6 @@ class HtmlTest extends MediaWikiTestCase {
 			Html::expandAttributes( array( 'selected' => true ) ),
 			'Boolean attributes have empty string value when value is true (wgWellFormedXml)'
 		);
-
-		$this->setMwGlobals( 'wgHtml5', false );
-
-		$this->assertEquals(
-			' selected="selected"',
-			Html::expandAttributes( array( 'selected' => true ) ),
-			'Boolean attributes have their key as value when value is true (wgWellFormedXml, wgHTML5 = false)'
-		);
 	}
 
 	/**
@@ -234,7 +250,7 @@ class HtmlTest extends MediaWikiTestCase {
 	 * Test feature added by r96188, let pass attributes values as
 	 * a PHP array. Restricted to class,rel, accesskey.
 	 */
-	function testExpandAttributesSpaceSeparatedAttributesWithBoolean() {
+	public function testExpandAttributesSpaceSeparatedAttributesWithBoolean() {
 		$this->assertEquals(
 			' class="booltrue one"',
 			Html::expandAttributes( array( 'class' => array(
@@ -258,7 +274,7 @@ class HtmlTest extends MediaWikiTestCase {
 	 *
 	 * Feature added by r96188
 	 */
-	function testValueIsAuthoritativeInSpaceSeparatedAttributesArrays() {
+	public function testValueIsAuthoritativeInSpaceSeparatedAttributesArrays() {
 		$this->assertEquals(
 			' class=""',
 			Html::expandAttributes( array( 'class' => array(
@@ -269,7 +285,7 @@ class HtmlTest extends MediaWikiTestCase {
 		);
 	}
 
-	function testNamespaceSelector() {
+	public function testNamespaceSelector() {
 		$this->assertEquals(
 			'<select id=namespace name=namespace>' . "\n" .
 				'<option value=0>(Main)</option>' . "\n" .
@@ -348,7 +364,7 @@ class HtmlTest extends MediaWikiTestCase {
 		);
 	}
 
-	function testCanFilterOutNamespaces() {
+	public function testCanFilterOutNamespaces() {
 		$this->assertEquals(
 			'<select id=namespace name=namespace>' . "\n" .
 				'<option value=2>User</option>' . "\n" .
@@ -370,7 +386,7 @@ class HtmlTest extends MediaWikiTestCase {
 		);
 	}
 
-	function testCanDisableANamespaces() {
+	public function testCanDisableANamespaces() {
 		$this->assertEquals(
 			'<select id=namespace name=namespace>' . "\n" .
 				'<option disabled value=0>(Main)</option>' . "\n" .
@@ -400,7 +416,7 @@ class HtmlTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideHtml5InputTypes
 	 */
-	function testHtmlElementAcceptsNewHtml5TypesInHtml5Mode( $HTML5InputType ) {
+	public function testHtmlElementAcceptsNewHtml5TypesInHtml5Mode( $HTML5InputType ) {
 		$this->assertEquals(
 			'<input type=' . $HTML5InputType . '>',
 			Html::element( 'input', array( 'type' => $HTML5InputType ) ),
@@ -441,7 +457,7 @@ class HtmlTest extends MediaWikiTestCase {
 	 * @covers Html::dropDefaults
 	 * @dataProvider provideElementsWithAttributesHavingDefaultValues
 	 */
-	function testDropDefaults( $expected, $element, $attribs, $message = '' ) {
+	public function testDropDefaults( $expected, $element, $attribs, $message = '' ) {
 		$this->assertEquals( $expected, Html::element( $element, $attribs ), $message );
 	}