1 files changed, 15 insertions, 12 deletions

diff --git a/tests/phpunit/includes/cache/GenderCacheTest.php b/tests/phpunit/includes/cache/GenderCacheTest.php
index a8b987e2..ce2db5d7 100644
--- a/tests/phpunit/includes/cache/GenderCacheTest.php
+++ b/tests/phpunit/includes/cache/GenderCacheTest.php
@@ -6,7 +6,7 @@
  */
 class GenderCacheTest extends MediaWikiLangTestCase {
 
-	function setUp() {
+	protected function setUp() {
 		global $wgDefaultUserOptions;
 		parent::setUp();
 		//ensure the correct default gender
@@ -15,7 +15,7 @@ class GenderCacheTest extends MediaWikiLangTestCase {
 
 	function addDBData() {
 		$user = User::newFromName( 'UTMale' );
-		if( $user->getID() == 0 ) {
+		if ( $user->getID() == 0 ) {
 			$user->addToDatabase();
 			$user->setPassword( 'UTMalePassword' );
 		}
@@ -24,7 +24,7 @@ class GenderCacheTest extends MediaWikiLangTestCase {
 		$user->saveSettings();
 
 		$user = User::newFromName( 'UTFemale' );
-		if( $user->getID() == 0 ) {
+		if ( $user->getID() == 0 ) {
 			$user->addToDatabase();
 			$user->setPassword( 'UTFemalePassword' );
 		}
@@ -33,7 +33,7 @@ class GenderCacheTest extends MediaWikiLangTestCase {
 		$user->saveSettings();
 
 		$user = User::newFromName( 'UTDefaultGender' );
-		if( $user->getID() == 0 ) {
+		if ( $user->getID() == 0 ) {
 			$user->addToDatabase();
 			$user->setPassword( 'UTDefaultGenderPassword' );
 		}
@@ -45,9 +45,10 @@ class GenderCacheTest extends MediaWikiLangTestCase {
 	/**
 	 * test usernames
 	 *
-	 * @dataProvider dataUserName
+	 * @dataProvider provideUserGenders
+	 * @covers GenderCache::getGenderOf
 	 */
-	function testUserName( $username, $expectedGender ) {
+	public function testUserName( $username, $expectedGender ) {
 		$genderCache = GenderCache::singleton();
 		$gender = $genderCache->getGenderOf( $username );
 		$this->assertEquals( $gender, $expectedGender, "GenderCache normal" );
@@ -56,16 +57,17 @@ class GenderCacheTest extends MediaWikiLangTestCase {
 	/**
 	 * genderCache should work with user objects, too
 	 *
-	 * @dataProvider dataUserName
+	 * @dataProvider provideUserGenders
+	 * @covers GenderCache::getGenderOf
 	 */
-	function testUserObjects( $username, $expectedGender ) {
+	public function testUserObjects( $username, $expectedGender ) {
 		$genderCache = GenderCache::singleton();
 		$user = User::newFromName( $username );
 		$gender = $genderCache->getGenderOf( $user );
 		$this->assertEquals( $gender, $expectedGender, "GenderCache normal" );
 	}
 
-	function dataUserName() {
+	public static function provideUserGenders() {
 		return array(
 			array( 'UTMale', 'male' ),
 			array( 'UTFemale', 'female' ),
@@ -81,15 +83,16 @@ class GenderCacheTest extends MediaWikiLangTestCase {
 	 * test strip of subpages to avoid unnecessary queries
 	 * against the never existing username
 	 *
-	 * @dataProvider dataStripSubpages
+	 * @dataProvider provideStripSubpages
+	 * @covers GenderCache::getGenderOf
 	 */
-	function testStripSubpages( $pageWithSubpage, $expectedGender ) {
+	public function testStripSubpages( $pageWithSubpage, $expectedGender ) {
 		$genderCache = GenderCache::singleton();
 		$gender = $genderCache->getGenderOf( $pageWithSubpage );
 		$this->assertEquals( $gender, $expectedGender, "GenderCache must strip of subpages" );
 	}
 
-	function dataStripSubpages() {
+	public static function provideStripSubpages() {
 		return array(
 			array( 'UTMale/subpage', 'male' ),
 			array( 'UTFemale/subpage', 'female' ),