diff options
author | Timo Tijhof <ttijhof@wikimedia.org> | 2012-10-08 12:56:20 +0200 |
---|---|---|
committer | Timo Tijhof <ttijhof@wikimedia.org> | 2012-10-09 03:01:51 +0200 |
commit | 181c7cdc8e9b019ff3c7cfa40452a7791be98dff (patch) | |
tree | e035101385b13a886c4ca9dcbde663c2fc59b4ba /tests/phpunit/includes/FauxResponseTest.php | |
parent | d1c8bf85f86e3a535bcb1c484855631ae4930036 (diff) | |
download | mediawikicore-181c7cdc8e9b019ff3c7cfa40452a7791be98dff.tar.gz mediawikicore-181c7cdc8e9b019ff3c7cfa40452a7791be98dff.zip |
Clean and repair many phpunit tests (+ fix implied configuration)
This commit depends on the introduction of
MediaWikiTestCase::setMwGlobals in change Iccf6ea81f4.
Various tests already set their globals, but forgot to restore
them afterwards, or forgot to call the parent setUp, tearDown...
Either way they won't have to anymore with setMwGlobals.
Consistent use of function characteristics:
* protected function setUp
* protected function tearDown
* public static function (provide..)
(Matching the function signature with PHPUnit/Framework/TestCase.php)
Replaces:
* public function (setUp|tearDown)\(
* protected function $1(
* \tfunction (setUp|tearDown)\(
* \tprotected function $1(
* \tfunction (data|provide)\(
* \tpublic static function $1\(
Also renamed a few "data#", "provider#" and "provides#" functions
to "provide#" for consistency. This also removes confusion where
the /media tests had a few private methods called dataFile(),
which were sometimes expected to be data providers.
Fixes:
TimestampTest often failed due to a previous test setting a
different language (it tests "1 hour ago" so need to make sure
it is set to English).
MWNamespaceTest became a lot cleaner now that it executes with
a known context. Though the now-redundant code that was removed
didn't work anyway because wgContentNamespaces isn't keyed by
namespace id, it had them was values...
FileBackendTest:
* Fixed: "PHP Fatal: Using $this when not in object context"
HttpTest
* Added comment about:
"PHP Fatal: Call to protected MWHttpRequest::__construct()"
(too much unrelated code to fix in this commit)
ExternalStoreTest
* Add an assertTrue as well, without it the test is useless
because regardless of whether wgExternalStores is true or false
it only uses it if it is an array.
Change-Id: I9d2b148e57bada64afeb7d5a99bec0e58f8e1561
Diffstat (limited to 'tests/phpunit/includes/FauxResponseTest.php')
-rw-r--r-- | tests/phpunit/includes/FauxResponseTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/phpunit/includes/FauxResponseTest.php b/tests/phpunit/includes/FauxResponseTest.php index c0420049133c..35c7f8f42b28 100644 --- a/tests/phpunit/includes/FauxResponseTest.php +++ b/tests/phpunit/includes/FauxResponseTest.php @@ -25,7 +25,7 @@ class FauxResponseTest extends MediaWikiTestCase { var $response; - function setUp() { + protected function setUp() { $this->response = new FauxResponse; } |