From c7e8c25e8fd7ec3fa188961fca7361452d9adbb3 Mon Sep 17 00:00:00 2001
From: Adam Roses Wight <awight@wikimedia.org>
Date: Tue, 16 Jan 2018 13:20:31 -0500
Subject: [PATCH] New namespace MediaWiki\Tests\Maintenance

Bug: T184775
Change-Id: I041b8eb4f1ef3cf882a8082ff3f208604b8edf96
---
 tests/common/TestsAutoLoader.php                 |  2 +-
 tests/phpunit/maintenance/BenchmarkerTest.php    |  6 ++++--
 tests/phpunit/maintenance/DumpTestCase.php       |  9 +++++++++
 tests/phpunit/maintenance/MaintenanceTest.php    |  4 ++++
 tests/phpunit/maintenance/backupPrefetchTest.php |  5 +++++
 tests/phpunit/maintenance/backupTextPassTest.php | 11 ++++++++++-
 tests/phpunit/maintenance/backup_LogTest.php     |  9 +++++++++
 tests/phpunit/maintenance/backup_PageTest.php    | 10 +++++++++-
 tests/phpunit/maintenance/categoriesRdfTest.php  |  5 +++++
 tests/phpunit/maintenance/fetchTextTest.php      | 10 ++++++++++
 10 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index a51008edb3..1c41a6d07b 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -150,7 +150,7 @@ $wgAutoloadClasses += [
 	'GenericArrayObjectTest' => "$testDir/phpunit/includes/libs/GenericArrayObjectTest.php",
 
 	# tests/phpunit/maintenance
-	'DumpTestCase' => "$testDir/phpunit/maintenance/DumpTestCase.php",
+	'MediaWiki\Tests\Maintenance\DumpTestCase' => "$testDir/phpunit/maintenance/DumpTestCase.php",
 
 	# tests/phpunit/media
 	'FakeDimensionFile' => "$testDir/phpunit/includes/media/FakeDimensionFile.php",
diff --git a/tests/phpunit/maintenance/BenchmarkerTest.php b/tests/phpunit/maintenance/BenchmarkerTest.php
index ec570e2311..83e39cbe63 100644
--- a/tests/phpunit/maintenance/BenchmarkerTest.php
+++ b/tests/phpunit/maintenance/BenchmarkerTest.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Maintenance;
+
+use Benchmarker;
+use PHPUnit_Framework_TestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -7,8 +11,6 @@ use Wikimedia\TestingAccessWrapper;
  */
 class BenchmarkerTest extends PHPUnit_Framework_TestCase {
 
-	use MediaWikiCoversValidator;
-
 	public function testBenchSimple() {
 		$bench = $this->getMockBuilder( Benchmarker::class )
 			->setMethods( [ 'execute', 'output' ] )
diff --git a/tests/phpunit/maintenance/DumpTestCase.php b/tests/phpunit/maintenance/DumpTestCase.php
index 58cb6f3902..c872993adf 100644
--- a/tests/phpunit/maintenance/DumpTestCase.php
+++ b/tests/phpunit/maintenance/DumpTestCase.php
@@ -1,5 +1,14 @@
 <?php
 
+namespace MediaWiki\Tests\Maintenance;
+
+use ContentHandler;
+use ExecutableFinder;
+use MediaWikiLangTestCase;
+use Page;
+use User;
+use XMLReader;
+
 /**
  * Base TestCase for dumps
  */
diff --git a/tests/phpunit/maintenance/MaintenanceTest.php b/tests/phpunit/maintenance/MaintenanceTest.php
index 253327b862..2813c58351 100644
--- a/tests/phpunit/maintenance/MaintenanceTest.php
+++ b/tests/phpunit/maintenance/MaintenanceTest.php
@@ -1,6 +1,10 @@
 <?php
 
+namespace MediaWiki\Tests\Maintenance;
+
+use Maintenance;
 use MediaWiki\MediaWikiServices;
+use MediaWikiTestCase;
 
 /**
  * Makes parts of Maintenance class API visible for testing, and makes up for a
diff --git a/tests/phpunit/maintenance/backupPrefetchTest.php b/tests/phpunit/maintenance/backupPrefetchTest.php
index 0e2e1453ea..8824c7af58 100644
--- a/tests/phpunit/maintenance/backupPrefetchTest.php
+++ b/tests/phpunit/maintenance/backupPrefetchTest.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace MediaWiki\Tests\Maintenance;
+
+use BaseDump;
+use MediaWikiTestCase;
+
 /**
  * Tests for BaseDump
  *
diff --git a/tests/phpunit/maintenance/backupTextPassTest.php b/tests/phpunit/maintenance/backupTextPassTest.php
index 0a1f3b4e88..ce7197dc62 100644
--- a/tests/phpunit/maintenance/backupTextPassTest.php
+++ b/tests/phpunit/maintenance/backupTextPassTest.php
@@ -1,5 +1,14 @@
 <?php
 
+namespace MediaWiki\Tests\Maintenance;
+
+use MediaWikiLangTestCase;
+use TextContentHandler;
+use TextPassDumper;
+use Title;
+use WikiExporter;
+use WikiPage;
+
 require_once __DIR__ . "/../../../maintenance/dumpTextPass.php";
 
 /**
@@ -34,7 +43,7 @@ class TextPassDumperDatabaseTest extends DumpTestCase {
 		$this->tablesUsed[] = 'text';
 
 		$this->mergeMwGlobalArrayValue( 'wgContentHandlers', [
-			"BackupTextPassTestModel" => "BackupTextPassTestModelHandler"
+			"BackupTextPassTestModel" => BackupTextPassTestModelHandler::class,
 		] );
 
 		$ns = $this->getDefaultWikitextNS();
diff --git a/tests/phpunit/maintenance/backup_LogTest.php b/tests/phpunit/maintenance/backup_LogTest.php
index 91e1b1e7bc..c215b9973d 100644
--- a/tests/phpunit/maintenance/backup_LogTest.php
+++ b/tests/phpunit/maintenance/backup_LogTest.php
@@ -1,4 +1,13 @@
 <?php
+
+namespace MediaWiki\Tests\Maintenance;
+
+use DumpBackup;
+use ManualLogEntry;
+use Title;
+use User;
+use WikiExporter;
+
 /**
  * Tests for log dumps of BackupDumper
  *
diff --git a/tests/phpunit/maintenance/backup_PageTest.php b/tests/phpunit/maintenance/backup_PageTest.php
index 554d5f66c9..34ae538a10 100644
--- a/tests/phpunit/maintenance/backup_PageTest.php
+++ b/tests/phpunit/maintenance/backup_PageTest.php
@@ -1,4 +1,13 @@
 <?php
+
+namespace MediaWiki\Tests\Maintenance;
+
+use DumpBackup;
+use Language;
+use Title;
+use WikiExporter;
+use WikiPage;
+
 /**
  * Tests for page dumps of BackupDumper
  *
@@ -6,7 +15,6 @@
  * @group Dump
  * @covers BackupDumper
  */
-
 class BackupDumperPageTest extends DumpTestCase {
 
 	// We'll add several pages, revision and texts. The following variables hold the
diff --git a/tests/phpunit/maintenance/categoriesRdfTest.php b/tests/phpunit/maintenance/categoriesRdfTest.php
index b51c14c495..f03a201fed 100644
--- a/tests/phpunit/maintenance/categoriesRdfTest.php
+++ b/tests/phpunit/maintenance/categoriesRdfTest.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace MediaWiki\Tests\Maintenance;
+
+use DumpCategoriesAsRdf;
+use MediaWikiLangTestCase;
+
 /**
  * @covers CategoriesRdf
  * @covers DumpCategoriesAsRdf
diff --git a/tests/phpunit/maintenance/fetchTextTest.php b/tests/phpunit/maintenance/fetchTextTest.php
index 5a28bfb5ff..14dfb4448b 100644
--- a/tests/phpunit/maintenance/fetchTextTest.php
+++ b/tests/phpunit/maintenance/fetchTextTest.php
@@ -1,5 +1,15 @@
 <?php
 
+namespace MediaWiki\Tests\Maintenance;
+
+use ContentHandler;
+use FetchText;
+use MediaWikiTestCase;
+use MWException;
+use Title;
+use PHPUnit_Framework_ExpectationFailedException;
+use WikiPage;
+
 require_once __DIR__ . "/../../../maintenance/fetchText.php";
 
 /**
-- 
2.20.1