jenkins-bot has submitted this change and it was merged.
Change subject: Remove require_once from some tests by adding classes to
TestsAutoLoader
......................................................................
Remove require_once from some tests by adding classes to TestsAutoLoader
Change-Id: If6d0a72acb98e0971fcce2facb239b67cbe639a5
---
M tests/TestsAutoLoader.php
M tests/phpunit/includes/api/ApiUploadTest.php
M tests/phpunit/includes/api/query/ApiQueryBasicTest.php
M tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
M tests/phpunit/includes/api/query/ApiQueryContinueTest.php
M tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
M tests/phpunit/includes/db/TestORMRowTest.php
M tests/phpunit/includes/diff/DiffOpTest.php
8 files changed, 7 insertions(+), 20 deletions(-)
Approvals:
Aude: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/tests/TestsAutoLoader.php b/tests/TestsAutoLoader.php
index 7391afd..d35ec26 100644
--- a/tests/TestsAutoLoader.php
+++ b/tests/TestsAutoLoader.php
@@ -55,7 +55,10 @@
# tests/phpunit/includes/api
'ApiFormatTestBase' =>
"$testDir/phpunit/includes/api/format/ApiFormatTestBase.php",
+ 'ApiQueryTestBase' =>
"$testDir/phpunit/includes/api/query/ApiQueryTestBase.php",
+ 'ApiQueryContinueTestBase' =>
"$testDir/phpunit/includes/api/query/ApiQueryContinueTestBase.php",
'ApiTestCase' => "$testDir/phpunit/includes/api/ApiTestCase.php",
+ 'ApiTestCaseUpload' =>
"$testDir/phpunit/includes/api/ApiTestCaseUpload.php",
'ApiTestContext' => "$testDir/phpunit/includes/api/ApiTestContext.php",
'MockApi' => "$testDir/phpunit/includes/api/MockApi.php",
'MockApiQueryBase' =>
"$testDir/phpunit/includes/api/MockApiQueryBase.php",
@@ -79,6 +82,9 @@
'PageORMTableForTesting' =>
"$testDir/phpunit/includes/db/ORMTableTest.php",
'DatabaseTestHelper' =>
"$testDir/phpunit/includes/db/DatabaseTestHelper.php",
+ # tests/phpunit/includes/diff
+ 'FakeDiffOp' => "$testDir/phpunit/includes/diff/FakeDiffOp.php",
+
# tests/phpunit/includes/passwords
'PasswordTestCase' =>
"$testDir/phpunit/includes/password/PasswordTestCase.php",
diff --git a/tests/phpunit/includes/api/ApiUploadTest.php
b/tests/phpunit/includes/api/ApiUploadTest.php
index 8ea761f..7fdefb6 100644
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -17,8 +17,6 @@
// @todo Port the other Upload tests, and other API tests to this framework
-require_once 'ApiTestCaseUpload.php';
-
/**
* @group Database
* @group Broken
diff --git a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
index e486c4f..fa0e4cb 100644
--- a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
@@ -23,8 +23,6 @@
* @file
*/
-require_once 'ApiQueryTestBase.php';
-
/**
* These tests validate basic functionality of the api query module
*
diff --git a/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
b/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
index 46f1b7b..2431761 100644
--- a/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
@@ -18,8 +18,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-require_once 'ApiQueryContinueTestBase.php';
-
/**
* @group API
* @group Database
diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
index 56130f1..de9965b 100644
--- a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
@@ -18,8 +18,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-require_once 'ApiQueryContinueTestBase.php';
-
/**
* These tests validate the new continue functionality of the api query module
by
* doing multiple requests with varying parameters, merging the results, and
checking
diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
index a5f2684..ce2f70d 100644
--- a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
@@ -21,9 +21,6 @@
*
* @file
*/
-
-require_once 'ApiQueryTestBase.php';
-
abstract class ApiQueryContinueTestBase extends ApiQueryTestBase {
/**
diff --git a/tests/phpunit/includes/db/TestORMRowTest.php
b/tests/phpunit/includes/db/TestORMRowTest.php
index ca31cf9..a5c19f9 100644
--- a/tests/phpunit/includes/db/TestORMRowTest.php
+++ b/tests/phpunit/includes/db/TestORMRowTest.php
@@ -35,13 +35,9 @@
* that hold the first tests in a pending state awaiting access to the
database.
* @group medium
*
+ * @covers TestORMRow
* @licence GNU GPL v2+
* @author Jeroen De Dauw < [email protected] >
- */
-require_once __DIR__ . "/ORMRowTest.php";
-
-/**
- * @covers TestORMRow
*/
class TestORMRowTest extends ORMRowTest {
diff --git a/tests/phpunit/includes/diff/DiffOpTest.php
b/tests/phpunit/includes/diff/DiffOpTest.php
index d89b89f..a685bf4 100644
--- a/tests/phpunit/includes/diff/DiffOpTest.php
+++ b/tests/phpunit/includes/diff/DiffOpTest.php
@@ -1,8 +1,4 @@
<?php
-
-//Load our FakeDiffOp
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'FakeDiffOp.php';
-
/**
* @licence GNU GPL v2+
* @author Adam Shorland
--
To view, visit https://gerrit.wikimedia.org/r/172795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If6d0a72acb98e0971fcce2facb239b67cbe639a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
