From f718e7710aa34dd88670e14203e00dc24cf6f1d3 Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem.wiki@gmail.com>
Date: Tue, 15 Jul 2014 10:31:07 -0700
Subject: [PATCH] Small tweaks to media handler tests

* Whack @group Media everywhere
* If testing access to a nonexistent file, make it obvious from its name
* Grammar

Change-Id: I845b484b78b3eb1e5a97f339777d3b7c9ee17712
---
 tests/phpunit/includes/media/BitmapMetadataHandlerTest.php | 4 ++++
 tests/phpunit/includes/media/BitmapScalingTest.php         | 3 +++
 tests/phpunit/includes/media/DjVuTest.php                  | 5 +++--
 tests/phpunit/includes/media/ExifBitmapTest.php            | 3 +++
 tests/phpunit/includes/media/ExifRotationTest.php          | 1 +
 tests/phpunit/includes/media/ExifTest.php                  | 1 +
 tests/phpunit/includes/media/FakeDimensionFile.php         | 3 +++
 tests/phpunit/includes/media/FormatMetadataTest.php        | 3 +++
 tests/phpunit/includes/media/GIFMetadataExtractorTest.php  | 4 ++++
 tests/phpunit/includes/media/GIFTest.php                   | 4 ++++
 tests/phpunit/includes/media/IPTCTest.php                  | 3 +++
 tests/phpunit/includes/media/JpegMetadataExtractorTest.php | 1 +
 tests/phpunit/includes/media/JpegTest.php                  | 2 ++
 tests/phpunit/includes/media/MediaHandlerTest.php          | 3 +++
 tests/phpunit/includes/media/PNGMetadataExtractorTest.php  | 1 +
 tests/phpunit/includes/media/PNGTest.php                   | 4 ++++
 tests/phpunit/includes/media/SVGMetadataExtractorTest.php  | 1 +
 tests/phpunit/includes/media/SVGTest.php                   | 3 +++
 tests/phpunit/includes/media/TiffTest.php                  | 4 ++++
 tests/phpunit/includes/media/XCFTest.php                   | 4 ++++
 tests/phpunit/includes/media/XMPTest.php                   | 3 ++-
 tests/phpunit/includes/media/XMPValidateTest.php           | 4 ++++
 22 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
index 8402522a66..c720d7b782 100644
--- a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
+++ b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @group Media
+ */
 class BitmapMetadataHandlerTest extends MediaWikiTestCase {
 
 	protected function setUp() {
diff --git a/tests/phpunit/includes/media/BitmapScalingTest.php b/tests/phpunit/includes/media/BitmapScalingTest.php
index 9395b66071..1972c96943 100644
--- a/tests/phpunit/includes/media/BitmapScalingTest.php
+++ b/tests/phpunit/includes/media/BitmapScalingTest.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @group Media
+ */
 class BitmapScalingTest extends MediaWikiTestCase {
 
 	protected function setUp() {
diff --git a/tests/phpunit/includes/media/DjVuTest.php b/tests/phpunit/includes/media/DjVuTest.php
index 76cefe5537..d779207ec7 100644
--- a/tests/phpunit/includes/media/DjVuTest.php
+++ b/tests/phpunit/includes/media/DjVuTest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @group Media
  * @covers DjVuHandler
  */
 class DjVuTest extends MediaWikiMediaTestCase {
@@ -34,8 +35,8 @@ class DjVuTest extends MediaWikiMediaTestCase {
 	public function testInvalidFile() {
 		$this->assertEquals(
 			'a:1:{s:5:"error";s:25:"Error extracting metadata";}',
-			$this->handler->getMetadata( null, $this->filePath . '/README' ),
-			'Getting Metadata for an inexistent file should returns false'
+			$this->handler->getMetadata( null, $this->filePath . '/some-nonexistent-file' ),
+			'Getting metadata for an inexistent file should return false'
 		);
 	}
 
diff --git a/tests/phpunit/includes/media/ExifBitmapTest.php b/tests/phpunit/includes/media/ExifBitmapTest.php
index 44b20702bf..41330f4182 100644
--- a/tests/phpunit/includes/media/ExifBitmapTest.php
+++ b/tests/phpunit/includes/media/ExifBitmapTest.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @group Media
+ */
 class ExifBitmapTest extends MediaWikiTestCase {
 
 	/**
diff --git a/tests/phpunit/includes/media/ExifRotationTest.php b/tests/phpunit/includes/media/ExifRotationTest.php
index 6a1e422651..247e352c65 100644
--- a/tests/phpunit/includes/media/ExifRotationTest.php
+++ b/tests/phpunit/includes/media/ExifRotationTest.php
@@ -2,6 +2,7 @@
 /**
  * Tests related to auto rotation.
  *
+ * @group Media
  * @group medium
  *
  * @todo covers tags
diff --git a/tests/phpunit/includes/media/ExifTest.php b/tests/phpunit/includes/media/ExifTest.php
index 735663cf92..f3c05fb1be 100644
--- a/tests/phpunit/includes/media/ExifTest.php
+++ b/tests/phpunit/includes/media/ExifTest.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @group Media
  * @covers Exif
  */
 class ExifTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/media/FakeDimensionFile.php b/tests/phpunit/includes/media/FakeDimensionFile.php
index 7bc785e690..4b8f213eaa 100644
--- a/tests/phpunit/includes/media/FakeDimensionFile.php
+++ b/tests/phpunit/includes/media/FakeDimensionFile.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @group Media
+ */
 class FakeDimensionFile extends File {
 	public $mustRender = false;
 
diff --git a/tests/phpunit/includes/media/FormatMetadataTest.php b/tests/phpunit/includes/media/FormatMetadataTest.php
index daaefc06fd..002e2cb987 100644
--- a/tests/phpunit/includes/media/FormatMetadataTest.php
+++ b/tests/phpunit/includes/media/FormatMetadataTest.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @group Media
+ */
 class FormatMetadataTest extends MediaWikiMediaTestCase {
 
 	protected function setUp() {
diff --git a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php b/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
index 3491112ed8..6aecd8b135 100644
--- a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @group Media
+ */
 class GIFMetadataExtractorTest extends MediaWikiTestCase {
 
 	protected function setUp() {
diff --git a/tests/phpunit/includes/media/GIFTest.php b/tests/phpunit/includes/media/GIFTest.php
index 17b296415e..52a51cc6dc 100644
--- a/tests/phpunit/includes/media/GIFTest.php
+++ b/tests/phpunit/includes/media/GIFTest.php
@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @group Media
+ */
 class GIFHandlerTest extends MediaWikiMediaTestCase {
 
 	/** @var GIFHandler */
diff --git a/tests/phpunit/includes/media/IPTCTest.php b/tests/phpunit/includes/media/IPTCTest.php
index b556a75876..06542cfe90 100644
--- a/tests/phpunit/includes/media/IPTCTest.php
+++ b/tests/phpunit/includes/media/IPTCTest.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @group Media
+ */
 class IPTCTest extends MediaWikiTestCase {
 
 	/**
diff --git a/tests/phpunit/includes/media/JpegMetadataExtractorTest.php b/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
index b10f55c88d..80e03cca19 100644
--- a/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
@@ -6,6 +6,7 @@
  * but it costs money). The implementation of it currently in MediaWiki is based
  * solely on reading the standard, without any real world test files.
  *
+ * @group Media
  * @covers JpegMetadataExtractor
  */
 class JpegMetadataExtractorTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/media/JpegTest.php b/tests/phpunit/includes/media/JpegTest.php
index c856b1ca82..2436e7d901 100644
--- a/tests/phpunit/includes/media/JpegTest.php
+++ b/tests/phpunit/includes/media/JpegTest.php
@@ -1,5 +1,7 @@
 <?php
+
 /**
+ * @group Media
  * @covers JpegHandler
  */
 class JpegTest extends MediaWikiMediaTestCase {
diff --git a/tests/phpunit/includes/media/MediaHandlerTest.php b/tests/phpunit/includes/media/MediaHandlerTest.php
index c28898bb6b..d8cfcc45ee 100644
--- a/tests/phpunit/includes/media/MediaHandlerTest.php
+++ b/tests/phpunit/includes/media/MediaHandlerTest.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @group Media
+ */
 class MediaHandlerTest extends MediaWikiTestCase {
 
 	/**
diff --git a/tests/phpunit/includes/media/PNGMetadataExtractorTest.php b/tests/phpunit/includes/media/PNGMetadataExtractorTest.php
index 84deb1bfd5..a9eaa9e7c5 100644
--- a/tests/phpunit/includes/media/PNGMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/PNGMetadataExtractorTest.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @group Media
  * @covers PNGMetadataExtractor
  */
 class PNGMetadataExtractorTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/media/PNGTest.php b/tests/phpunit/includes/media/PNGTest.php
index 14e4d57c5d..9a4826ccc9 100644
--- a/tests/phpunit/includes/media/PNGTest.php
+++ b/tests/phpunit/includes/media/PNGTest.php
@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @group Media
+ */
 class PNGHandlerTest extends MediaWikiMediaTestCase {
 
 	/** @var PNGHandler */
diff --git a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
index f06bd6f072..ab33d1c22c 100644
--- a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @group Media
  * @covers SVGMetadataExtractor
  */
 class SVGMetadataExtractorTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/media/SVGTest.php b/tests/phpunit/includes/media/SVGTest.php
index e3bb05eb1b..1361a92f25 100644
--- a/tests/phpunit/includes/media/SVGTest.php
+++ b/tests/phpunit/includes/media/SVGTest.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @group Media
+ */
 class SvgTest extends MediaWikiMediaTestCase {
 
 	protected function setUp() {
diff --git a/tests/phpunit/includes/media/TiffTest.php b/tests/phpunit/includes/media/TiffTest.php
index 26d7204004..d1148202c3 100644
--- a/tests/phpunit/includes/media/TiffTest.php
+++ b/tests/phpunit/includes/media/TiffTest.php
@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @group Media
+ */
 class TiffTest extends MediaWikiTestCase {
 
 	/** @var TiffHandler */
diff --git a/tests/phpunit/includes/media/XCFTest.php b/tests/phpunit/includes/media/XCFTest.php
index ae4fa8bc22..7fc3275b2a 100644
--- a/tests/phpunit/includes/media/XCFTest.php
+++ b/tests/phpunit/includes/media/XCFTest.php
@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @group Media
+ */
 class XCFHandlerTest extends MediaWikiMediaTestCase {
 
 	/** @var XCFHandler */
diff --git a/tests/phpunit/includes/media/XMPTest.php b/tests/phpunit/includes/media/XMPTest.php
index 25ae1e6032..798e492b20 100644
--- a/tests/phpunit/includes/media/XMPTest.php
+++ b/tests/phpunit/includes/media/XMPTest.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @todo covers tags
+ * @group Media
+ * @covers XMPReader
  */
 class XMPTest extends MediaWikiTestCase {
 
diff --git a/tests/phpunit/includes/media/XMPValidateTest.php b/tests/phpunit/includes/media/XMPValidateTest.php
index 96bf5e4781..ebec8f6c90 100644
--- a/tests/phpunit/includes/media/XMPValidateTest.php
+++ b/tests/phpunit/includes/media/XMPValidateTest.php
@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @group Media
+ */
 class XMPValidateTest extends MediaWikiTestCase {
 
 	/**
-- 
2.20.1