1 files changed, 36 insertions, 14 deletions

diff --git a/tests/phpunit/includes/media/GIFTest.php b/tests/phpunit/includes/media/GIFTest.php
index 5dcbeee0..c8e729c8 100644
--- a/tests/phpunit/includes/media/GIFTest.php
+++ b/tests/phpunit/includes/media/GIFTest.php
@@ -1,36 +1,53 @@
 <?php
 class GIFHandlerTest extends MediaWikiTestCase {
 
-	public function setUp() {
-		$this->filePath = __DIR__ .  '/../../data/media';
+	/** @var FSFileBackend */
+	protected $backend;
+	/** @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',
-			'lockManager'    => 'nullLockManager',
+			'name' => 'localtesting',
+			'lockManager' => 'nullLockManager',
 			'containerPaths' => array( 'data' => $this->filePath )
 		) );
 		$this->repo = new FSRepo( array(
-			'name'    => 'temp',
-			'url'     => 'http://localhost/thumbtest',
+			'name' => 'temp',
+			'url' => 'http://localhost/thumbtest',
 			'backend' => $this->backend
 		) );
 		$this->handler = new GIFHandler();
 	}
 
+	/**
+	 * @covers GIFHandler::getMetadata
+	 */
 	public function testInvalidFile() {
 		$res = $this->handler->getMetadata( null, $this->filePath . '/README' );
 		$this->assertEquals( GIFHandler::BROKEN_FILE, $res );
 	}
+
 	/**
 	 * @param $filename String basename of the file to check
 	 * @param $expected boolean Expected result.
-	 * @dataProvider dataIsAnimated
+	 * @dataProvider provideIsAnimated
+	 * @covers GIFHandler::isAnimatedImage
 	 */
 	public function testIsAnimanted( $filename, $expected ) {
 		$file = $this->dataFile( $filename, 'image/gif' );
 		$actual = $this->handler->isAnimatedImage( $file );
 		$this->assertEquals( $expected, $actual );
 	}
-	public function dataIsAnimated() {
+
+	public static function provideIsAnimated() {
 		return array(
 			array( 'animated.gif', true ),
 			array( 'nonanimated.gif', false ),
@@ -40,14 +57,16 @@ class GIFHandlerTest extends MediaWikiTestCase {
 	/**
 	 * @param $filename String
 	 * @param $expected Integer Total image area
-	 * @dataProvider dataGetImageArea
+	 * @dataProvider provideGetImageArea
+	 * @covers GIFHandler::getImageArea
 	 */
 	public function testGetImageArea( $filename, $expected ) {
 		$file = $this->dataFile( $filename, 'image/gif' );
 		$actual = $this->handler->getImageArea( $file, $file->getWidth(), $file->getHeight() );
 		$this->assertEquals( $expected, $actual );
 	}
-	public function dataGetImageArea() {
+
+	public static function provideGetImageArea() {
 		return array(
 			array( 'animated.gif', 5400 ),
 			array( 'nonanimated.gif', 1350 ),
@@ -57,13 +76,15 @@ class GIFHandlerTest extends MediaWikiTestCase {
 	/**
 	 * @param $metadata String Serialized metadata
 	 * @param $expected Integer One of the class constants of GIFHandler
-	 * @dataProvider dataIsMetadataValid
+	 * @dataProvider provideIsMetadataValid
+	 * @covers GIFHandler::isMetadataValid
 	 */
 	public function testIsMetadataValid( $metadata, $expected ) {
 		$actual = $this->handler->isMetadataValid( null, $metadata );
 		$this->assertEquals( $expected, $actual );
 	}
-	public function dataIsMetadataValid() {
+
+	public static function provideIsMetadataValid() {
 		return array(
 			array( GIFHandler::BROKEN_FILE, GIFHandler::METADATA_GOOD ),
 			array( '', GIFHandler::METADATA_BAD ),
@@ -76,7 +97,8 @@ class GIFHandlerTest extends MediaWikiTestCase {
 	/**
 	 * @param $filename String
 	 * @param $expected String Serialized array
-	 * @dataProvider dataGetMetadata
+	 * @dataProvider provideGetMetadata
+	 * @covers GIFHandler::getMetadata
 	 */
 	public function testGetMetadata( $filename, $expected ) {
 		$file = $this->dataFile( $filename, 'image/gif' );
@@ -84,7 +106,7 @@ class GIFHandlerTest extends MediaWikiTestCase {
 		$this->assertEquals( unserialize( $expected ), unserialize( $actual ) );
 	}
 
-	public function dataGetMetadata() {
+	public static function provideGetMetadata() {
 		return array(
 			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;}}' ),