From 029a17005c0f7620336c39408408548080127c3e Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sat, 22 Jul 2017 17:33:16 -0700 Subject: [PATCH] config: Complete coverage for Config class * Fix @covers for testSalvage and testGetConfigNames. * Add missing coverage for registering an object directly. Change-Id: Ib42b8333a1716d2a4747c25ab3f6cd795e546f3e --- .../includes/config/ConfigFactoryTest.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/phpunit/includes/config/ConfigFactoryTest.php b/tests/phpunit/includes/config/ConfigFactoryTest.php index ba38128f17..608d8d949d 100644 --- a/tests/phpunit/includes/config/ConfigFactoryTest.php +++ b/tests/phpunit/includes/config/ConfigFactoryTest.php @@ -47,7 +47,7 @@ class ConfigFactoryTest extends MediaWikiTestCase { } /** - * @covers ConfigFactory::register + * @covers ConfigFactory::salvage */ public function testSalvage() { $oldFactory = new ConfigFactory(); @@ -83,7 +83,7 @@ class ConfigFactoryTest extends MediaWikiTestCase { } /** - * @covers ConfigFactory::register + * @covers ConfigFactory::getConfigNames */ public function testGetConfigNames() { $factory = new ConfigFactory(); @@ -96,7 +96,7 @@ class ConfigFactoryTest extends MediaWikiTestCase { /** * @covers ConfigFactory::makeConfig */ - public function testMakeConfig() { + public function testMakeConfigWithCallback() { $factory = new ConfigFactory(); $factory->register( 'unittest', 'GlobalVarConfig::newInstance' ); @@ -105,6 +105,16 @@ class ConfigFactoryTest extends MediaWikiTestCase { $this->assertSame( $conf, $factory->makeConfig( 'unittest' ) ); } + /** + * @covers ConfigFactory::makeConfig + */ + public function testMakeConfigWithObject() { + $factory = new ConfigFactory(); + $conf = new HashConfig(); + $factory->register( 'test', $conf ); + $this->assertSame( $conf, $factory->makeConfig( 'test' ) ); + } + /** * @covers ConfigFactory::makeConfig */ -- 2.20.1