jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404512 )
Change subject: New namespace MediaWiki\Tests\Maintenance
......................................................................
New namespace MediaWiki\Tests\Maintenance
Bug: T184775
Change-Id: I041b8eb4f1ef3cf882a8082ff3f208604b8edf96
---
M tests/common/TestsAutoLoader.php
M tests/phpunit/maintenance/BenchmarkerTest.php
M tests/phpunit/maintenance/DumpTestCase.php
M tests/phpunit/maintenance/MaintenanceTest.php
M tests/phpunit/maintenance/backupPrefetchTest.php
M tests/phpunit/maintenance/backupTextPassTest.php
M tests/phpunit/maintenance/backup_LogTest.php
M tests/phpunit/maintenance/backup_PageTest.php
M tests/phpunit/maintenance/categoriesRdfTest.php
M tests/phpunit/maintenance/fetchTextTest.php
10 files changed, 66 insertions(+), 5 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index a51008e..1c41a6d 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -150,7 +150,7 @@
'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 ec570e2..83e39cb 100644
--- a/tests/phpunit/maintenance/BenchmarkerTest.php
+++ b/tests/phpunit/maintenance/BenchmarkerTest.php
@@ -1,13 +1,15 @@
<?php
+namespace MediaWiki\Tests\Maintenance;
+
+use Benchmarker;
+use PHPUnit_Framework_TestCase;
use Wikimedia\TestingAccessWrapper;
/**
* @covers Benchmarker
*/
class BenchmarkerTest extends PHPUnit_Framework_TestCase {
-
- use MediaWikiCoversValidator;
public function testBenchSimple() {
$bench = $this->getMockBuilder( Benchmarker::class )
diff --git a/tests/phpunit/maintenance/DumpTestCase.php
b/tests/phpunit/maintenance/DumpTestCase.php
index 58cb6f3..c872993 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 253327b..2813c58 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 0e2e145..8824c7a 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 0a1f3b4..ce7197d 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 @@
$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 91e1b1e..c215b99 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 554d5f6..34ae538 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 b51c14c..f03a201 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 5a28bfb..14dfb44 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";
/**
--
To view, visit https://gerrit.wikimedia.org/r/404512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I041b8eb4f1ef3cf882a8082ff3f208604b8edf96
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
