Merge "Consolidate duplicated unseen change logic and fix inconsistent code"

[lhc/web/wiklou.git] / tests / phpunit / includes / config / GlobalVarConfigTest.php

diff --git a/tests/phpunit/includes/config/GlobalVarConfigTest.php b/tests/phpunit/includes/config/GlobalVarConfigTest.php
index a6b220d..591f27d 100644 (file)
--- a/tests/phpunit/includes/config/GlobalVarConfigTest.php
+++ b/tests/phpunit/includes/config/GlobalVarConfigTest.php
@@ -7,9 +7,8 @@ class GlobalVarConfigTest extends MediaWikiTestCase {
         */
        public function testNewInstance() {
                $config = GlobalVarConfig::newInstance();
-               $this->assertInstanceOf( 'GlobalVarConfig', $config );
-               $this->maybeStashGlobal( 'wgBaz' );
-               $GLOBALS['wgBaz'] = 'somevalue';
+               $this->assertInstanceOf( GlobalVarConfig::class, $config );
+               $this->setMwGlobals( 'wgBaz', 'somevalue' );
                // Check prefix is set to 'wg'
                $this->assertEquals( 'somevalue', $config->get( 'Baz' ) );
        }
@@ -20,12 +19,10 @@ class GlobalVarConfigTest extends MediaWikiTestCase {
         */
        public function testConstructor( $prefix ) {
                $var = $prefix . 'GlobalVarConfigTest';
-               $rand = wfRandomString();
-               $this->maybeStashGlobal( $var );
-               $GLOBALS[$var] = $rand;
+               $this->setMwGlobals( $var, 'testvalue' );
                $config = new GlobalVarConfig( $prefix );
-               $this->assertInstanceOf( 'GlobalVarConfig', $config );
-               $this->assertEquals( $rand, $config->get( 'GlobalVarConfigTest' ) );
+               $this->assertInstanceOf( GlobalVarConfig::class, $config );
+               $this->assertEquals( 'testvalue', $config->get( 'GlobalVarConfigTest' ) );
        }
 
        public static function provideConstructor() {
@@ -43,9 +40,7 @@ class GlobalVarConfigTest extends MediaWikiTestCase {
         * @covers GlobalVarConfig::hasWithPrefix
         */
        public function testHas() {
-               $this->maybeStashGlobal( 'wgGlobalVarConfigTestHas' );
-               $GLOBALS['wgGlobalVarConfigTestHas'] = wfRandomString();
-               $this->maybeStashGlobal( 'wgGlobalVarConfigTestNotHas' );
+               $this->setMwGlobals( 'wgGlobalVarConfigTestHas', 'testvalue' );
                $config = new GlobalVarConfig();
                $this->assertTrue( $config->has( 'GlobalVarConfigTestHas' ) );
                $this->assertFalse( $config->has( 'GlobalVarConfigTestNotHas' ) );
@@ -83,15 +78,8 @@ class GlobalVarConfigTest extends MediaWikiTestCase {
        public function testGet( $name, $prefix, $expected ) {
                $config = new GlobalVarConfig( $prefix );
                if ( $expected === false ) {
-                       $this->setExpectedException( 'ConfigException', 'GlobalVarConfig::get: undefined option:' );
+                       $this->setExpectedException( ConfigException::class, 'GlobalVarConfig::get: undefined option:' );
                }
                $this->assertEquals( $config->get( $name ), $expected );
        }
-
-       private function maybeStashGlobal( $var ) {
-               if ( array_key_exists( $var, $GLOBALS ) ) {
-                       // Will be reset after this test is over
-                       $this->stashMwGlobals( $var );
-               }
-       }
 }