From 095f5583cb2d508bf5f26940e547a8fcd356ee55 Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Tue, 2 Jul 2019 19:04:44 +0200 Subject: [PATCH] Move trivial unit tests, round II Change-Id: I18e5a1514d7372b34f7fb460adf506a1ac65001f --- .../{ => unit}/includes/MediaWikiVersionFetcherTest.php | 2 +- tests/phpunit/{ => unit}/includes/Rest/EntryPointTest.php | 3 +-- .../{ => unit}/includes/Rest/Handler/HelloHandlerTest.php | 3 +-- tests/phpunit/{ => unit}/includes/Rest/testRoutes.json | 0 .../includes/Revision/RevisionStoreFactoryTest.php | 3 +-- .../{ => unit}/includes/config/ConfigFactoryTest.php | 2 +- .../{ => unit}/includes/media/GIFMetadataExtractorTest.php | 4 ++-- .../{ => unit}/includes/media/SVGMetadataExtractorTest.php | 6 +++--- .../{ => unit}/includes/site/CachingSiteStoreTest.php | 2 +- .../phpunit/{ => unit}/includes/site/HashSiteStoreTest.php | 2 +- 10 files changed, 12 insertions(+), 15 deletions(-) rename tests/phpunit/{ => unit}/includes/MediaWikiVersionFetcherTest.php (88%) rename tests/phpunit/{ => unit}/includes/Rest/EntryPointTest.php (96%) rename tests/phpunit/{ => unit}/includes/Rest/Handler/HelloHandlerTest.php (96%) rename tests/phpunit/{ => unit}/includes/Rest/testRoutes.json (100%) rename tests/phpunit/{ => unit}/includes/Revision/RevisionStoreFactoryTest.php (98%) rename tests/phpunit/{ => unit}/includes/config/ConfigFactoryTest.php (98%) rename tests/phpunit/{ => unit}/includes/media/GIFMetadataExtractorTest.php (97%) rename tests/phpunit/{ => unit}/includes/media/SVGMetadataExtractorTest.php (96%) rename tests/phpunit/{ => unit}/includes/site/CachingSiteStoreTest.php (98%) rename tests/phpunit/{ => unit}/includes/site/HashSiteStoreTest.php (97%) diff --git a/tests/phpunit/includes/MediaWikiVersionFetcherTest.php b/tests/phpunit/unit/includes/MediaWikiVersionFetcherTest.php similarity index 88% rename from tests/phpunit/includes/MediaWikiVersionFetcherTest.php rename to tests/phpunit/unit/includes/MediaWikiVersionFetcherTest.php index 9803081869..dfdbfa7344 100644 --- a/tests/phpunit/includes/MediaWikiVersionFetcherTest.php +++ b/tests/phpunit/unit/includes/MediaWikiVersionFetcherTest.php @@ -10,7 +10,7 @@ * * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ -class MediaWikiVersionFetcherTest extends MediaWikiTestCase { +class MediaWikiVersionFetcherTest extends \MediaWikiUnitTestCase { public function testReturnsResult() { global $wgVersion; diff --git a/tests/phpunit/includes/Rest/EntryPointTest.php b/tests/phpunit/unit/includes/Rest/EntryPointTest.php similarity index 96% rename from tests/phpunit/includes/Rest/EntryPointTest.php rename to tests/phpunit/unit/includes/Rest/EntryPointTest.php index 4f87a70b4f..e1f2c883a5 100644 --- a/tests/phpunit/includes/Rest/EntryPointTest.php +++ b/tests/phpunit/unit/includes/Rest/EntryPointTest.php @@ -6,7 +6,6 @@ use EmptyBagOStuff; use GuzzleHttp\Psr7\Uri; use GuzzleHttp\Psr7\Stream; use MediaWiki\Rest\Handler; -use MediaWikiTestCase; use MediaWiki\Rest\EntryPoint; use MediaWiki\Rest\RequestData; use MediaWiki\Rest\ResponseFactory; @@ -17,7 +16,7 @@ use WebResponse; * @covers \MediaWiki\Rest\EntryPoint * @covers \MediaWiki\Rest\Router */ -class EntryPointTest extends MediaWikiTestCase { +class EntryPointTest extends \MediaWikiUnitTestCase { private static $mockHandler; private function createRouter() { diff --git a/tests/phpunit/includes/Rest/Handler/HelloHandlerTest.php b/tests/phpunit/unit/includes/Rest/Handler/HelloHandlerTest.php similarity index 96% rename from tests/phpunit/includes/Rest/Handler/HelloHandlerTest.php rename to tests/phpunit/unit/includes/Rest/Handler/HelloHandlerTest.php index afbaafb757..c68273b758 100644 --- a/tests/phpunit/includes/Rest/Handler/HelloHandlerTest.php +++ b/tests/phpunit/unit/includes/Rest/Handler/HelloHandlerTest.php @@ -7,12 +7,11 @@ use GuzzleHttp\Psr7\Uri; use MediaWiki\Rest\RequestData; use MediaWiki\Rest\ResponseFactory; use MediaWiki\Rest\Router; -use MediaWikiTestCase; /** * @covers \MediaWiki\Rest\Handler\HelloHandler */ -class HelloHandlerTest extends MediaWikiTestCase { +class HelloHandlerTest extends \MediaWikiUnitTestCase { public static function provideTestViaRouter() { return [ 'normal' => [ diff --git a/tests/phpunit/includes/Rest/testRoutes.json b/tests/phpunit/unit/includes/Rest/testRoutes.json similarity index 100% rename from tests/phpunit/includes/Rest/testRoutes.json rename to tests/phpunit/unit/includes/Rest/testRoutes.json diff --git a/tests/phpunit/includes/Revision/RevisionStoreFactoryTest.php b/tests/phpunit/unit/includes/Revision/RevisionStoreFactoryTest.php similarity index 98% rename from tests/phpunit/includes/Revision/RevisionStoreFactoryTest.php rename to tests/phpunit/unit/includes/Revision/RevisionStoreFactoryTest.php index 84c815d487..8e8fbd760f 100644 --- a/tests/phpunit/includes/Revision/RevisionStoreFactoryTest.php +++ b/tests/phpunit/unit/includes/Revision/RevisionStoreFactoryTest.php @@ -13,7 +13,6 @@ use MediaWiki\Storage\BlobStoreFactory; use MediaWiki\Storage\NameTableStore; use MediaWiki\Storage\NameTableStoreFactory; use MediaWiki\Storage\SqlBlobStore; -use MediaWikiTestCase; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; use WANObjectCache; @@ -21,7 +20,7 @@ use Wikimedia\Rdbms\ILBFactory; use Wikimedia\Rdbms\ILoadBalancer; use Wikimedia\TestingAccessWrapper; -class RevisionStoreFactoryTest extends MediaWikiTestCase { +class RevisionStoreFactoryTest extends \MediaWikiUnitTestCase { /** * @covers \MediaWiki\Revision\RevisionStoreFactory::__construct diff --git a/tests/phpunit/includes/config/ConfigFactoryTest.php b/tests/phpunit/unit/includes/config/ConfigFactoryTest.php similarity index 98% rename from tests/phpunit/includes/config/ConfigFactoryTest.php rename to tests/phpunit/unit/includes/config/ConfigFactoryTest.php index ea747afac1..a136018c96 100644 --- a/tests/phpunit/includes/config/ConfigFactoryTest.php +++ b/tests/phpunit/unit/includes/config/ConfigFactoryTest.php @@ -2,7 +2,7 @@ use MediaWiki\MediaWikiServices; -class ConfigFactoryTest extends MediaWikiTestCase { +class ConfigFactoryTest extends \MediaWikiUnitTestCase { /** * @covers ConfigFactory::register diff --git a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php b/tests/phpunit/unit/includes/media/GIFMetadataExtractorTest.php similarity index 97% rename from tests/phpunit/includes/media/GIFMetadataExtractorTest.php rename to tests/phpunit/unit/includes/media/GIFMetadataExtractorTest.php index 278b441bbd..10c450d935 100644 --- a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php +++ b/tests/phpunit/unit/includes/media/GIFMetadataExtractorTest.php @@ -3,12 +3,12 @@ /** * @group Media */ -class GIFMetadataExtractorTest extends MediaWikiTestCase { +class GIFMetadataExtractorTest extends \MediaWikiUnitTestCase { protected function setUp() { parent::setUp(); - $this->mediaPath = __DIR__ . '/../../data/media/'; + $this->mediaPath = __DIR__ . '/../../../data/media/'; } /** diff --git a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php b/tests/phpunit/unit/includes/media/SVGMetadataExtractorTest.php similarity index 96% rename from tests/phpunit/includes/media/SVGMetadataExtractorTest.php rename to tests/phpunit/unit/includes/media/SVGMetadataExtractorTest.php index 6b94d0ae6c..30d10083f4 100644 --- a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php +++ b/tests/phpunit/unit/includes/media/SVGMetadataExtractorTest.php @@ -4,7 +4,7 @@ * @group Media * @covers SVGMetadataExtractor */ -class SVGMetadataExtractorTest extends MediaWikiTestCase { +class SVGMetadataExtractorTest extends \MediaWikiUnitTestCase { /** * @dataProvider provideSvgFiles @@ -46,7 +46,7 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase { } public static function provideSvgFiles() { - $base = __DIR__ . '/../../data/media'; + $base = __DIR__ . '/../../../data/media'; return [ [ @@ -143,7 +143,7 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase { } public static function provideSvgFilesWithXMLMetadata() { - $base = __DIR__ . '/../../data/media'; + $base = __DIR__ . '/../../../data/media'; // phpcs:disable Generic.Files.LineLength $metadata = ' diff --git a/tests/phpunit/includes/site/CachingSiteStoreTest.php b/tests/phpunit/unit/includes/site/CachingSiteStoreTest.php similarity index 98% rename from tests/phpunit/includes/site/CachingSiteStoreTest.php rename to tests/phpunit/unit/includes/site/CachingSiteStoreTest.php index f04d35ca02..92ed1f53e8 100644 --- a/tests/phpunit/includes/site/CachingSiteStoreTest.php +++ b/tests/phpunit/unit/includes/site/CachingSiteStoreTest.php @@ -27,7 +27,7 @@ * * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ -class CachingSiteStoreTest extends MediaWikiTestCase { +class CachingSiteStoreTest extends \MediaWikiUnitTestCase { /** * @covers CachingSiteStore::getSites diff --git a/tests/phpunit/includes/site/HashSiteStoreTest.php b/tests/phpunit/unit/includes/site/HashSiteStoreTest.php similarity index 97% rename from tests/phpunit/includes/site/HashSiteStoreTest.php rename to tests/phpunit/unit/includes/site/HashSiteStoreTest.php index 6269fd39dc..8b0d4e080b 100644 --- a/tests/phpunit/includes/site/HashSiteStoreTest.php +++ b/tests/phpunit/unit/includes/site/HashSiteStoreTest.php @@ -24,7 +24,7 @@ * * @author Katie Filbert < aude.wiki@gmail.com > */ -class HashSiteStoreTest extends MediaWikiTestCase { +class HashSiteStoreTest extends \MediaWikiUnitTestCase { /** * @covers HashSiteStore::getSites -- 2.20.1