dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Set lang in api createaccount regardless of $wgLoginLanguageSelector"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
cache
/
GenderCacheTest.php
diff --git
a/tests/phpunit/includes/cache/GenderCacheTest.php
b/tests/phpunit/includes/cache/GenderCacheTest.php
index
a8b987e
..
ee3db3e
100644
(file)
--- a/
tests/phpunit/includes/cache/GenderCacheTest.php
+++ b/
tests/phpunit/includes/cache/GenderCacheTest.php
@@
-6,7
+6,7
@@
*/
class GenderCacheTest extends MediaWikiLangTestCase {
*/
class GenderCacheTest extends MediaWikiLangTestCase {
- function setUp() {
+
protected
function setUp() {
global $wgDefaultUserOptions;
parent::setUp();
//ensure the correct default gender
global $wgDefaultUserOptions;
parent::setUp();
//ensure the correct default gender
@@
-15,7
+15,7
@@
class GenderCacheTest extends MediaWikiLangTestCase {
function addDBData() {
$user = User::newFromName( 'UTMale' );
function addDBData() {
$user = User::newFromName( 'UTMale' );
- if( $user->getID() == 0 ) {
+ if
( $user->getID() == 0 ) {
$user->addToDatabase();
$user->setPassword( 'UTMalePassword' );
}
$user->addToDatabase();
$user->setPassword( 'UTMalePassword' );
}
@@
-24,7
+24,7
@@
class GenderCacheTest extends MediaWikiLangTestCase {
$user->saveSettings();
$user = User::newFromName( 'UTFemale' );
$user->saveSettings();
$user = User::newFromName( 'UTFemale' );
- if( $user->getID() == 0 ) {
+ if
( $user->getID() == 0 ) {
$user->addToDatabase();
$user->setPassword( 'UTFemalePassword' );
}
$user->addToDatabase();
$user->setPassword( 'UTFemalePassword' );
}
@@
-33,7
+33,7
@@
class GenderCacheTest extends MediaWikiLangTestCase {
$user->saveSettings();
$user = User::newFromName( 'UTDefaultGender' );
$user->saveSettings();
$user = User::newFromName( 'UTDefaultGender' );
- if( $user->getID() == 0 ) {
+ if
( $user->getID() == 0 ) {
$user->addToDatabase();
$user->setPassword( 'UTDefaultGenderPassword' );
}
$user->addToDatabase();
$user->setPassword( 'UTDefaultGenderPassword' );
}
@@
-45,7
+45,7
@@
class GenderCacheTest extends MediaWikiLangTestCase {
/**
* test usernames
*
/**
* test usernames
*
- * @dataProvider
dataUserName
+ * @dataProvider
provideUserGenders
*/
function testUserName( $username, $expectedGender ) {
$genderCache = GenderCache::singleton();
*/
function testUserName( $username, $expectedGender ) {
$genderCache = GenderCache::singleton();
@@
-56,7
+56,7
@@
class GenderCacheTest extends MediaWikiLangTestCase {
/**
* genderCache should work with user objects, too
*
/**
* genderCache should work with user objects, too
*
- * @dataProvider
dataUserName
+ * @dataProvider
provideUserGenders
*/
function testUserObjects( $username, $expectedGender ) {
$genderCache = GenderCache::singleton();
*/
function testUserObjects( $username, $expectedGender ) {
$genderCache = GenderCache::singleton();
@@
-65,7
+65,7
@@
class GenderCacheTest extends MediaWikiLangTestCase {
$this->assertEquals( $gender, $expectedGender, "GenderCache normal" );
}
$this->assertEquals( $gender, $expectedGender, "GenderCache normal" );
}
-
function dataUserName
() {
+
public static function provideUserGenders
() {
return array(
array( 'UTMale', 'male' ),
array( 'UTFemale', 'female' ),
return array(
array( 'UTMale', 'male' ),
array( 'UTFemale', 'female' ),
@@
-81,7
+81,7
@@
class GenderCacheTest extends MediaWikiLangTestCase {
* test strip of subpages to avoid unnecessary queries
* against the never existing username
*
* test strip of subpages to avoid unnecessary queries
* against the never existing username
*
- * @dataProvider
data
StripSubpages
+ * @dataProvider
provide
StripSubpages
*/
function testStripSubpages( $pageWithSubpage, $expectedGender ) {
$genderCache = GenderCache::singleton();
*/
function testStripSubpages( $pageWithSubpage, $expectedGender ) {
$genderCache = GenderCache::singleton();
@@
-89,7
+89,7
@@
class GenderCacheTest extends MediaWikiLangTestCase {
$this->assertEquals( $gender, $expectedGender, "GenderCache must strip of subpages" );
}
$this->assertEquals( $gender, $expectedGender, "GenderCache must strip of subpages" );
}
-
function data
StripSubpages() {
+
public static function provide
StripSubpages() {
return array(
array( 'UTMale/subpage', 'male' ),
array( 'UTFemale/subpage', 'female' ),
return array(
array( 'UTMale/subpage', 'male' ),
array( 'UTFemale/subpage', 'female' ),