X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fcache%2FGenderCacheTest.php;h=ee3db3e8a6cc5423ff6d92ef5ee9560191b88655;hb=335e7bcfe177322576b4404e1daa1fea6e59bc7a;hp=d62ee20436e1475f9fd810661ebc6d9bad0fc96b;hpb=3415646e0a0a0c3225a6a7d184286a4f811e9119;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/cache/GenderCacheTest.php b/tests/phpunit/includes/cache/GenderCacheTest.php
index d62ee20436..ee3db3e8a6 100644
--- a/tests/phpunit/includes/cache/GenderCacheTest.php
+++ b/tests/phpunit/includes/cache/GenderCacheTest.php
@@ -1,100 +1,101 @@
-<?php
-
-/**
- * @group Database
- * @group Cache
- */
-class GenderCacheTest extends MediaWikiLangTestCase {
-
-	function setUp() {
-		parent::setUp();
-		//ensure the correct default gender
-		$wgDefaultUserOptions['gender'] = 'unknown';
-	}
-
-	function addDBData() {
-		$user = User::newFromName( 'UTMale' );
-		if( $user->getID() == 0 ) {
-			$user->addToDatabase();
-			$user->setPassword( 'UTMalePassword' );
-		}
-		//ensure the right gender
-		$user->setOption( 'gender', 'male' );
-		$user->saveSettings();
-
-		$user = User::newFromName( 'UTFemale' );
-		if( $user->getID() == 0 ) {
-			$user->addToDatabase();
-			$user->setPassword( 'UTFemalePassword' );
-		}
-		//ensure the right gender
-		$user->setOption( 'gender', 'female' );
-		$user->saveSettings();
-
-		$user = User::newFromName( 'UTDefaultGender' );
-		if( $user->getID() == 0 ) {
-			$user->addToDatabase();
-			$user->setPassword( 'UTDefaultGenderPassword' );
-		}
-		//ensure the default gender
-		$user->setOption( 'gender', null );
-		$user->saveSettings();
-	}
-
-	/**
-	 * test usernames
-	 *
-	 * @dataProvider dataUserName
-	 */
-	function testUserName( $username, $expectedGender ) {
-		$genderCache = GenderCache::singleton();
-		$gender = $genderCache->getGenderOf( $username );
-		$this->assertEquals( $gender, $expectedGender, "GenderCache normal" );
-	}
-
-	/**
-	 * genderCache should work with user objects, too
-	 *
-	 * @dataProvider dataUserName
-	 */
-	function testUserObjects( $username, $expectedGender ) {
-		$genderCache = GenderCache::singleton();
-		$user = User::newFromName( $username );
-		$gender = $genderCache->getGenderOf( $user );
-		$this->assertEquals( $gender, $expectedGender, "GenderCache normal" );
-	}
-
-	function dataUserName() {
-		return array(
-			array( 'UTMale', 'male' ),
-			array( 'UTFemale', 'female' ),
-			array( 'UTDefaultGender', 'unknown' ),
-			array( 'UTNotExist', 'unknown' ),
-			//some not valid user
-			array( '127.0.0.1', 'unknown' ),
-			array( 'user@test', 'unknown' ),
-		);
-	}
-
-	/**
-	 * test strip of subpages to avoid unnecessary queries
-	 * against the never existing username
-	 *
-	 * @dataProvider dataStripSubpages
-	 */
-	function testStripSubpages( $pageWithSubpage, $expectedGender ) {
-		$genderCache = GenderCache::singleton();
-		$gender = $genderCache->getGenderOf( $pageWithSubpage );
-		$this->assertEquals( $gender, $expectedGender, "GenderCache must strip of subpages" );
-	}
-
-	function dataStripSubpages() {
-		return array(
-			array( 'UTMale/subpage', 'male' ),
-			array( 'UTFemale/subpage', 'female' ),
-			array( 'UTDefaultGender/subpage', 'unknown' ),
-			array( 'UTNotExist/subpage', 'unknown' ),
-			array( '127.0.0.1/subpage', 'unknown' ),
-		);
-	}
-}
+<?php
+
+/**
+ * @group Database
+ * @group Cache
+ */
+class GenderCacheTest extends MediaWikiLangTestCase {
+
+	protected function setUp() {
+		global $wgDefaultUserOptions;
+		parent::setUp();
+		//ensure the correct default gender
+		$wgDefaultUserOptions['gender'] = 'unknown';
+	}
+
+	function addDBData() {
+		$user = User::newFromName( 'UTMale' );
+		if ( $user->getID() == 0 ) {
+			$user->addToDatabase();
+			$user->setPassword( 'UTMalePassword' );
+		}
+		//ensure the right gender
+		$user->setOption( 'gender', 'male' );
+		$user->saveSettings();
+
+		$user = User::newFromName( 'UTFemale' );
+		if ( $user->getID() == 0 ) {
+			$user->addToDatabase();
+			$user->setPassword( 'UTFemalePassword' );
+		}
+		//ensure the right gender
+		$user->setOption( 'gender', 'female' );
+		$user->saveSettings();
+
+		$user = User::newFromName( 'UTDefaultGender' );
+		if ( $user->getID() == 0 ) {
+			$user->addToDatabase();
+			$user->setPassword( 'UTDefaultGenderPassword' );
+		}
+		//ensure the default gender
+		$user->setOption( 'gender', null );
+		$user->saveSettings();
+	}
+
+	/**
+	 * test usernames
+	 *
+	 * @dataProvider provideUserGenders
+	 */
+	function testUserName( $username, $expectedGender ) {
+		$genderCache = GenderCache::singleton();
+		$gender = $genderCache->getGenderOf( $username );
+		$this->assertEquals( $gender, $expectedGender, "GenderCache normal" );
+	}
+
+	/**
+	 * genderCache should work with user objects, too
+	 *
+	 * @dataProvider provideUserGenders
+	 */
+	function testUserObjects( $username, $expectedGender ) {
+		$genderCache = GenderCache::singleton();
+		$user = User::newFromName( $username );
+		$gender = $genderCache->getGenderOf( $user );
+		$this->assertEquals( $gender, $expectedGender, "GenderCache normal" );
+	}
+
+	public static function provideUserGenders() {
+		return array(
+			array( 'UTMale', 'male' ),
+			array( 'UTFemale', 'female' ),
+			array( 'UTDefaultGender', 'unknown' ),
+			array( 'UTNotExist', 'unknown' ),
+			//some not valid user
+			array( '127.0.0.1', 'unknown' ),
+			array( 'user@test', 'unknown' ),
+		);
+	}
+
+	/**
+	 * test strip of subpages to avoid unnecessary queries
+	 * against the never existing username
+	 *
+	 * @dataProvider provideStripSubpages
+	 */
+	function testStripSubpages( $pageWithSubpage, $expectedGender ) {
+		$genderCache = GenderCache::singleton();
+		$gender = $genderCache->getGenderOf( $pageWithSubpage );
+		$this->assertEquals( $gender, $expectedGender, "GenderCache must strip of subpages" );
+	}
+
+	public static function provideStripSubpages() {
+		return array(
+			array( 'UTMale/subpage', 'male' ),
+			array( 'UTFemale/subpage', 'female' ),
+			array( 'UTDefaultGender/subpage', 'unknown' ),
+			array( 'UTNotExist/subpage', 'unknown' ),
+			array( '127.0.0.1/subpage', 'unknown' ),
+		);
+	}
+}