X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FRevisionTest.php;h=0db76ff1932a1a2146d4241d223d4323b1eae024;hp=01762b92ef46781ca51c54f7baaca20325fdff7e;hb=dbad540cd37617879aff6f28ce9c016dd8049d4e;hpb=96188af6dbb48a4b930c8741bcd5787534e1cb05

diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php
index 01762b92ef..0db76ff193 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\RevisionStore;
 use MediaWiki\Storage\SqlBlobStore;
 use Wikimedia\Rdbms\IDatabase;
@@ -42,7 +43,7 @@ class RevisionTest extends MediaWikiTestCase {
 			->method( 'getPrefixedText' )
 			->will( $this->returnValue( 'RevisionTest' ) );
 		$mock->expects( $this->any() )
-			->method( 'getDBKey' )
+			->method( 'getDBkey' )
 			->will( $this->returnValue( 'RevisionTest' ) );
 		$mock->expects( $this->any() )
 			->method( 'getArticleID' )
@@ -57,7 +58,7 @@ class RevisionTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideConstructFromArray
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromArray( $rowArray ) {
 		$rev = new Revision( $rowArray, 0, $this->getMockTitle() );
@@ -68,7 +69,7 @@ class RevisionTest extends MediaWikiTestCase {
 
 	/**
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromEmptyArray() {
 		$rev = new Revision( [], 0, $this->getMockTitle() );
@@ -106,7 +107,7 @@ class RevisionTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideConstructFromArray_userSetAsExpected
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 *
 	 * @param array $rowArray
 	 * @param mixed $expectedUserId null to expect the current wgUser ID
@@ -166,7 +167,7 @@ class RevisionTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideConstructFromArrayThrowsExceptions
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromArrayThrowsExceptions( $rowArray, Exception $expectedException ) {
 		$this->setExpectedException(
@@ -179,7 +180,7 @@ class RevisionTest extends MediaWikiTestCase {
 
 	/**
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromNothing() {
 		$this->setExpectedException(
@@ -265,7 +266,7 @@ class RevisionTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideConstructFromRow
 	 * @covers Revision::__construct
-	 * @covers RevisionStore::newMutableRevisionFromArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromRow( array $arrayData, $assertions ) {
 		$data = 'Hello goat.'; // needs to match model and format
@@ -289,7 +290,7 @@ class RevisionTest extends MediaWikiTestCase {
 			) );
 
 		// Note override internal service, so RevisionStore uses it as well.
-		$this->setService( '_SqlBlobStore', $blobStore );
+		$this->setService( 'BlobStoreFactory', $this->mockBlobStoreFactory( $blobStore ) );
 
 		$row = (object)$arrayData;
 		$rev = new Revision( $row, 0, $this->getMockTitle() );
@@ -435,6 +436,20 @@ class RevisionTest extends MediaWikiTestCase {
 		return $blobStore;
 	}
 
+	private function mockBlobStoreFactory( $blobStore ) {
+		/** @var LoadBalancer $lb */
+		$factory = $this->getMockBuilder( BlobStoreFactory::class )
+			->disableOriginalConstructor()
+			->getMock();
+		$factory->expects( $this->any() )
+			->method( 'newBlobStore' )
+			->willReturn( $blobStore );
+		$factory->expects( $this->any() )
+			->method( 'newSqlBlobStore' )
+			->willReturn( $blobStore );
+		return $factory;
+	}
+
 	/**
 	 * @return RevisionStore
 	 */
@@ -478,7 +493,7 @@ class RevisionTest extends MediaWikiTestCase {
 	public function testGetRevisionWithLegacyEncoding( $expected, $lang, $encoding, $rowData ) {
 		$blobStore = $this->getBlobStore();
 		$blobStore->setLegacyEncoding( $encoding, Language::factory( $lang ) );
-		$this->setService( 'BlobStore', $blobStore );
+		$this->setService( 'BlobStoreFactory', $this->mockBlobStoreFactory( $blobStore ) );
 
 		$this->testGetRevisionText( $expected, $rowData );
 	}
@@ -518,7 +533,7 @@ class RevisionTest extends MediaWikiTestCase {
 
 		$blobStore = $this->getBlobStore();
 		$blobStore->setLegacyEncoding( $encoding, Language::factory( $lang ) );
-		$this->setService( 'BlobStore', $blobStore );
+		$this->setService( 'BlobStoreFactory', $this->mockBlobStoreFactory( $blobStore ) );
 
 		$this->testGetRevisionText( $expected, $rowData );
 	}
@@ -548,7 +563,7 @@ class RevisionTest extends MediaWikiTestCase {
 
 		$blobStore = $this->getBlobStore();
 		$blobStore->setCompressBlobs( true );
-		$this->setService( 'BlobStore', $blobStore );
+		$this->setService( 'BlobStoreFactory', $this->mockBlobStoreFactory( $blobStore ) );
 
 		$row = new stdClass;
 		$row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
@@ -693,7 +708,7 @@ class RevisionTest extends MediaWikiTestCase {
 			$blobStore->setLegacyEncoding( $legacyEncoding, Language::factory( 'en' ) );
 		}
 
-		$this->setService( 'BlobStore', $blobStore );
+		$this->setService( 'BlobStoreFactory', $this->mockBlobStoreFactory( $blobStore ) );
 		$this->assertSame(
 			$expected,
 			Revision::decompressRevisionText( $text, $flags )
@@ -802,7 +817,7 @@ class RevisionTest extends MediaWikiTestCase {
 			->getMock();
 
 		$blobStore = new SqlBlobStore( $lb, $cache );
-		$this->setService( 'BlobStore', $blobStore );
+		$this->setService( 'BlobStoreFactory', $this->mockBlobStoreFactory( $blobStore ) );
 
 		$this->assertSame(
 			'AAAABBAAA',