Use mergeMwGlobalArrayValue in GenderCacheTest

Also move the global setting to addDBData to let the test work
correctly, because the global is used indirectly in User::saveSettings.

Change-Id: I986d3a28e4fcc82ed84886c2970571e9fa6128be

diff --git a/tests/phpunit/includes/cache/GenderCacheTest.php b/tests/phpunit/includes/cache/GenderCacheTest.php
index ce2db5d..04fb00d 100644 (file)
--- a/tests/phpunit/includes/cache/GenderCacheTest.php
+++ b/tests/phpunit/includes/cache/GenderCacheTest.php
@@ -6,14 +6,10 @@
  */
 class GenderCacheTest extends MediaWikiLangTestCase {
 
-       protected function setUp() {
-               global $wgDefaultUserOptions;
-               parent::setUp();
+       function addDBData() {
                //ensure the correct default gender
-               $wgDefaultUserOptions['gender'] = 'unknown';
-       }
+               $this->mergeMwGlobalArrayValue( 'wgDefaultUserOptions', array( 'gender' => 'unknown' ) );
 
-       function addDBData() {
                $user = User::newFromName( 'UTMale' );
                if ( $user->getID() == 0 ) {
                        $user->addToDatabase();