From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 23 Jul 2017 02:07:13 +0000 (+0000)
Subject: Merge "config: Complete coverage for Config class"
X-Git-Tag: 1.31.0-rc.0~2631
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles_versions%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=0c2d09e312f0f577e5376dd57c5675087bb17244;hp=99a2b401ffd3acab91e051d5161bac6a9f95c42a;p=lhc%2Fweb%2Fwiklou.git

Merge "config: Complete coverage for Config class"
---

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
 	 */