Merge "Add @covers tags for more tests"

diff --combined tests/phpunit/includes/FauxRequestTest.php
index e39dcdb,013ced3..f6ccbc7
--- 1/tests/phpunit/includes/FauxRequestTest.php
--- 2/tests/phpunit/includes/FauxRequestTest.php
+++ b/tests/phpunit/includes/FauxRequestTest.php
@@@ -3,9 -3,6 +3,9 @@@
  use MediaWiki\Session\SessionManager;
  
  class FauxRequestTest extends PHPUnit_Framework_TestCase {
 +
 +      use MediaWikiCoversValidator;
 +
        /**
         * @covers FauxRequest::__construct
         */
@@@ -42,13 -39,19 +42,19 @@@
                $this->assertEquals( '', $req->getText( 'z' ) );
        }
  
-       // Integration test for parent method.
+       /**
+        * Integration test for parent method
+        * @covers FauxRequest::getVal
+        */
        public function testGetVal() {
                $req = new FauxRequest( [ 'crlf' => "A\r\nb" ] );
                $this->assertSame( "A\r\nb", $req->getVal( 'crlf' ), 'CRLF' );
        }
  
-       // Integration test for parent method.
+       /**
+        * Integration test for parent method
+        * @covers FauxRequest::getRawVal
+        */
        public function testGetRawVal() {
                $req = new FauxRequest( [
                        'x' => 'Value',

diff --combined tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php
index 13c92e3,57e8654..75c93be
--- 1/tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php
--- 2/tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php
+++ b/tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php
@@@ -1,9 -1,9 +1,12 @@@
  <?php
  
+ /**
+  * @covers HTMLRestrictionsField
+  */
  class HTMLRestrictionsFieldTest extends PHPUnit_Framework_TestCase {
 +
 +      use MediaWikiCoversValidator;
 +
        public function testConstruct() {
                $field = new HTMLRestrictionsField( [ 'fieldname' => 'restrictions' ] );
                $this->assertNotEmpty( $field->getLabel(), 'has a default label' );

diff --combined tests/phpunit/includes/libs/DeferredStringifierTest.php
index c3a1285,82f24f7..19dc53c
--- 1/tests/phpunit/includes/libs/DeferredStringifierTest.php
--- 2/tests/phpunit/includes/libs/DeferredStringifierTest.php
+++ b/tests/phpunit/includes/libs/DeferredStringifierTest.php
@@@ -1,11 -1,11 +1,13 @@@
  <?php
  
+ /**
+  * @covers DeferredStringifier
+  */
  class DeferredStringifierTest extends PHPUnit_Framework_TestCase {
  
 +      use MediaWikiCoversValidator;
 +
        /**
-        * @covers DeferredStringifier
         * @dataProvider provideToString
         */
        public function testToString( $params, $expected ) {

diff --combined tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
index bc20c4c,52316f3..264cc00
--- 1/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
--- 2/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
+++ b/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
@@@ -1,11 -1,10 +1,13 @@@
  <?php
  
+ /**
+  * @covers DnsSrvDiscoverer
+  */
  class DnsSrvDiscovererTest extends PHPUnit_Framework_TestCase {
 +
 +      use MediaWikiCoversValidator;
 +
        /**
-        * @covers DnsSrvDiscoverer
         * @dataProvider provideRecords
         */
        public function testPickServer( $params, $expected ) {

diff --combined tests/phpunit/includes/libs/IPTest.php
index 84e4706,9d3bd29..8a120ea
--- 1/tests/phpunit/includes/libs/IPTest.php
--- 2/tests/phpunit/includes/libs/IPTest.php
+++ b/tests/phpunit/includes/libs/IPTest.php
@@@ -10,9 -10,6 +10,9 @@@
   */
  
  class IPTest extends PHPUnit_Framework_TestCase {
 +
 +      use MediaWikiCoversValidator;
 +
        /**
         * @covers IP::isIPAddress
         * @dataProvider provideInvalidIPs
@@@ -564,7 -561,7 +564,7 @@@
        }
  
        /**
-        * Test for IP::splitHostAndPort().
+        * @covers IP::splitHostAndPort()
         * @dataProvider provideSplitHostAndPort
         */
        public function testSplitHostAndPort( $expected, $input, $description ) {
@@@ -591,7 -588,7 +591,7 @@@
        }
  
        /**
-        * Test for IP::combineHostAndPort()
+        * @covers IP::combineHostAndPort()
         * @dataProvider provideCombineHostAndPort
         */
        public function testCombineHostAndPort( $expected, $input, $description ) {
@@@ -615,7 -612,7 +615,7 @@@
        }
  
        /**
-        * Test for IP::sanitizeRange()
+        * @covers IP::sanitizeRange()
         * @dataProvider provideIPCIDRs
         */
        public function testSanitizeRange( $input, $expected, $description ) {
@@@ -639,7 -636,7 +639,7 @@@
        }
  
        /**
-        * Test for IP::prettifyIP()
+        * @covers IP::prettifyIP()
         * @dataProvider provideIPsToPrettify
         */
        public function testPrettifyIP( $ip, $prettified ) {

diff --combined tests/phpunit/includes/libs/ProcessCacheLRUTest.php
index e027d5b,e9b2764..ddb7bfa
--- 1/tests/phpunit/includes/libs/ProcessCacheLRUTest.php
--- 2/tests/phpunit/includes/libs/ProcessCacheLRUTest.php
+++ b/tests/phpunit/includes/libs/ProcessCacheLRUTest.php
@@@ -11,8 -11,6 +11,8 @@@
   */
  class ProcessCacheLRUTest extends PHPUnit_Framework_TestCase {
  
 +      use MediaWikiCoversValidator;
 +
        /**
         * Helper to verify emptiness of a cache object.
         * Compare against an array so we get the cache content difference.
@@@ -60,6 -58,7 +60,7 @@@
  
        /**
         * Highlight diff between assertEquals and assertNotSame
+        * @coversNothing
         */
        public function testPhpUnitArrayEquality() {
                $one = [ 'A' => 1, 'B' => 2 ];

diff --combined tests/phpunit/includes/libs/SamplingStatsdClientTest.php
index cf18aaf,3439df8..d0e404b
--- 1/tests/phpunit/includes/libs/SamplingStatsdClientTest.php
--- 2/tests/phpunit/includes/libs/SamplingStatsdClientTest.php
+++ b/tests/phpunit/includes/libs/SamplingStatsdClientTest.php
@@@ -3,10 -3,10 +3,13 @@@
  use Liuggio\StatsdClient\Entity\StatsdData;
  use Liuggio\StatsdClient\Sender\SenderInterface;
  
+ /**
+  * @covers SamplingStatsdClient
+  */
  class SamplingStatsdClientTest extends PHPUnit_Framework_TestCase {
 +
 +      use MediaWikiCoversValidator;
 +
        /**
         * @dataProvider samplingDataProvider
         */

diff --combined tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
index 4743710,d2188a1..1f3cae5
--- 1/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
--- 2/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
+++ b/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
@@@ -1,12 -1,9 +1,12 @@@
  <?php
- /*
+ /**
   * @group Media
   * @covers MimeAnalyzer
   */
  class MimeAnalyzerTest extends PHPUnit_Framework_TestCase {
 +
 +      use MediaWikiCoversValidator;
 +
        /** @var MimeAnalyzer */
        private $mimeAnalyzer;
  

diff --combined tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php
index a0de408,e6ccb34..54706d5
--- 1/tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php
--- 2/tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php
+++ b/tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php
@@@ -3,10 -3,10 +3,13 @@@
  use Wikimedia\Rdbms\TransactionProfiler;
  use Psr\Log\LoggerInterface;
  
+ /**
+  * @covers \Wikimedia\Rdbms\TransactionProfiler
+  */
  class TransactionProfilerTest extends PHPUnit_Framework_TestCase {
 +
 +      use MediaWikiCoversValidator;
 +
        public function testAffected() {
                $logger = $this->getMockBuilder( LoggerInterface::class )->getMock();
                $logger->expects( $this->exactly( 3 ) )->method( 'info' );

diff --combined tests/phpunit/includes/utils/AvroValidatorTest.php
index 902f6d9,4fccd3e..caeeaab
--- 1/tests/phpunit/includes/utils/AvroValidatorTest.php
--- 2/tests/phpunit/includes/utils/AvroValidatorTest.php
+++ b/tests/phpunit/includes/utils/AvroValidatorTest.php
@@@ -9,10 -9,10 +9,13 @@@
   * dataprovider.
   */
  
+ /**
+  * @covers AvroValidator
+  */
  class AvroValidatorTest extends PHPUnit_Framework_TestCase {
 +
 +      use MediaWikiCoversValidator;
 +
        public function setUp() {
                if ( !class_exists( 'AvroSchema' ) ) {
                        $this->markTestSkipped( 'Avro is required to run the AvroValidatorTest' );

diff --combined tests/phpunit/includes/utils/MWCryptHashTest.php
index f6503ef,7ea229d..66c8d00
--- 1/tests/phpunit/includes/utils/MWCryptHashTest.php
--- 2/tests/phpunit/includes/utils/MWCryptHashTest.php
+++ b/tests/phpunit/includes/utils/MWCryptHashTest.php
@@@ -1,13 -1,12 +1,14 @@@
  <?php
+ 
  /**
-  *
   * @group Hash
+  *
+  * @covers MWCryptHash
   */
- 
  class MWCryptHashTest extends PHPUnit_Framework_TestCase {
  
 +      use MediaWikiCoversValidator;
 +
        public function testHashLength() {
                if ( MWCryptHash::hashAlgo() !== 'whirlpool' ) {
                        $this->markTestSkipped( 'Hash algorithm isn\'t whirlpool' );
@@@ -23,8 -22,9 +24,8 @@@
                }
  
                $data = 'foobar';
 -              // @codingStandardsIgnoreStart Generic.Files.LineLength
 +              // phpcs:ignore Generic.Files.LineLength
                $hash = '9923afaec3a86f865bb231a588f453f84e8151a2deb4109aebc6de4284be5bebcff4fab82a7e51d920237340a043736e9d13bab196006dcca0fe65314d68eab9';
 -              // @codingStandardsIgnoreEnd
  
                $this->assertEquals(
                        hex2bin( $hash ),
@@@ -45,8 -45,9 +46,8 @@@
  
                $data = 'foobar';
                $key = 'secret';
 -              // @codingStandardsIgnoreStart Generic.Files.LineLength
 +              // phpcs:ignore Generic.Files.LineLength
                $hash = 'ddc94177b2020e55ce2049199fd9cc6327f416ff6dc621cc34cb43d9bec61d73372b4790c0e24957f565ecaf2d42821e6303619093e99cbe14a3b9250bda5f81';
 -              // @codingStandardsIgnoreEnd
  
                $this->assertEquals(
                        hex2bin( $hash ),