Merge "Make FormatMetadata accept RequestContext, instead of hard coding $wgLang."

diff --combined tests/phpunit/includes/media/FormatMetadataTest.php
index a8e420f,88fe4d0..6ff928e
--- 1/tests/phpunit/includes/media/FormatMetadataTest.php
--- 2/tests/phpunit/includes/media/FormatMetadataTest.php
+++ b/tests/phpunit/includes/media/FormatMetadataTest.php
@@@ -1,12 -1,6 +1,12 @@@
  <?php
 +
  class FormatMetadataTest extends MediaWikiTestCase {
  
 +      /** @var FSFileBackend */
 +      protected $backend;
 +      /** @var FSRepo */
 +      protected $repo;
 +
        protected function setUp() {
                parent::setUp();
  
@@@ -28,9 -22,6 +28,9 @@@
                $this->setMwGlobals( 'wgShowEXIF', true );
        }
  
 +      /**
 +       * @covers File::formatMetadata
 +       */
        public function testInvalidDate() {
                $file = $this->dataFile( 'broken_exif_date.jpg', 'image/jpeg' );
  
@@@ -52,6 -43,39 +52,39 @@@
                        'File with invalid date metadata (bug 29471)' );
        }
  
+       /**
+        * @param $filename String
+        * @param $expected Integer 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
+               );
+       }
+ 
        private function dataFile( $name, $type ) {
                return new UnregisteredLocalFile( false, $this->repo,
                        "mwstore://localtesting/data/$name", $type );

diff --combined tests/phpunit/includes/media/GIFTest.php
index 6dbce7f,dd2b58b..4350cbb
--- 1/tests/phpunit/includes/media/GIFTest.php
--- 2/tests/phpunit/includes/media/GIFTest.php
+++ b/tests/phpunit/includes/media/GIFTest.php
@@@ -1,15 -1,6 +1,15 @@@
  <?php
  class GIFHandlerTest extends MediaWikiTestCase {
  
 +      /** @var FSFileBackend */
 +      protected $backend;
 +      /** @var GIFHandler */
 +      protected $handler;
 +      /** @var FSRepo */
 +      protected $repo;
 +      /** @var string */
 +      protected $filePath;
 +
        protected function setUp() {
                parent::setUp();
  
@@@ -27,9 -18,6 +27,9 @@@
                $this->handler = new GIFHandler();
        }
  
 +      /**
 +       * @covers GIFHandler::getMetadata
 +       */
        public function testInvalidFile() {
                $res = $this->handler->getMetadata( null, $this->filePath . '/README' );
                $this->assertEquals( GIFHandler::BROKEN_FILE, $res );
@@@ -39,7 -27,6 +39,7 @@@
         * @param $filename String basename of the file to check
         * @param $expected boolean Expected result.
         * @dataProvider provideIsAnimated
 +       * @covers GIFHandler::isAnimatedImage
         */
        public function testIsAnimanted( $filename, $expected ) {
                $file = $this->dataFile( $filename, 'image/gif' );
@@@ -58,7 -45,6 +58,7 @@@
         * @param $filename String
         * @param $expected Integer Total image area
         * @dataProvider provideGetImageArea
 +       * @covers GIFHandler::getImageArea
         */
        public function testGetImageArea( $filename, $expected ) {
                $file = $this->dataFile( $filename, 'image/gif' );
@@@ -77,7 -63,6 +77,7 @@@
         * @param $metadata String Serialized metadata
         * @param $expected Integer One of the class constants of GIFHandler
         * @dataProvider provideIsMetadataValid
 +       * @covers GIFHandler::isMetadataValid
         */
        public function testIsMetadataValid( $metadata, $expected ) {
                $actual = $this->handler->isMetadataValid( null, $metadata );
@@@ -98,7 -83,6 +98,7 @@@
         * @param $filename String
         * @param $expected String Serialized array
         * @dataProvider provideGetMetadata
 +       * @covers GIFHandler::getMetadata
         */
        public function testGetMetadata( $filename, $expected ) {
                $file = $this->dataFile( $filename, 'image/gif' );
@@@ -117,6 -101,7 +117,7 @@@
         * @param $filename String
         * @param $expected String Serialized array
         * @dataProvider provideGetIndependentMetaArray
+        * @covers GIFHandler::getCommonMetaArray
         */
        public function testGetIndependentMetaArray( $filename, $expected ) {
                $file = $this->dataFile( $filename, 'image/gif' );

diff --combined tests/phpunit/includes/media/JpegTest.php
index 277b3d2,3b30798..5157228
--- 1/tests/phpunit/includes/media/JpegTest.php
--- 2/tests/phpunit/includes/media/JpegTest.php
+++ b/tests/phpunit/includes/media/JpegTest.php
@@@ -1,11 -1,6 +1,11 @@@
  <?php
 +/**
 + * @covers JpegHandler
 + */
  class JpegTest extends MediaWikiTestCase {
  
 +      protected $filePath;
 +
        protected function setUp() {
                parent::setUp();
                if ( !extension_loaded( 'exif' ) ) {
@@@ -45,6 -40,10 +45,10 @@@
                // Unserialize in case serialization format ever changes.
                $this->assertEquals( unserialize( $expected ), unserialize( $res ) );
        }
+ 
+       /**
+        * @covers JpegHandler::getCommonMetaArray
+        */
        public function testGetIndependentMetaArray() {
                $file = $this->dataFile( 'test.jpg', 'image/jpeg' );
                $res = $this->handler->getCommonMetaArray( $file );

diff --combined tests/phpunit/includes/media/PNGTest.php
index 91f09de,7766a50..2cb7426
--- 1/tests/phpunit/includes/media/PNGTest.php
--- 2/tests/phpunit/includes/media/PNGTest.php
+++ b/tests/phpunit/includes/media/PNGTest.php
@@@ -1,15 -1,6 +1,15 @@@
  <?php
  class PNGHandlerTest extends MediaWikiTestCase {
  
 +      /** @var PNGHandler */
 +      protected $handler;
 +      /** @var FSRepo */
 +      protected $repo;
 +      /** @var FSFileBackend */
 +      protected $backend;
 +      /** @var string */
 +      protected $filePath;
 +
        protected function setUp() {
                parent::setUp();
  
@@@ -27,9 -18,6 +27,9 @@@
                $this->handler = new PNGHandler();
        }
  
 +      /**
 +       * @covers PNGHandler::getMetadata
 +       */
        public function testInvalidFile() {
                $res = $this->handler->getMetadata( null, $this->filePath . '/README' );
                $this->assertEquals( PNGHandler::BROKEN_FILE, $res );
@@@ -39,7 -27,6 +39,7 @@@
         * @param $filename String basename of the file to check
         * @param $expected boolean Expected result.
         * @dataProvider provideIsAnimated
 +       * @covers PNGHandler::isAnimatedImage
         */
        public function testIsAnimanted( $filename, $expected ) {
                $file = $this->dataFile( $filename, 'image/png' );
@@@ -58,7 -45,6 +58,7 @@@
         * @param $filename String
         * @param $expected Integer Total image area
         * @dataProvider provideGetImageArea
 +       * @covers PNGHandler::getImageArea
         */
        public function testGetImageArea( $filename, $expected ) {
                $file = $this->dataFile( $filename, 'image/png' );
@@@ -79,7 -65,6 +79,7 @@@
         * @param $metadata String Serialized metadata
         * @param $expected Integer One of the class constants of PNGHandler
         * @dataProvider provideIsMetadataValid
 +       * @covers PNGHandler::isMetadataValid
         */
        public function testIsMetadataValid( $metadata, $expected ) {
                $actual = $this->handler->isMetadataValid( null, $metadata );
@@@ -100,7 -85,6 +100,7 @@@
         * @param $filename String
         * @param $expected String Serialized array
         * @dataProvider provideGetMetadata
 +       * @covers PNGHandler::getMetadata
         */
        public function testGetMetadata( $filename, $expected ) {
                $file = $this->dataFile( $filename, 'image/png' );
@@@ -120,6 -104,7 +120,7 @@@
         * @param $filename String
         * @param $expected Array Expected standard metadata
         * @dataProvider provideGetIndependentMetaArray
+        * @covers PNGHandler::getCommonMetaArray
         */
        public function testGetIndependentMetaArray( $filename, $expected ) {
                $file = $this->dataFile( $filename, 'image/png' );