X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fconfig%2FConfigFactoryTest.php;h=f42cb95921983713475ff1889a621e690f141cc8;hb=bca436db920;hp=2c1d1e6f0e7656e6f7127db52354fb8630f319c0;hpb=d9a965c69d0712567efd68c94a1f38f9cd50056c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/config/ConfigFactoryTest.php b/tests/phpunit/includes/config/ConfigFactoryTest.php
index 2c1d1e6f0e..f42cb95921 100644
--- a/tests/phpunit/includes/config/ConfigFactoryTest.php
+++ b/tests/phpunit/includes/config/ConfigFactoryTest.php
@@ -44,6 +44,42 @@ class ConfigFactoryTest extends MediaWikiTestCase {
 		$this->assertNotSame( $config1, $config2 );
 	}
 
+	/**
+	 * @covers ConfigFactory::register
+	 */
+	public function testSalvage() {
+		$oldFactory = new ConfigFactory();
+		$oldFactory->register( 'foo', 'GlobalVarConfig::newInstance' );
+		$oldFactory->register( 'bar', 'GlobalVarConfig::newInstance' );
+		$oldFactory->register( 'quux', 'GlobalVarConfig::newInstance' );
+
+		// instantiate two of the three defined configurations
+		$foo = $oldFactory->makeConfig( 'foo' );
+		$bar = $oldFactory->makeConfig( 'bar' );
+		$quux = $oldFactory->makeConfig( 'quux' );
+
+		// define new config instance
+		$newFactory = new ConfigFactory();
+		$newFactory->register( 'foo', 'GlobalVarConfig::newInstance' );
+		$newFactory->register( 'bar', function() {
+			return new HashConfig();
+		} );
+
+		// "foo" and "quux" are defined in the old and the new factory.
+		// The old factory has instances for "foo" and "bar", but not "quux".
+		$newFactory->salvage( $oldFactory );
+
+		$newFoo = $newFactory->makeConfig( 'foo' );
+		$this->assertSame( $foo, $newFoo, 'existing instance should be salvaged' );
+
+		$newBar = $newFactory->makeConfig( 'bar' );
+		$this->assertNotSame( $bar, $newBar, 'don\'t salvage if callbacks differ' );
+
+		// the new factory doesn't have quux defined, so the quux instance should not be salvaged
+		$this->setExpectedException( 'ConfigException' );
+		$newFactory->makeConfig( 'quux' );
+	}
+
 	/**
 	 * @covers ConfigFactory::register
 	 */