Merge "Add @covers tags for more tests"

diff --cc tests/phpunit/includes/FauxRequestTest.php
Simple merge

diff --cc 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 --cc 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 --cc 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 --cc tests/phpunit/includes/libs/IPTest.php
Simple merge

diff --cc tests/phpunit/includes/libs/ProcessCacheLRUTest.php
Simple merge

diff --cc 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 --cc tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
Simple merge

diff --cc 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 --cc 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 --cc 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' );