From 57261a926cbfa729cb0f224773bd94e8e142e8a8 Mon Sep 17 00:00:00 2001
From: Amir Sarabadani <Ladsgroup@gmail.com>
Date: Mon, 8 Jul 2019 01:28:25 +0200
Subject: [PATCH] Move unit tests, round III

Depends-On: I16691fc8ac063705ba0c2bc63b96c4534ca8660b
Bug: T87781
Change-Id: I5e1ab06e3decef6cc6090551d54dc4314ab9314a
---
 .../phpunit/{ => unit}/includes/DerivativeRequestTest.php  | 2 +-
 .../{ => unit}/includes/SanitizerValidateEmailTest.php     | 4 +---
 tests/phpunit/{ => unit}/includes/XmlJsTest.php            | 4 +---
 .../includes/composer/ComposerVersionNormalizerTest.php    | 5 +----
 .../phpunit/{ => unit}/includes/config/EtcdConfigTest.php  | 5 +----
 .../phpunit/{ => unit}/includes/db/DatabaseOracleTest.php  | 5 +----
 .../debug/logger/monolog/LogstashFormatterTest.php         | 2 +-
 .../{ => unit}/includes/deferred/MWCallableUpdateTest.php  | 4 +---
 .../deferred/TransactionRoundDefiningUpdateTest.php        | 4 +---
 .../{ => unit}/includes/objectcache/RedisBagOStuffTest.php | 4 +---
 .../includes/registration/VersionCheckerTest.php           | 5 +----
 .../{ => unit}/includes/search/SearchSuggestionSetTest.php | 2 +-
 .../{ => unit}/includes/shell/CommandFactoryTest.php       | 4 +---
 .../phpunit/{ => unit}/includes/site/SiteExporterTest.php  | 7 ++-----
 .../phpunit/{ => unit}/includes/site/SiteImporterTest.php  | 5 +----
 .../phpunit/{ => unit}/includes/site/SiteImporterTest.xml  | 0
 tests/phpunit/{ => unit}/includes/tidy/RemexDriverTest.php | 2 +-
 tests/phpunit/{ => unit}/includes/tidy/html5lib-tests.json | 0
 .../{ => unit}/includes/utils/AvroValidatorTest.php        | 4 +---
 .../{ => unit}/includes/utils/ClassCollectorTest.php       | 4 +---
 .../phpunit/{ => unit}/includes/utils/MWCryptHashTest.php  | 4 +---
 .../{ => unit}/includes/utils/MWRestrictionsTest.php       | 4 +---
 22 files changed, 21 insertions(+), 59 deletions(-)
 rename tests/phpunit/{ => unit}/includes/DerivativeRequestTest.php (86%)
 rename tests/phpunit/{ => unit}/includes/SanitizerValidateEmailTest.php (96%)
 rename tests/phpunit/{ => unit}/includes/XmlJsTest.php (79%)
 rename tests/phpunit/{ => unit}/includes/composer/ComposerVersionNormalizerTest.php (96%)
 rename tests/phpunit/{ => unit}/includes/config/EtcdConfigTest.php (99%)
 rename tests/phpunit/{ => unit}/includes/db/DatabaseOracleTest.php (91%)
 rename tests/phpunit/{ => unit}/includes/debug/logger/monolog/LogstashFormatterTest.php (96%)
 rename tests/phpunit/{ => unit}/includes/deferred/MWCallableUpdateTest.php (94%)
 rename tests/phpunit/{ => unit}/includes/deferred/TransactionRoundDefiningUpdateTest.php (72%)
 rename tests/phpunit/{ => unit}/includes/objectcache/RedisBagOStuffTest.php (94%)
 rename tests/phpunit/{ => unit}/includes/registration/VersionCheckerTest.php (98%)
 rename tests/phpunit/{ => unit}/includes/search/SearchSuggestionSetTest.php (98%)
 rename tests/phpunit/{ => unit}/includes/shell/CommandFactoryTest.php (92%)
 rename tests/phpunit/{ => unit}/includes/site/SiteExporterTest.php (95%)
 rename tests/phpunit/{ => unit}/includes/site/SiteImporterTest.php (98%)
 rename tests/phpunit/{ => unit}/includes/site/SiteImporterTest.xml (100%)
 rename tests/phpunit/{ => unit}/includes/tidy/RemexDriverTest.php (99%)
 rename tests/phpunit/{ => unit}/includes/tidy/html5lib-tests.json (100%)
 rename tests/phpunit/{ => unit}/includes/utils/AvroValidatorTest.php (96%)
 rename tests/phpunit/{ => unit}/includes/utils/ClassCollectorTest.php (94%)
 rename tests/phpunit/{ => unit}/includes/utils/MWCryptHashTest.php (94%)
 rename tests/phpunit/{ => unit}/includes/utils/MWRestrictionsTest.php (98%)

diff --git a/tests/phpunit/includes/DerivativeRequestTest.php b/tests/phpunit/unit/includes/DerivativeRequestTest.php
similarity index 86%
rename from tests/phpunit/includes/DerivativeRequestTest.php
rename to tests/phpunit/unit/includes/DerivativeRequestTest.php
index f33022b352..cad39fdaa3 100644
--- a/tests/phpunit/includes/DerivativeRequestTest.php
+++ b/tests/phpunit/unit/includes/DerivativeRequestTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers DerivativeRequest
  */
-class DerivativeRequestTest extends PHPUnit\Framework\TestCase {
+class DerivativeRequestTest extends MediaWikiUnitTestCase {
 
 	public function testSetIp() {
 		$original = new WebRequest();
diff --git a/tests/phpunit/includes/SanitizerValidateEmailTest.php b/tests/phpunit/unit/includes/SanitizerValidateEmailTest.php
similarity index 96%
rename from tests/phpunit/includes/SanitizerValidateEmailTest.php
rename to tests/phpunit/unit/includes/SanitizerValidateEmailTest.php
index c4e430848b..2619472894 100644
--- a/tests/phpunit/includes/SanitizerValidateEmailTest.php
+++ b/tests/phpunit/unit/includes/SanitizerValidateEmailTest.php
@@ -5,9 +5,7 @@
  * @todo all test methods in this class should be refactored and...
  *    use a single test method and a single data provider...
  */
-class SanitizerValidateEmailTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
+class SanitizerValidateEmailTest extends MediaWikiUnitTestCase {
 
 	private function checkEmail( $addr, $expected = true, $msg = '' ) {
 		if ( $msg == '' ) {
diff --git a/tests/phpunit/includes/XmlJsTest.php b/tests/phpunit/unit/includes/XmlJsTest.php
similarity index 79%
rename from tests/phpunit/includes/XmlJsTest.php
rename to tests/phpunit/unit/includes/XmlJsTest.php
index c7975efabc..82f853138a 100644
--- a/tests/phpunit/includes/XmlJsTest.php
+++ b/tests/phpunit/unit/includes/XmlJsTest.php
@@ -3,9 +3,7 @@
 /**
  * @group Xml
  */
-class XmlJsTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
+class XmlJsTest extends MediaWikiUnitTestCase {
 
 	/**
 	 * @covers XmlJsCode::__construct
diff --git a/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php b/tests/phpunit/unit/includes/composer/ComposerVersionNormalizerTest.php
similarity index 96%
rename from tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php
rename to tests/phpunit/unit/includes/composer/ComposerVersionNormalizerTest.php
index c5c0dc7d6b..614b46827e 100644
--- a/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php
+++ b/tests/phpunit/unit/includes/composer/ComposerVersionNormalizerTest.php
@@ -7,10 +7,7 @@
  *
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-class ComposerVersionNormalizerTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
-	use PHPUnit4And6Compat;
+class ComposerVersionNormalizerTest extends MediaWikiUnitTestCase {
 
 	/**
 	 * @dataProvider nonStringProvider
diff --git a/tests/phpunit/includes/config/EtcdConfigTest.php b/tests/phpunit/unit/includes/config/EtcdConfigTest.php
similarity index 99%
rename from tests/phpunit/includes/config/EtcdConfigTest.php
rename to tests/phpunit/unit/includes/config/EtcdConfigTest.php
index 3eecf82704..95bb0ec7c7 100644
--- a/tests/phpunit/includes/config/EtcdConfigTest.php
+++ b/tests/phpunit/unit/includes/config/EtcdConfigTest.php
@@ -2,10 +2,7 @@
 
 use Wikimedia\TestingAccessWrapper;
 
-class EtcdConfigTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
-	use PHPUnit4And6Compat;
+class EtcdConfigTest extends MediaWikiUnitTestCase {
 
 	private function createConfigMock( array $options = [] ) {
 		return $this->getMockBuilder( EtcdConfig::class )
diff --git a/tests/phpunit/includes/db/DatabaseOracleTest.php b/tests/phpunit/unit/includes/db/DatabaseOracleTest.php
similarity index 91%
rename from tests/phpunit/includes/db/DatabaseOracleTest.php
rename to tests/phpunit/unit/includes/db/DatabaseOracleTest.php
index 061e121a24..ff1c3ca941 100644
--- a/tests/phpunit/includes/db/DatabaseOracleTest.php
+++ b/tests/phpunit/unit/includes/db/DatabaseOracleTest.php
@@ -1,9 +1,6 @@
 <?php
 
-class DatabaseOracleTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
-	use PHPUnit4And6Compat;
+class DatabaseOracleTest extends MediaWikiUnitTestCase {
 
 	/**
 	 * @return PHPUnit_Framework_MockObject_MockObject|DatabaseOracle
diff --git a/tests/phpunit/includes/debug/logger/monolog/LogstashFormatterTest.php b/tests/phpunit/unit/includes/debug/logger/monolog/LogstashFormatterTest.php
similarity index 96%
rename from tests/phpunit/includes/debug/logger/monolog/LogstashFormatterTest.php
rename to tests/phpunit/unit/includes/debug/logger/monolog/LogstashFormatterTest.php
index a1207b26b2..a2ed7f27ca 100644
--- a/tests/phpunit/includes/debug/logger/monolog/LogstashFormatterTest.php
+++ b/tests/phpunit/unit/includes/debug/logger/monolog/LogstashFormatterTest.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Logger\Monolog;
 
-class LogstashFormatterTest extends \PHPUnit\Framework\TestCase {
+class LogstashFormatterTest extends \MediaWikiUnitTestCase {
 	/**
 	 * @dataProvider provideV1
 	 * @covers MediaWiki\Logger\Monolog\LogstashFormatter::formatV1
diff --git a/tests/phpunit/includes/deferred/MWCallableUpdateTest.php b/tests/phpunit/unit/includes/deferred/MWCallableUpdateTest.php
similarity index 94%
rename from tests/phpunit/includes/deferred/MWCallableUpdateTest.php
rename to tests/phpunit/unit/includes/deferred/MWCallableUpdateTest.php
index 3ab9b5659e..20ffddb491 100644
--- a/tests/phpunit/includes/deferred/MWCallableUpdateTest.php
+++ b/tests/phpunit/unit/includes/deferred/MWCallableUpdateTest.php
@@ -3,9 +3,7 @@
 /**
  * @covers MWCallableUpdate
  */
-class MWCallableUpdateTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
+class MWCallableUpdateTest extends MediaWikiUnitTestCase {
 
 	public function testDoUpdate() {
 		$ran = 0;
diff --git a/tests/phpunit/includes/deferred/TransactionRoundDefiningUpdateTest.php b/tests/phpunit/unit/includes/deferred/TransactionRoundDefiningUpdateTest.php
similarity index 72%
rename from tests/phpunit/includes/deferred/TransactionRoundDefiningUpdateTest.php
rename to tests/phpunit/unit/includes/deferred/TransactionRoundDefiningUpdateTest.php
index 693897e676..c16c397402 100644
--- a/tests/phpunit/includes/deferred/TransactionRoundDefiningUpdateTest.php
+++ b/tests/phpunit/unit/includes/deferred/TransactionRoundDefiningUpdateTest.php
@@ -3,9 +3,7 @@
 /**
  * @covers TransactionRoundDefiningUpdate
  */
-class TransactionRoundDefiningUpdateTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
+class TransactionRoundDefiningUpdateTest extends MediaWikiUnitTestCase {
 
 	public function testDoUpdate() {
 		$ran = 0;
diff --git a/tests/phpunit/includes/objectcache/RedisBagOStuffTest.php b/tests/phpunit/unit/includes/objectcache/RedisBagOStuffTest.php
similarity index 94%
rename from tests/phpunit/includes/objectcache/RedisBagOStuffTest.php
rename to tests/phpunit/unit/includes/objectcache/RedisBagOStuffTest.php
index df5614d8c1..e35e373523 100644
--- a/tests/phpunit/includes/objectcache/RedisBagOStuffTest.php
+++ b/tests/phpunit/unit/includes/objectcache/RedisBagOStuffTest.php
@@ -5,9 +5,7 @@ use Wikimedia\TestingAccessWrapper;
 /**
  * @group BagOStuff
  */
-class RedisBagOStuffTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
+class RedisBagOStuffTest extends MediaWikiUnitTestCase {
 
 	/** @var RedisBagOStuff */
 	private $cache;
diff --git a/tests/phpunit/includes/registration/VersionCheckerTest.php b/tests/phpunit/unit/includes/registration/VersionCheckerTest.php
similarity index 98%
rename from tests/phpunit/includes/registration/VersionCheckerTest.php
rename to tests/phpunit/unit/includes/registration/VersionCheckerTest.php
index e824e3f02c..8b6a963a43 100644
--- a/tests/phpunit/includes/registration/VersionCheckerTest.php
+++ b/tests/phpunit/unit/includes/registration/VersionCheckerTest.php
@@ -3,10 +3,7 @@
 /**
  * @covers VersionChecker
  */
-class VersionCheckerTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
-	use PHPUnit4And6Compat;
+class VersionCheckerTest extends MediaWikiUnitTestCase {
 
 	/**
 	 * @dataProvider provideMediaWikiCheck
diff --git a/tests/phpunit/includes/search/SearchSuggestionSetTest.php b/tests/phpunit/unit/includes/search/SearchSuggestionSetTest.php
similarity index 98%
rename from tests/phpunit/includes/search/SearchSuggestionSetTest.php
rename to tests/phpunit/unit/includes/search/SearchSuggestionSetTest.php
index 02fa5e9cac..fb0309def5 100644
--- a/tests/phpunit/includes/search/SearchSuggestionSetTest.php
+++ b/tests/phpunit/unit/includes/search/SearchSuggestionSetTest.php
@@ -19,7 +19,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-class SearchSuggestionSetTest extends \PHPUnit\Framework\TestCase {
+class SearchSuggestionSetTest extends \MediaWikiUnitTestCase {
 	/**
 	 * Test that adding a new suggestion at the end
 	 * will keep proper score ordering
diff --git a/tests/phpunit/includes/shell/CommandFactoryTest.php b/tests/phpunit/unit/includes/shell/CommandFactoryTest.php
similarity index 92%
rename from tests/phpunit/includes/shell/CommandFactoryTest.php
rename to tests/phpunit/unit/includes/shell/CommandFactoryTest.php
index b031431af7..e27fe34b3a 100644
--- a/tests/phpunit/includes/shell/CommandFactoryTest.php
+++ b/tests/phpunit/unit/includes/shell/CommandFactoryTest.php
@@ -9,9 +9,7 @@ use Wikimedia\TestingAccessWrapper;
 /**
  * @group Shell
  */
-class CommandFactoryTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
+class CommandFactoryTest extends MediaWikiUnitTestCase {
 
 	/**
 	 * @covers MediaWiki\Shell\CommandFactory::create
diff --git a/tests/phpunit/includes/site/SiteExporterTest.php b/tests/phpunit/unit/includes/site/SiteExporterTest.php
similarity index 95%
rename from tests/phpunit/includes/site/SiteExporterTest.php
rename to tests/phpunit/unit/includes/site/SiteExporterTest.php
index 97a43f8d5b..dcf51ac541 100644
--- a/tests/phpunit/includes/site/SiteExporterTest.php
+++ b/tests/phpunit/unit/includes/site/SiteExporterTest.php
@@ -27,10 +27,7 @@
  *
  * @author Daniel Kinzler
  */
-class SiteExporterTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
-	use PHPUnit4And6Compat;
+class SiteExporterTest extends MediaWikiUnitTestCase {
 
 	public function testConstructor_InvalidArgument() {
 		$this->setExpectedException( InvalidArgumentException::class );
@@ -67,7 +64,7 @@ class SiteExporterTest extends PHPUnit\Framework\TestCase {
 		$this->assertContains( '</sites>', $xml );
 
 		// NOTE: HHVM (at least on wmf Jenkins) doesn't like file URLs.
-		$xsdFile = __DIR__ . '/../../../../docs/sitelist-1.0.xsd';
+		$xsdFile = __DIR__ . '/../../../../../docs/sitelist-1.0.xsd';
 		$xsdData = file_get_contents( $xsdFile );
 
 		$document = new DOMDocument();
diff --git a/tests/phpunit/includes/site/SiteImporterTest.php b/tests/phpunit/unit/includes/site/SiteImporterTest.php
similarity index 98%
rename from tests/phpunit/includes/site/SiteImporterTest.php
rename to tests/phpunit/unit/includes/site/SiteImporterTest.php
index dbdbd6fcc2..d4e4103c39 100644
--- a/tests/phpunit/includes/site/SiteImporterTest.php
+++ b/tests/phpunit/unit/includes/site/SiteImporterTest.php
@@ -27,10 +27,7 @@
  *
  * @author Daniel Kinzler
  */
-class SiteImporterTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
-	use PHPUnit4And6Compat;
+class SiteImporterTest extends MediaWikiUnitTestCase {
 
 	private function newSiteImporter( array $expectedSites, $errorCount ) {
 		$store = $this->getMockBuilder( SiteStore::class )->getMock();
diff --git a/tests/phpunit/includes/site/SiteImporterTest.xml b/tests/phpunit/unit/includes/site/SiteImporterTest.xml
similarity index 100%
rename from tests/phpunit/includes/site/SiteImporterTest.xml
rename to tests/phpunit/unit/includes/site/SiteImporterTest.xml
diff --git a/tests/phpunit/includes/tidy/RemexDriverTest.php b/tests/phpunit/unit/includes/tidy/RemexDriverTest.php
similarity index 99%
rename from tests/phpunit/includes/tidy/RemexDriverTest.php
rename to tests/phpunit/unit/includes/tidy/RemexDriverTest.php
index 5ad8416b81..555aeae7d1 100644
--- a/tests/phpunit/includes/tidy/RemexDriverTest.php
+++ b/tests/phpunit/unit/includes/tidy/RemexDriverTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class RemexDriverTest extends MediaWikiTestCase {
+class RemexDriverTest extends MediaWikiUnitTestCase {
 	private static $remexTidyTestData = [
 		[
 			'Empty string',
diff --git a/tests/phpunit/includes/tidy/html5lib-tests.json b/tests/phpunit/unit/includes/tidy/html5lib-tests.json
similarity index 100%
rename from tests/phpunit/includes/tidy/html5lib-tests.json
rename to tests/phpunit/unit/includes/tidy/html5lib-tests.json
diff --git a/tests/phpunit/includes/utils/AvroValidatorTest.php b/tests/phpunit/unit/includes/utils/AvroValidatorTest.php
similarity index 96%
rename from tests/phpunit/includes/utils/AvroValidatorTest.php
rename to tests/phpunit/unit/includes/utils/AvroValidatorTest.php
index cf45f9fd57..bdf493dfa4 100644
--- a/tests/phpunit/includes/utils/AvroValidatorTest.php
+++ b/tests/phpunit/unit/includes/utils/AvroValidatorTest.php
@@ -12,9 +12,7 @@
  * @group IP
  * @covers AvroValidator
  */
-class AvroValidatorTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
+class AvroValidatorTest extends MediaWikiUnitTestCase {
 
 	public function setUp() {
 		if ( !class_exists( 'AvroSchema' ) ) {
diff --git a/tests/phpunit/includes/utils/ClassCollectorTest.php b/tests/phpunit/unit/includes/utils/ClassCollectorTest.php
similarity index 94%
rename from tests/phpunit/includes/utils/ClassCollectorTest.php
rename to tests/phpunit/unit/includes/utils/ClassCollectorTest.php
index 6f8aa52720..6ce5e9d039 100644
--- a/tests/phpunit/includes/utils/ClassCollectorTest.php
+++ b/tests/phpunit/unit/includes/utils/ClassCollectorTest.php
@@ -3,9 +3,7 @@
 /**
  * @covers ClassCollector
  */
-class ClassCollectorTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
+class ClassCollectorTest extends MediaWikiUnitTestCase {
 
 	public static function provideCases() {
 		return [
diff --git a/tests/phpunit/includes/utils/MWCryptHashTest.php b/tests/phpunit/unit/includes/utils/MWCryptHashTest.php
similarity index 94%
rename from tests/phpunit/includes/utils/MWCryptHashTest.php
rename to tests/phpunit/unit/includes/utils/MWCryptHashTest.php
index 94705bff48..3a9f48cbb5 100644
--- a/tests/phpunit/includes/utils/MWCryptHashTest.php
+++ b/tests/phpunit/unit/includes/utils/MWCryptHashTest.php
@@ -5,9 +5,7 @@
  *
  * @covers MWCryptHash
  */
-class MWCryptHashTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
+class MWCryptHashTest extends MediaWikiUnitTestCase {
 
 	public function testHashLength() {
 		if ( MWCryptHash::hashAlgo() !== 'whirlpool' ) {
diff --git a/tests/phpunit/includes/utils/MWRestrictionsTest.php b/tests/phpunit/unit/includes/utils/MWRestrictionsTest.php
similarity index 98%
rename from tests/phpunit/includes/utils/MWRestrictionsTest.php
rename to tests/phpunit/unit/includes/utils/MWRestrictionsTest.php
index abdfbb1459..bb7fc53a17 100644
--- a/tests/phpunit/includes/utils/MWRestrictionsTest.php
+++ b/tests/phpunit/unit/includes/utils/MWRestrictionsTest.php
@@ -1,7 +1,5 @@
 <?php
-class MWRestrictionsTest extends PHPUnit\Framework\TestCase {
-
-	use MediaWikiCoversValidator;
+class MWRestrictionsTest extends MediaWikiUnitTestCase {
 
 	protected static $restrictionsForChecks;
 
-- 
2.20.1