diff options
10 files changed, 12 insertions, 23 deletions
diff --git a/tests/phpunit/includes/TemplateCategoriesTest.php b/tests/phpunit/includes/TemplateCategoriesTest.php index ab2313635da3..ebd8dbd3dad5 100644 --- a/tests/phpunit/includes/TemplateCategoriesTest.php +++ b/tests/phpunit/includes/TemplateCategoriesTest.php @@ -1,10 +1,10 @@ <?php +require __DIR__ . "/../../../maintenance/runJobs.php"; + /** * @group Database */ -require __DIR__ . "/../../../maintenance/runJobs.php"; - class TemplateCategoriesTest extends MediaWikiLangTestCase { /** diff --git a/tests/phpunit/includes/db/LoadBalancerTest.php b/tests/phpunit/includes/db/LoadBalancerTest.php index 6cc41d1f4177..6ced540ffd65 100644 --- a/tests/phpunit/includes/db/LoadBalancerTest.php +++ b/tests/phpunit/includes/db/LoadBalancerTest.php @@ -18,10 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * - * @group Database * @file - * - * @covers \Wikimedia\Rdbms\LoadBalancer */ use Wikimedia\Rdbms\DBError; @@ -30,6 +27,10 @@ use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\LoadBalancer; use Wikimedia\Rdbms\LoadMonitorNull; +/** + * @group Database + * @covers \Wikimedia\Rdbms\LoadBalancer + */ class LoadBalancerTest extends MediaWikiTestCase { public function testWithoutReplica() { global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir; diff --git a/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php b/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php index 31c9e50c49e9..0a13de1d9679 100644 --- a/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php +++ b/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php @@ -1,13 +1,13 @@ <?php +use MediaWiki\Interwiki\InterwikiLookupAdapter; + /** * @covers MediaWiki\Interwiki\InterwikiLookupAdapter * * @group MediaWiki * @group Interwiki */ -use MediaWiki\Interwiki\InterwikiLookupAdapter; - class InterwikiLookupAdapterTest extends MediaWikiTestCase { /** diff --git a/tests/phpunit/includes/media/FakeDimensionFile.php b/tests/phpunit/includes/media/FakeDimensionFile.php index 81e820e0d6d0..5e3a3cba3cff 100644 --- a/tests/phpunit/includes/media/FakeDimensionFile.php +++ b/tests/phpunit/includes/media/FakeDimensionFile.php @@ -1,8 +1,5 @@ <?php -/** - * @group Media - */ class FakeDimensionFile extends File { public $mustRender = false; public $mime; diff --git a/tests/phpunit/includes/parser/MagicVariableTest.php b/tests/phpunit/includes/parser/MagicVariableTest.php index 9f5e38640e16..86b496e2d178 100644 --- a/tests/phpunit/includes/parser/MagicVariableTest.php +++ b/tests/phpunit/includes/parser/MagicVariableTest.php @@ -9,11 +9,10 @@ * @author Antoine Musso * @copyright Copyright © 2011, Antoine Musso * @file - * - * @group Database */ /** + * @group Database * @covers Parser::getVariableValue */ class MagicVariableTest extends MediaWikiTestCase { diff --git a/tests/phpunit/includes/site/TestSites.php b/tests/phpunit/includes/site/TestSites.php index 39c34217e8d1..a66fce2993b1 100644 --- a/tests/phpunit/includes/site/TestSites.php +++ b/tests/phpunit/includes/site/TestSites.php @@ -24,8 +24,6 @@ * @ingroup Site * @ingroup Test * - * @group Site - * * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ class TestSites { diff --git a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php index 1d87a3a9263a..d53a9b8f80bd 100644 --- a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php +++ b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php @@ -5,10 +5,10 @@ * Copyright © 2011, Antoine Musso * * @author Antoine Musso - * @group Database */ /** + * @group Database * @covers QueryPage<extended> */ class QueryAllSpecialPagesTest extends MediaWikiTestCase { diff --git a/tests/phpunit/includes/specials/SpecialMIMESearchTest.php b/tests/phpunit/includes/specials/SpecialMIMESearchTest.php index a8459383f6ce..4ecb813f8c41 100644 --- a/tests/phpunit/includes/specials/SpecialMIMESearchTest.php +++ b/tests/phpunit/includes/specials/SpecialMIMESearchTest.php @@ -1,9 +1,7 @@ <?php -/** - * @group Database - */ /** + * @group Database * @covers MIMEsearchPage */ class SpecialMIMESearchTest extends MediaWikiTestCase { diff --git a/tests/phpunit/includes/utils/AvroValidatorTest.php b/tests/phpunit/includes/utils/AvroValidatorTest.php index 12d2574e698b..cf45f9fd5790 100644 --- a/tests/phpunit/includes/utils/AvroValidatorTest.php +++ b/tests/phpunit/includes/utils/AvroValidatorTest.php @@ -4,12 +4,12 @@ * * Ported from /t/inc/IP.t by avar. * - * @group IP * @todo Test methods in this call should be split into a method and a * dataprovider. */ /** + * @group IP * @covers AvroValidator */ class AvroValidatorTest extends PHPUnit\Framework\TestCase { diff --git a/tests/phpunit/includes/utils/MWCryptHKDFTest.php b/tests/phpunit/includes/utils/MWCryptHKDFTest.php index c9c1345ca35e..05a33c5af6f2 100644 --- a/tests/phpunit/includes/utils/MWCryptHKDFTest.php +++ b/tests/phpunit/includes/utils/MWCryptHKDFTest.php @@ -1,10 +1,6 @@ <?php /** - * * @group HKDF - */ - -/** * @covers CryptHKDF * @covers MWCryptHKDF */ |