From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 17 Dec 2015 09:15:42 +0100
Subject: Update to MediaWiki 1.26.0

---
 .../phpunit/includes/media/FormatMetadataTest.php  | 33 ----------------------
 1 file changed, 33 deletions(-)

(limited to 'tests/phpunit/includes/media/FormatMetadataTest.php')

diff --git a/tests/phpunit/includes/media/FormatMetadataTest.php b/tests/phpunit/includes/media/FormatMetadataTest.php
index 54758f94..b666c83c 100644
--- a/tests/phpunit/includes/media/FormatMetadataTest.php
+++ b/tests/phpunit/includes/media/FormatMetadataTest.php
@@ -36,39 +36,6 @@ class FormatMetadataTest extends MediaWikiMediaTestCase {
 			'File with invalid date metadata (bug 29471)' );
 	}
 
-	/**
-	 * @param string $filename
-	 * @param int $expected Total image area
-	 * @dataProvider provideFlattenArray
-	 * @covers FormatMetadata::flattenArray
-	 */
-	public function testFlattenArray( $vals, $type, $noHtml, $ctx, $expected ) {
-		$actual = FormatMetadata::flattenArray( $vals, $type, $noHtml, $ctx );
-		$this->assertEquals( $expected, $actual );
-	}
-
-	public static function provideFlattenArray() {
-		return array(
-			array(
-				array( 1, 2, 3 ), 'ul', false, false,
-				"<ul><li>1</li>\n<li>2</li>\n<li>3</li></ul>",
-			),
-			array(
-				array( 1, 2, 3 ), 'ol', false, false,
-				"<ol><li>1</li>\n<li>2</li>\n<li>3</li></ol>",
-			),
-			array(
-				array( 1, 2, 3 ), 'ul', true, false,
-				"\n*1\n*2\n*3",
-			),
-			array(
-				array( 1, 2, 3 ), 'ol', true, false,
-				"\n#1\n#2\n#3",
-			),
-			// TODO: more test cases
-		);
-	}
-
 	/**
 	 * @param mixed $input
 	 * @param mixed $output
-- 
cgit v1.2.3-54-g00ecf