aboutsummaryrefslogtreecommitdiffstats
path: root/tests/phpunit/includes
diff options
context:
space:
mode:
authorumherirrender <umherirrender_de.wp@web.de>2014-11-12 20:24:08 +0100
committerumherirrender <umherirrender_de.wp@web.de>2014-11-12 20:24:08 +0100
commitaa09312ac0fa42d2b591882b734e8c572e15fbfe (patch)
treea0f95d58bdcbc0590f2b0e4a0110396d13cc5e77 /tests/phpunit/includes
parente8ba3bba342933084b0b6622b2e69ae12a9134ac (diff)
downloadmediawikicore-aa09312ac0fa42d2b591882b734e8c572e15fbfe.tar.gz
mediawikicore-aa09312ac0fa42d2b591882b734e8c572e15fbfe.zip
Remove require_once from some tests by adding classes to TestsAutoLoader
Change-Id: If6d0a72acb98e0971fcce2facb239b67cbe639a5
Diffstat (limited to 'tests/phpunit/includes')
-rw-r--r--tests/phpunit/includes/api/ApiUploadTest.php2
-rw-r--r--tests/phpunit/includes/api/query/ApiQueryBasicTest.php2
-rw-r--r--tests/phpunit/includes/api/query/ApiQueryContinue2Test.php2
-rw-r--r--tests/phpunit/includes/api/query/ApiQueryContinueTest.php2
-rw-r--r--tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php3
-rw-r--r--tests/phpunit/includes/db/TestORMRowTest.php6
-rw-r--r--tests/phpunit/includes/diff/DiffOpTest.php4
7 files changed, 1 insertions, 20 deletions
diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php
index 8ea761f8a707..7fdefb6cad46 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 e486c4f4bc14..fa0e4cb53ab4 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 46f1b7b0ef5b..243176139aff 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 56130f116a29..de9965b6e9dd 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 a5f26849f5b3..ce2f70de251c 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 ca31cf94ee41..a5c19f9c04b5 100644
--- a/tests/phpunit/includes/db/TestORMRowTest.php
+++ b/tests/phpunit/includes/db/TestORMRowTest.php
@@ -35,14 +35,10 @@
* 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 < jeroendedauw@gmail.com >
*/
-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 d89b89feec5b..a685bf4ffa50 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