X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Flibs%2Fobjectcache%2FMultiWriteBagOStuffTest.php;h=4a9f6cc9aca5341c3fe701b6acb8a5b33c29449d;hp=38d63e341c830f3b734033419454db28a8bbc551;hb=e7720b8f8e09287384ddee271641d1b1721318bb;hpb=4b282b3ffafce6c8f12bef4e5a7bbb8b80c51571

diff --git a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
index 38d63e341c..4a9f6cc9ac 100644
--- a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
@@ -81,21 +81,60 @@ class MultiWriteBagOStuffTest extends MediaWikiTestCase {
 	 */
 	public function testSetDelayed() {
 		$key = wfRandomString();
-		$value = wfRandomString();
+		$value = (object)[ 'v' => wfRandomString() ];
+		$expectValue = clone $value;
 
 		// XXX: DeferredUpdates bound to transactions in CLI mode
 		$dbw = wfGetDB( DB_MASTER );
 		$dbw->begin();
 		$this->cache->set( $key, $value );
 
+		// Test that later changes to $value don't affect the saved value (e.g. T168040)
+		$value->v = 'bogus';
+
 		// Set in tier 1
-		$this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
+		$this->assertEquals( $expectValue, $this->cache1->get( $key ), 'Written to tier 1' );
 		// Not yet set in tier 2
 		$this->assertEquals( false, $this->cache2->get( $key ), 'Not written to tier 2' );
 
 		$dbw->commit();
 
 		// Set in tier 2
-		$this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
+		$this->assertEquals( $expectValue, $this->cache2->get( $key ), 'Written to tier 2' );
+	}
+
+	/**
+	 * @covers MultiWriteBagOStuff::makeKey
+	 */
+	public function testMakeKey() {
+		$cache1 = $this->getMockBuilder( HashBagOStuff::class )
+			->setMethods( [ 'makeKey' ] )->getMock();
+		$cache1->expects( $this->once() )->method( 'makeKey' )
+			->willReturn( 'special' );
+
+		$cache2 = $this->getMockBuilder( HashBagOStuff::class )
+			->setMethods( [ 'makeKey' ] )->getMock();
+		$cache2->expects( $this->never() )->method( 'makeKey' );
+
+		$cache = new MultiWriteBagOStuff( [ 'caches' => [ $cache1, $cache2 ] ] );
+		$this->assertSame( 'special', $cache->makeKey( 'a', 'b' ) );
+	}
+
+	/**
+	 * @covers MultiWriteBagOStuff::makeGlobalKey
+	 */
+	public function testMakeGlobalKey() {
+		$cache1 = $this->getMockBuilder( HashBagOStuff::class )
+			->setMethods( [ 'makeGlobalKey' ] )->getMock();
+		$cache1->expects( $this->once() )->method( 'makeGlobalKey' )
+			->willReturn( 'special' );
+
+		$cache2 = $this->getMockBuilder( HashBagOStuff::class )
+			->setMethods( [ 'makeGlobalKey' ] )->getMock();
+		$cache2->expects( $this->never() )->method( 'makeGlobalKey' );
+
+		$cache = new MultiWriteBagOStuff( [ 'caches' => [ $cache1, $cache2 ] ] );
+
+		$this->assertSame( 'special', $cache->makeGlobalKey( 'a', 'b' ) );
 	}
 }