Merge "rdbms: avoid LoadBalancer::getConnection waste when using $groups"

[lhc/web/wiklou.git] / tests / phpunit / includes / skins / SkinFactoryTest.php

diff --git a/tests/phpunit/includes/skins/SkinFactoryTest.php b/tests/phpunit/includes/skins/SkinFactoryTest.php
index d3663c8..4289fd9 100644 (file)
--- a/tests/phpunit/includes/skins/SkinFactoryTest.php
+++ b/tests/phpunit/includes/skins/SkinFactoryTest.php
@@ -11,7 +11,7 @@ class SkinFactoryTest extends MediaWikiTestCase {
                        return new SkinFallback();
                } );
                $this->assertTrue( true ); // No exception thrown
-               $this->setExpectedException( 'InvalidArgumentException' );
+               $this->setExpectedException( InvalidArgumentException::class );
                $factory->register( 'invalid', 'Invalid', 'Invalid callback' );
        }
 
@@ -20,7 +20,7 @@ class SkinFactoryTest extends MediaWikiTestCase {
         */
        public function testMakeSkinWithNoBuilders() {
                $factory = new SkinFactory();
-               $this->setExpectedException( 'SkinException' );
+               $this->setExpectedException( SkinException::class );
                $factory->makeSkin( 'nobuilderregistered' );
        }
 
@@ -32,7 +32,7 @@ class SkinFactoryTest extends MediaWikiTestCase {
                $factory->register( 'unittest', 'Unittest', function () {
                        return true; // Not a Skin object
                } );
-               $this->setExpectedException( 'UnexpectedValueException' );
+               $this->setExpectedException( UnexpectedValueException::class );
                $factory->makeSkin( 'unittest' );
        }
 
@@ -46,8 +46,20 @@ class SkinFactoryTest extends MediaWikiTestCase {
                } );
 
                $skin = $factory->makeSkin( 'testfallback' );
-               $this->assertInstanceOf( 'Skin', $skin );
-               $this->assertInstanceOf( 'SkinFallback', $skin );
+               $this->assertInstanceOf( Skin::class, $skin );
+               $this->assertInstanceOf( SkinFallback::class, $skin );
+               $this->assertEquals( 'fallback', $skin->getSkinName() );
+       }
+
+       /**
+        * @covers Skin::__construct
+        * @covers Skin::getSkinName
+        */
+       public function testGetSkinName() {
+               $skin = new SkinFallback();
+               $this->assertEquals( 'fallback', $skin->getSkinName(), 'Default' );
+               $skin = new SkinFallback( 'testname' );
+               $this->assertEquals( 'testname', $skin->getSkinName(), 'Constructor argument' );
        }
 
        /**