1 files changed, 19 insertions, 4 deletions
diff --git a/tests/phpunit/includes/media/JpegMetadataExtractorTest.php b/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
index 41d81190..eafc8a2e 100644
--- a/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
@@ -5,10 +5,15 @@
  * serve as a very good "test". (Adobe photoshop probably creates such files
  * but it costs money). The implementation of it currently in MediaWiki is based
  * solely on reading the standard, without any real world test files.
+ * @todo covers tags
  */
 class JpegMetadataExtractorTest extends MediaWikiTestCase {
 
-	public function setUp() {
+	protected $filePath;
+
+	protected function setUp() {
+		parent::setUp();
+
 		$this->filePath = __DIR__ . '/../../data/media/';
 	}
 
@@ -16,26 +21,29 @@ class JpegMetadataExtractorTest extends MediaWikiTestCase {
 	 * We also use this test to test padding bytes don't
 	 * screw stuff up
 	 *
-	 * @param $file filename
+	 * @param string $file filename
 	 *
-	 * @dataProvider dataUtf8Comment
+	 * @dataProvider provideUtf8Comment
 	 */
 	public function testUtf8Comment( $file ) {
 		$res = JpegMetadataExtractor::segmentSplitter( $this->filePath . $file );
 		$this->assertEquals( array( 'UTF-8 JPEG Comment — ¼' ), $res['COM'] );
 	}
-	public function dataUtf8Comment() {
+
+	public static function provideUtf8Comment() {
 		return array(
 			array( 'jpeg-comment-utf.jpg' ),
 			array( 'jpeg-padding-even.jpg' ),
 			array( 'jpeg-padding-odd.jpg' ),
 		);
 	}
+
 	/** The file is iso-8859-1, but it should get auto converted */
 	public function testIso88591Comment() {
 		$res = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-comment-iso8859-1.jpg' );
 		$this->assertEquals( array( 'ISO-8859-1 JPEG Comment - ¼' ), $res['COM'] );
 	}
+
 	/** Comment values that are non-textual (random binary junk) should not be shown.
 	 * The example test file has a comment with a 0x5 byte in it which is a control character
 	 * and considered binary junk for our purposes.
@@ -44,6 +52,7 @@ class JpegMetadataExtractorTest extends MediaWikiTestCase {
 		$res = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-comment-binary.jpg' );
 		$this->assertEmpty( $res['COM'] );
 	}
+
 	/* Very rarely a file can have multiple comments.
 	 *   Order of comments is based on order inside the file.
 	 */
@@ -51,16 +60,19 @@ class JpegMetadataExtractorTest extends MediaWikiTestCase {
 		$res = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-comment-multiple.jpg' );
 		$this->assertEquals( array( 'foo', 'bar' ), $res['COM'] );
 	}
+
 	public function testXMPExtraction() {
 		$res = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-xmp-psir.jpg' );
 		$expected = file_get_contents( $this->filePath . 'jpeg-xmp-psir.xmp' );
 		$this->assertEquals( $expected, $res['XMP'] );
 	}
+
 	public function testPSIRExtraction() {
 		$res = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-xmp-psir.jpg' );
 		$expected = '50686f746f73686f7020332e30003842494d04040000000000181c02190004746573741c02190003666f6f1c020000020004';
 		$this->assertEquals( $expected, bin2hex( $res['PSIR'][0] ) );
 	}
+
 	public function testXMPExtractionAltAppId() {
 		$res = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-xmp-alt.jpg' );
 		$expected = file_get_contents( $this->filePath . 'jpeg-xmp-psir.xmp' );
@@ -74,18 +86,21 @@ class JpegMetadataExtractorTest extends MediaWikiTestCase {
 
 		$this->assertEquals( 'iptc-no-hash', $res );
 	}
+
 	public function testIPTCHashComparisionBadHash() {
 		$segments = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-iptc-bad-hash.jpg' );
 		$res = JpegMetadataExtractor::doPSIR( $segments['PSIR'][0] );
 
 		$this->assertEquals( 'iptc-bad-hash', $res );
 	}
+
 	public function testIPTCHashComparisionGoodHash() {
 		$segments = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-iptc-good-hash.jpg' );
 		$res = JpegMetadataExtractor::doPSIR( $segments['PSIR'][0] );
 
 		$this->assertEquals( 'iptc-good-hash', $res );
 	}
+
 	public function testExifByteOrder() {
 		$res = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'exif-user-comment.jpg' );
 		$expected = 'BE';