Merge "Breaking out disallowed CSS into a global variable"

[lhc/web/wiklou.git] / tests / phpunit / includes / media / GIFTest.php

diff --git a/tests/phpunit/includes/media/GIFTest.php b/tests/phpunit/includes/media/GIFTest.php
index 7bd04b7..52a51cc 100644 (file)
--- a/tests/phpunit/includes/media/GIFTest.php
+++ b/tests/phpunit/includes/media/GIFTest.php
@@ -1,29 +1,16 @@
 <?php
-class GIFHandlerTest extends MediaWikiTestCase {
 
-       /** @var FSFileBackend */
-       protected $backend;
+/**
+ * @group Media
+ */
+class GIFHandlerTest extends MediaWikiMediaTestCase {
+
        /** @var GIFHandler */
        protected $handler;
-       /** @var FSRepo */
-       protected $repo;
-       /** @var string */
-       protected $filePath;
 
        protected function setUp() {
                parent::setUp();
 
-               $this->filePath = __DIR__ . '/../../data/media';
-               $this->backend = new FSFileBackend( array(
-                       'name' => 'localtesting',
-                       'wikiId' => wfWikiId(),
-                       'containerPaths' => array( 'data' => $this->filePath )
-               ) );
-               $this->repo = new FSRepo( array(
-                       'name' => 'temp',
-                       'url' => 'http://localhost/thumbtest',
-                       'backend' => $this->backend
-               ) );
                $this->handler = new GIFHandler();
        }
 
@@ -36,8 +23,8 @@ class GIFHandlerTest extends MediaWikiTestCase {
        }
 
        /**
-        * @param $filename String basename of the file to check
-        * @param $expected boolean Expected result.
+        * @param string $filename Basename of the file to check
+        * @param bool $expected Expected result.
         * @dataProvider provideIsAnimated
         * @covers GIFHandler::isAnimatedImage
         */
@@ -55,8 +42,8 @@ class GIFHandlerTest extends MediaWikiTestCase {
        }
 
        /**
-        * @param $filename String
-        * @param $expected Integer Total image area
+        * @param string $filename
+        * @param int $expected Total image area
         * @dataProvider provideGetImageArea
         * @covers GIFHandler::getImageArea
         */
@@ -74,8 +61,8 @@ class GIFHandlerTest extends MediaWikiTestCase {
        }
 
        /**
-        * @param $metadata String Serialized metadata
-        * @param $expected Integer One of the class constants of GIFHandler
+        * @param string $metadata Serialized metadata
+        * @param int $expected One of the class constants of GIFHandler
         * @dataProvider provideIsMetadataValid
         * @covers GIFHandler::isMetadataValid
         */
@@ -90,13 +77,15 @@ class GIFHandlerTest extends MediaWikiTestCase {
                        array( '', GIFHandler::METADATA_BAD ),
                        array( null, GIFHandler::METADATA_BAD ),
                        array( 'Something invalid!', GIFHandler::METADATA_BAD ),
+                       // @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
                        array( 'a:4:{s:10:"frameCount";i:1;s:6:"looped";b:0;s:8:"duration";d:0.1000000000000000055511151231257827021181583404541015625;s:8:"metadata";a:2:{s:14:"GIFFileComment";a:1:{i:0;s:35:"GIF test file ⁕ Created with GIMP";}s:15:"_MW_GIF_VERSION";i:1;}}', GIFHandler::METADATA_GOOD ),
+                       // @codingStandardsIgnoreEnd
                );
        }
 
        /**
-        * @param $filename String
-        * @param $expected String Serialized array
+        * @param string $filename
+        * @param string $expected Serialized array
         * @dataProvider provideGetMetadata
         * @covers GIFHandler::getMetadata
         */
@@ -108,14 +97,16 @@ class GIFHandlerTest extends MediaWikiTestCase {
 
        public static function provideGetMetadata() {
                return array(
+                       // @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
                        array( 'nonanimated.gif', 'a:4:{s:10:"frameCount";i:1;s:6:"looped";b:0;s:8:"duration";d:0.1000000000000000055511151231257827021181583404541015625;s:8:"metadata";a:2:{s:14:"GIFFileComment";a:1:{i:0;s:35:"GIF test file ⁕ Created with GIMP";}s:15:"_MW_GIF_VERSION";i:1;}}' ),
                        array( 'animated-xmp.gif', 'a:4:{s:10:"frameCount";i:4;s:6:"looped";b:1;s:8:"duration";d:2.399999999999999911182158029987476766109466552734375;s:8:"metadata";a:5:{s:6:"Artist";s:7:"Bawolff";s:16:"ImageDescription";a:2:{s:9:"x-default";s:18:"A file to test GIF";s:5:"_type";s:4:"lang";}s:15:"SublocationDest";s:13:"The interwebs";s:14:"GIFFileComment";a:1:{i:0;s:16:"GIƒ·test·file";}s:15:"_MW_GIF_VERSION";i:1;}}' ),
+                       // @codingStandardsIgnoreEnd
                );
        }
 
        /**
-        * @param $filename String
-        * @param $expected String Serialized array
+        * @param string $filename
+        * @param string $expected Serialized array
         * @dataProvider provideGetIndependentMetaArray
         * @covers GIFHandler::getCommonMetaArray
         */
@@ -148,9 +139,4 @@ class GIFHandlerTest extends MediaWikiTestCase {
                        ),
                );
        }
-
-       private function dataFile( $name, $type ) {
-               return new UnregisteredLocalFile( false, $this->repo,
-                       "mwstore://localtesting/data/$name", $type );
-       }
 }