From b4925e34d0b4b3128f9136306196e66ec14da52d Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Sat, 7 Apr 2018 17:36:33 -0700 Subject: [PATCH] tests: Enable PHPUnit 4/6 compat layer in some tests that need it Change-Id: I27a21fa9e97414fae02acbefb28011f0275cba63 --- tests/phpunit/includes/FauxRequestTest.php | 1 + .../includes/composer/ComposerVersionNormalizerTest.php | 1 + tests/phpunit/includes/config/EtcdConfigTest.php | 1 + tests/phpunit/includes/db/DatabaseOracleTest.php | 1 + tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php | 1 + tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php | 2 ++ .../includes/libs/rdbms/database/DatabaseDomainTest.php | 1 + .../phpunit/includes/libs/rdbms/database/DatabaseMssqlTest.php | 1 + .../includes/libs/rdbms/database/DatabaseMysqlBaseTest.php | 1 + tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php | 1 + .../includes/libs/rdbms/database/DatabaseSqliteRdbmsTest.php | 1 + tests/phpunit/includes/services/ServiceContainerTest.php | 1 + tests/phpunit/includes/site/SiteExporterTest.php | 1 + tests/phpunit/includes/site/SiteImporterTest.php | 1 + tests/phpunit/includes/sparql/SparqlClientTest.php | 3 +++ 15 files changed, 18 insertions(+) diff --git a/tests/phpunit/includes/FauxRequestTest.php b/tests/phpunit/includes/FauxRequestTest.php index 9f8bb385f2..9e7d680268 100644 --- a/tests/phpunit/includes/FauxRequestTest.php +++ b/tests/phpunit/includes/FauxRequestTest.php @@ -5,6 +5,7 @@ use MediaWiki\Session\SessionManager; class FauxRequestTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; /** * @covers FauxRequest::__construct diff --git a/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php b/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php index c607ae5b50..c5c0dc7d6b 100644 --- a/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php +++ b/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php @@ -10,6 +10,7 @@ class ComposerVersionNormalizerTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; /** * @dataProvider nonStringProvider diff --git a/tests/phpunit/includes/config/EtcdConfigTest.php b/tests/phpunit/includes/config/EtcdConfigTest.php index 07dbd002c1..3eecf82704 100644 --- a/tests/phpunit/includes/config/EtcdConfigTest.php +++ b/tests/phpunit/includes/config/EtcdConfigTest.php @@ -5,6 +5,7 @@ use Wikimedia\TestingAccessWrapper; class EtcdConfigTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; private function createConfigMock( array $options = [] ) { return $this->getMockBuilder( EtcdConfig::class ) diff --git a/tests/phpunit/includes/db/DatabaseOracleTest.php b/tests/phpunit/includes/db/DatabaseOracleTest.php index b03734e8bd..061e121a24 100644 --- a/tests/phpunit/includes/db/DatabaseOracleTest.php +++ b/tests/phpunit/includes/db/DatabaseOracleTest.php @@ -3,6 +3,7 @@ class DatabaseOracleTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; /** * @return PHPUnit_Framework_MockObject_MockObject|DatabaseOracle diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php index 77198f9d18..078b7b3858 100644 --- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php +++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php @@ -19,6 +19,7 @@ use Wikimedia\TestingAccessWrapper; class WANObjectCacheTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; /** @var TimeAdjustableWANObjectCache */ private $cache; diff --git a/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php b/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php index d1f961a809..bc9d9ea4fc 100644 --- a/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php +++ b/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php @@ -12,6 +12,8 @@ use Wikimedia\Rdbms\ResultWrapper; */ class DBConnRefTest extends PHPUnit\Framework\TestCase { + use PHPUnit4And6Compat; + /** * @return ILoadBalancer */ diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php index b13e8fca62..b2e7155400 100644 --- a/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php +++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php @@ -8,6 +8,7 @@ use Wikimedia\Rdbms\DatabaseDomain; class DatabaseDomainTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; public static function provideConstruct() { return [ diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseMssqlTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseMssqlTest.php index bb85f5a365..b28a5b9eec 100644 --- a/tests/phpunit/includes/libs/rdbms/database/DatabaseMssqlTest.php +++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseMssqlTest.php @@ -5,6 +5,7 @@ use Wikimedia\Rdbms\DatabaseMssql; class DatabaseMssqlTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; /** * @return PHPUnit_Framework_MockObject_MockObject|DatabaseMssql diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php index 1eca89bb22..378935c79a 100644 --- a/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php +++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php @@ -29,6 +29,7 @@ use Wikimedia\TestingAccessWrapper; class DatabaseMysqlBaseTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; /** * @dataProvider provideDiapers diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php index 40e07d8f3c..a57dce15bd 100644 --- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php +++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php @@ -14,6 +14,7 @@ use Wikimedia\Rdbms\DBUnexpectedError; class DatabaseSQLTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; /** @var DatabaseTestHelper|Database */ private $database; diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSqliteRdbmsTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseSqliteRdbmsTest.php index d963a5dcd2..a886d6bf76 100644 --- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSqliteRdbmsTest.php +++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSqliteRdbmsTest.php @@ -11,6 +11,7 @@ use Wikimedia\Rdbms\DatabaseSqlite; class DatabaseSqliteRdbmsTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; /** * @return PHPUnit_Framework_MockObject_MockObject|DatabaseSqlite diff --git a/tests/phpunit/includes/services/ServiceContainerTest.php b/tests/phpunit/includes/services/ServiceContainerTest.php index 1e8175e1b0..a760908f9e 100644 --- a/tests/phpunit/includes/services/ServiceContainerTest.php +++ b/tests/phpunit/includes/services/ServiceContainerTest.php @@ -9,6 +9,7 @@ use MediaWiki\Services\ServiceContainer; class ServiceContainerTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; private function newServiceContainer( $extraArgs = [] ) { return new ServiceContainer( $extraArgs ); diff --git a/tests/phpunit/includes/site/SiteExporterTest.php b/tests/phpunit/includes/site/SiteExporterTest.php index 279bbb21c5..db900da914 100644 --- a/tests/phpunit/includes/site/SiteExporterTest.php +++ b/tests/phpunit/includes/site/SiteExporterTest.php @@ -32,6 +32,7 @@ class SiteExporterTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; public function testConstructor_InvalidArgument() { $this->setExpectedException( InvalidArgumentException::class ); diff --git a/tests/phpunit/includes/site/SiteImporterTest.php b/tests/phpunit/includes/site/SiteImporterTest.php index 7c949ac7d0..bd95a501be 100644 --- a/tests/phpunit/includes/site/SiteImporterTest.php +++ b/tests/phpunit/includes/site/SiteImporterTest.php @@ -32,6 +32,7 @@ class SiteImporterTest extends PHPUnit\Framework\TestCase { use MediaWikiCoversValidator; + use PHPUnit4And6Compat; private function newSiteImporter( array $expectedSites, $errorCount ) { $store = $this->getMockBuilder( SiteStore::class )->getMock(); diff --git a/tests/phpunit/includes/sparql/SparqlClientTest.php b/tests/phpunit/includes/sparql/SparqlClientTest.php index cfaf49b5cd..b217af1590 100644 --- a/tests/phpunit/includes/sparql/SparqlClientTest.php +++ b/tests/phpunit/includes/sparql/SparqlClientTest.php @@ -4,12 +4,15 @@ namespace MediaWiki\Sparql; use Http; use MediaWiki\Http\HttpRequestFactory; use MWHttpRequest; +use PHPUnit4And6Compat; /** * @covers \MediaWiki\Sparql\SparqlClient */ class SparqlClientTest extends \PHPUnit\Framework\TestCase { + use PHPUnit4And6Compat; + private function getRequestFactory( $request ) { $requestFactory = $this->getMock( HttpRequestFactory::class ); $requestFactory->method( 'create' )->willReturn( $request ); -- 2.20.1