X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FRevisionTest.php;h=f4ad98d2162dac278bd218d5624993d8d1f953d5;hp=3d0556ea3206df19b892d635f2799d396c372f5a;hb=7f02e0afb94e63449c8164314ff9979671009584;hpb=64a6afaf6964b3f9e61d595d5586fe7428a57e73

diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php
index 3d0556ea32..f4ad98d216 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -1,6 +1,9 @@
 <?php
 
-use Wikimedia\TestingAccessWrapper;
+use MediaWiki\Storage\RevisionStore;
+use MediaWiki\Storage\SqlBlobStore;
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\LoadBalancer;
 
 /**
  * Test cases in RevisionTest should not interact with the Database.
@@ -20,20 +23,58 @@ class RevisionTest extends MediaWikiTestCase {
 				'content' => new JavaScriptContent( 'hellow world.' )
 			],
 		];
+		// FIXME: test with and without user ID, and with a user object.
+		// We can't prepare that here though, since we don't yet have a dummy DB
+	}
+
+	/**
+	 * @param string $model
+	 * @return Title
+	 */
+	public function getMockTitle( $model = CONTENT_MODEL_WIKITEXT ) {
+		$mock = $this->getMockBuilder( Title::class )
+			->disableOriginalConstructor()
+			->getMock();
+		$mock->expects( $this->any() )
+			->method( 'getNamespace' )
+			->will( $this->returnValue( $this->getDefaultWikitextNS() ) );
+		$mock->expects( $this->any() )
+			->method( 'getPrefixedText' )
+			->will( $this->returnValue( 'RevisionTest' ) );
+		$mock->expects( $this->any() )
+			->method( 'getDBKey' )
+			->will( $this->returnValue( 'RevisionTest' ) );
+		$mock->expects( $this->any() )
+			->method( 'getArticleID' )
+			->will( $this->returnValue( 23 ) );
+		$mock->expects( $this->any() )
+			->method( 'getModel' )
+			->will( $this->returnValue( $model ) );
+
+		return $mock;
 	}
 
 	/**
 	 * @dataProvider provideConstructFromArray
 	 * @covers Revision::__construct
-	 * @covers Revision::constructFromRowArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 */
-	public function testConstructFromArray( array $rowArray ) {
-		$rev = new Revision( $rowArray );
+	public function testConstructFromArray( $rowArray ) {
+		$rev = new Revision( $rowArray, 0, $this->getMockTitle() );
 		$this->assertNotNull( $rev->getContent(), 'no content object available' );
 		$this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $rev->getContent()->getModel() );
 		$this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $rev->getContentModel() );
 	}
 
+	/**
+	 * @covers Revision::__construct
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
+	 */
+	public function testConstructFromEmptyArray() {
+		$rev = new Revision( [], 0, $this->getMockTitle() );
+		$this->assertNull( $rev->getContent(), 'no content object should be available' );
+	}
+
 	public function provideConstructFromArray_userSetAsExpected() {
 		yield 'no user defaults to wgUser' => [
 			[
@@ -52,30 +93,20 @@ class RevisionTest extends MediaWikiTestCase {
 			99,
 			'SomeTextUserName',
 		];
-		// Note: the below XXX test cases are odd and probably result in unexpected behaviour if used
-		// in production code.
-		yield 'XXX: user text only' => [
+		yield 'user text only' => [
 			[
 				'content' => new JavaScriptContent( 'hello world.' ),
 				'user_text' => '111.111.111.111',
 			],
-			null,
+			0,
 			'111.111.111.111',
 		];
-		yield 'XXX: user id only' => [
-			[
-				'content' => new JavaScriptContent( 'hello world.' ),
-				'user' => 9989,
-			],
-			9989,
-			null,
-		];
 	}
 
 	/**
 	 * @dataProvider provideConstructFromArray_userSetAsExpected
 	 * @covers Revision::__construct
-	 * @covers Revision::constructFromRowArray
+	 * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
 	 *
 	 * @param array $rowArray
 	 * @param mixed $expectedUserId null to expect the current wgUser ID
@@ -95,7 +126,7 @@ class RevisionTest extends MediaWikiTestCase {
 			$expectedUserName = $testUser->getName();
 		}
 
-		$rev = new Revision( $rowArray );
+		$rev = new Revision( $rowArray, 0, $this->getMockTitle() );
 		$this->assertEquals( $expectedUserId, $rev->getUser() );
 		$this->assertEquals( $expectedUserName, $rev->getUserText() );
 	}
@@ -105,28 +136,37 @@ class RevisionTest extends MediaWikiTestCase {
 			[
 				'content' => new WikitextContent( 'GOAT' ),
 				'text_id' => 'someid',
-				],
+			],
 			new MWException( "Text already stored in external store (id someid), " .
 				"can't serialize content object" )
 		];
+		yield 'unknown user id and no user name' => [
+			[
+				'content' => new JavaScriptContent( 'hello world.' ),
+				'user' => 9989,
+			],
+			new MWException( 'user_text not given, and unknown user ID 9989' )
+		];
 		yield 'with bad content object (class)' => [
 			[ 'content' => new stdClass() ],
-			new MWException( '`content` field must contain a Content object.' )
+			new MWException( 'content field must contain a Content object.' )
 		];
 		yield 'with bad content object (string)' => [
 			[ 'content' => 'ImAGoat' ],
-			new MWException( '`content` field must contain a Content object.' )
+			new MWException( 'content field must contain a Content object.' )
 		];
 		yield 'bad row format' => [
 			'imastring, not a row',
-			new MWException( 'Revision constructor passed invalid row format.' )
+			new InvalidArgumentException(
+				'$row must be a row object, an associative array, or a RevisionRecord'
+			)
 		];
 	}
 
 	/**
 	 * @dataProvider provideConstructFromArrayThrowsExceptions
 	 * @covers Revision::__construct
-	 * @covers Revision::constructFromRowArray
+	 * @covers RevisionStore::newMutableRevisionFromArray
 	 */
 	public function testConstructFromArrayThrowsExceptions( $rowArray, Exception $expectedException ) {
 		$this->setExpectedException(
@@ -134,14 +174,25 @@ class RevisionTest extends MediaWikiTestCase {
 			$expectedException->getMessage(),
 			$expectedException->getCode()
 		);
-		new Revision( $rowArray );
+		new Revision( $rowArray, 0, $this->getMockTitle() );
+	}
+
+	/**
+	 * @covers Revision::__construct
+	 * @covers RevisionStore::newMutableRevisionFromArray
+	 */
+	public function testConstructFromNothing() {
+		$this->setExpectedException(
+			InvalidArgumentException::class
+		);
+		new Revision( [] );
 	}
 
 	public function provideConstructFromRow() {
 		yield 'Full construction' => [
 			[
-				'rev_id' => '2',
-				'rev_page' => '1',
+				'rev_id' => '42',
+				'rev_page' => '23',
 				'rev_text_id' => '2',
 				'rev_timestamp' => '20171017114835',
 				'rev_user_text' => '127.0.0.1',
@@ -158,8 +209,8 @@ class RevisionTest extends MediaWikiTestCase {
 				'rev_content_model' => 'GOATMODEL',
 			],
 			function ( RevisionTest $testCase, Revision $rev ) {
-				$testCase->assertSame( 2, $rev->getId() );
-				$testCase->assertSame( 1, $rev->getPage() );
+				$testCase->assertSame( 42, $rev->getId() );
+				$testCase->assertSame( 23, $rev->getPage() );
 				$testCase->assertSame( 2, $rev->getTextId() );
 				$testCase->assertSame( '20171017114835', $rev->getTimestamp() );
 				$testCase->assertSame( '127.0.0.1', $rev->getUserText() );
@@ -174,10 +225,10 @@ class RevisionTest extends MediaWikiTestCase {
 				$testCase->assertSame( 'GOATMODEL', $rev->getContentModel() );
 			}
 		];
-		yield 'null fields' => [
+		yield 'default field values' => [
 			[
-				'rev_id' => '2',
-				'rev_page' => '1',
+				'rev_id' => '42',
+				'rev_page' => '23',
 				'rev_text_id' => '2',
 				'rev_timestamp' => '20171017114835',
 				'rev_user_text' => '127.0.0.1',
@@ -189,11 +240,24 @@ class RevisionTest extends MediaWikiTestCase {
 				'rev_comment_cid' => null,
 			],
 			function ( RevisionTest $testCase, Revision $rev ) {
-				$testCase->assertNull( $rev->getSize() );
-				$testCase->assertNull( $rev->getParentId() );
-				$testCase->assertNull( $rev->getSha1() );
-				$testCase->assertSame( 'text/x-wiki', $rev->getContentFormat() );
-				$testCase->assertSame( 'wikitext', $rev->getContentModel() );
+				// parent ID may be null
+				$testCase->assertSame( null, $rev->getParentId(), 'revision id' );
+
+				// given fields
+				$testCase->assertSame( $rev->getTimestamp(), '20171017114835', 'timestamp' );
+				$testCase->assertSame( $rev->getUserText(), '127.0.0.1', 'user name' );
+				$testCase->assertSame( $rev->getUser(), 0, 'user id' );
+				$testCase->assertSame( $rev->getComment(), 'Goat Comment!' );
+				$testCase->assertSame( false, $rev->isMinor(), 'minor edit' );
+				$testCase->assertSame( 0, $rev->getVisibility(), 'visibility flags' );
+
+				// computed fields
+				$testCase->assertNotNull( $rev->getSize(), 'size' );
+				$testCase->assertNotNull( $rev->getSha1(), 'hash' );
+
+				// NOTE: model and format will be detected based on the namespace of the (mock) title
+				$testCase->assertSame( 'text/x-wiki', $rev->getContentFormat(), 'format' );
+				$testCase->assertSame( 'wikitext', $rev->getContentModel(), 'model' );
 			}
 		];
 	}
@@ -201,11 +265,34 @@ class RevisionTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideConstructFromRow
 	 * @covers Revision::__construct
-	 * @covers Revision::constructFromDbRowObject
+	 * @covers RevisionStore::newRevisionFromRow
 	 */
 	public function testConstructFromRow( array $arrayData, $assertions ) {
+		$data = 'Hello goat.'; // needs to match model and format
+
+		$blobStore = $this->getMockBuilder( SqlBlobStore::class )
+			->disableOriginalConstructor()
+			->getMock();
+
+		$blobStore->method( 'getBlob' )
+			->will( $this->returnValue( $data ) );
+
+		$blobStore->method( 'getTextIdFromAddress' )
+			->will( $this->returnCallback(
+				function ( $address ) {
+					// Turn "tt:1234" into 12345.
+					// Note that this must be functional so we can test getTextId().
+					// Ideally, we'd un-mock getTextIdFromAddress and use its actual implementation.
+					$parts = explode( ':', $address );
+					return (int)array_pop( $parts );
+				}
+			) );
+
+		// Note override internal service, so RevisionStore uses it as well.
+		$this->setService( '_SqlBlobStore', $blobStore );
+
 		$row = (object)$arrayData;
-		$rev = new Revision( $row );
+		$rev = new Revision( $row, 0, $this->getMockTitle() );
 		$assertions( $this, $rev );
 	}
 
@@ -235,7 +322,7 @@ class RevisionTest extends MediaWikiTestCase {
 	 * @covers Revision::getId
 	 */
 	public function testGetId( $rowArray, $expectedId ) {
-		$rev = new Revision( $rowArray );
+		$rev = new Revision( $rowArray, 0, $this->getMockTitle() );
 		$this->assertEquals( $expectedId, $rev->getId() );
 	}
 
@@ -249,7 +336,7 @@ class RevisionTest extends MediaWikiTestCase {
 	 * @covers Revision::setId
 	 */
 	public function testSetId( $input, $expected ) {
-		$rev = new Revision( [] );
+		$rev = new Revision( [], 0, $this->getMockTitle() );
 		$rev->setId( $input );
 		$this->assertSame( $expected, $rev->getId() );
 	}
@@ -264,7 +351,7 @@ class RevisionTest extends MediaWikiTestCase {
 	 * @covers Revision::setUserIdAndName
 	 */
 	public function testSetUserIdAndName( $inputId, $expectedId, $name ) {
-		$rev = new Revision( [] );
+		$rev = new Revision( [], 0, $this->getMockTitle() );
 		$rev->setUserIdAndName( $inputId, $name );
 		$this->assertSame( $expectedId, $rev->getUser( Revision::RAW ) );
 		$this->assertEquals( $name, $rev->getUserText( Revision::RAW ) );
@@ -281,7 +368,7 @@ class RevisionTest extends MediaWikiTestCase {
 	 * @covers Revision::getTextId()
 	 */
 	public function testGetTextId( $rowArray, $expected ) {
-		$rev = new Revision( $rowArray );
+		$rev = new Revision( $rowArray, 0, $this->getMockTitle() );
 		$this->assertSame( $expected, $rev->getTextId() );
 	}
 
@@ -296,7 +383,7 @@ class RevisionTest extends MediaWikiTestCase {
 	 * @covers Revision::getParentId()
 	 */
 	public function testGetParentId( $rowArray, $expected ) {
-		$rev = new Revision( $rowArray );
+		$rev = new Revision( $rowArray, 0, $this->getMockTitle() );
 		$this->assertSame( $expected, $rev->getParentId() );
 	}
 
@@ -329,9 +416,44 @@ class RevisionTest extends MediaWikiTestCase {
 		$this->testGetRevisionText( $expected, $rowData );
 	}
 
+	private function getWANObjectCache() {
+		return new WANObjectCache( [ 'cache' => new HashBagOStuff() ] );
+	}
+
+	/**
+	 * @return SqlBlobStore
+	 */
+	private function getBlobStore() {
+		/** @var LoadBalancer $lb */
+		$lb = $this->getMockBuilder( LoadBalancer::class )
+			->disableOriginalConstructor()
+			->getMock();
+
+		$cache = $this->getWANObjectCache();
+
+		$blobStore = new SqlBlobStore( $lb, $cache );
+		return $blobStore;
+	}
+
+	/**
+	 * @return RevisionStore
+	 */
+	private function getRevisionStore() {
+		/** @var LoadBalancer $lb */
+		$lb = $this->getMockBuilder( LoadBalancer::class )
+			->disableOriginalConstructor()
+			->getMock();
+
+		$cache = $this->getWANObjectCache();
+
+		$blobStore = new RevisionStore( $lb, $this->getBlobStore(), $cache );
+		return $blobStore;
+	}
+
 	public function provideGetRevisionTextWithLegacyEncoding() {
 		yield 'Utf8Native' => [
 			"Wiki est l'\xc3\xa9cole superieur !",
+			'fr',
 			'iso-8859-1',
 			[
 				'old_flags' => 'utf-8',
@@ -340,6 +462,7 @@ class RevisionTest extends MediaWikiTestCase {
 		];
 		yield 'Utf8Legacy' => [
 			"Wiki est l'\xc3\xa9cole superieur !",
+			'fr',
 			'iso-8859-1',
 			[
 				'old_flags' => '',
@@ -352,8 +475,11 @@ class RevisionTest extends MediaWikiTestCase {
 	 * @covers Revision::getRevisionText
 	 * @dataProvider provideGetRevisionTextWithLegacyEncoding
 	 */
-	public function testGetRevisionWithLegacyEncoding( $expected, $encoding, $rowData ) {
-		$this->setMwGlobals( 'wgLegacyEncoding', $encoding );
+	public function testGetRevisionWithLegacyEncoding( $expected, $lang, $encoding, $rowData ) {
+		$blobStore = $this->getBlobStore();
+		$blobStore->setLegacyEncoding( $encoding, Language::factory( $lang ) );
+		$this->setService( 'BlobStore', $blobStore );
+
 		$this->testGetRevisionText( $expected, $rowData );
 	}
 
@@ -365,6 +491,7 @@ class RevisionTest extends MediaWikiTestCase {
 		 */
 		yield 'Utf8NativeGzip' => [
 			"Wiki est l'\xc3\xa9cole superieur !",
+			'fr',
 			'iso-8859-1',
 			[
 				'old_flags' => 'gzip,utf-8',
@@ -373,6 +500,7 @@ class RevisionTest extends MediaWikiTestCase {
 		];
 		yield 'Utf8LegacyGzip' => [
 			"Wiki est l'\xc3\xa9cole superieur !",
+			'fr',
 			'iso-8859-1',
 			[
 				'old_flags' => 'gzip',
@@ -385,9 +513,13 @@ class RevisionTest extends MediaWikiTestCase {
 	 * @covers Revision::getRevisionText
 	 * @dataProvider provideGetRevisionTextWithGzipAndLegacyEncoding
 	 */
-	public function testGetRevisionWithGzipAndLegacyEncoding( $expected, $encoding, $rowData ) {
+	public function testGetRevisionWithGzipAndLegacyEncoding( $expected, $lang, $encoding, $rowData ) {
 		$this->checkPHPExtension( 'zlib' );
-		$this->setMwGlobals( 'wgLegacyEncoding', $encoding );
+
+		$blobStore = $this->getBlobStore();
+		$blobStore->setLegacyEncoding( $encoding, Language::factory( $lang ) );
+		$this->setService( 'BlobStore', $blobStore );
+
 		$this->testGetRevisionText( $expected, $rowData );
 	}
 
@@ -413,7 +545,10 @@ class RevisionTest extends MediaWikiTestCase {
 	 */
 	public function testCompressRevisionTextUtf8Gzip() {
 		$this->checkPHPExtension( 'zlib' );
-		$this->setMwGlobals( 'wgCompressRevisions', true );
+
+		$blobStore = $this->getBlobStore();
+		$blobStore->setCompressBlobs( true );
+		$this->setService( 'BlobStore', $blobStore );
 
 		$row = new stdClass;
 		$row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
@@ -428,20 +563,41 @@ class RevisionTest extends MediaWikiTestCase {
 			Revision::getRevisionText( $row ), "getRevisionText" );
 	}
 
-	public function provideFetchFromConds() {
-		yield [ 0, [] ];
-		yield [ Revision::READ_LOCKING, [ 'FOR UPDATE' ] ];
-	}
-
 	/**
-	 * @dataProvider provideFetchFromConds
-	 * @covers Revision::fetchFromConds
+	 * @covers Revision::loadFromTitle
 	 */
-	public function testFetchFromConds( $flags, array $options ) {
-		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
-		$conditions = [ 'conditionsArray' ];
+	public function testLoadFromTitle() {
+		$title = $this->getMockTitle();
+
+		$conditions = [
+			'rev_id=page_latest',
+			'page_namespace' => $title->getNamespace(),
+			'page_title' => $title->getDBkey()
+		];
+
+		$row = (object)[
+			'rev_id' => '42',
+			'rev_page' => $title->getArticleID(),
+			'rev_text_id' => '2',
+			'rev_timestamp' => '20171017114835',
+			'rev_user_text' => '127.0.0.1',
+			'rev_user' => '0',
+			'rev_minor_edit' => '0',
+			'rev_deleted' => '0',
+			'rev_len' => '46',
+			'rev_parent_id' => '1',
+			'rev_sha1' => 'rdqbbzs3pkhihgbs8qf2q9jsvheag5z',
+			'rev_comment_text' => 'Goat Comment!',
+			'rev_comment_data' => null,
+			'rev_comment_cid' => null,
+			'rev_content_format' => 'GOATFORMAT',
+			'rev_content_model' => 'GOATMODEL',
+		];
 
 		$db = $this->getMock( IDatabase::class );
+		$db->expects( $this->any() )
+			->method( 'getDomainId' )
+			->will( $this->returnValue( wfWikiID() ) );
 		$db->expects( $this->once() )
 			->method( 'selectRow' )
 			->with(
@@ -450,17 +606,24 @@ class RevisionTest extends MediaWikiTestCase {
 				$this->isType( 'array' ),
 				$this->equalTo( $conditions ),
 				// Method name
-				$this->equalTo( 'Revision::fetchFromConds' ),
-				$this->equalTo( $options ),
+				$this->stringContains( 'fetchRevisionRowFromConds' ),
+				// We don't really care about the options here
+				$this->isType( 'array' ),
 				// We don't really care about the join conds are they come from the joinCond methods
 				$this->isType( 'array' )
 			)
-			->willReturn( 'RETURNVALUE' );
+			->willReturn( $row );
 
-		$wrapper = TestingAccessWrapper::newFromClass( Revision::class );
-		$result = $wrapper->fetchFromConds( $db, $conditions, $flags );
+		$revision = Revision::loadFromTitle( $db, $title );
 
-		$this->assertEquals( 'RETURNVALUE', $result );
+		$this->assertEquals( $title->getArticleID(), $revision->getTitle()->getArticleID() );
+		$this->assertEquals( $row->rev_id, $revision->getId() );
+		$this->assertEquals( $row->rev_len, $revision->getSize() );
+		$this->assertEquals( $row->rev_sha1, $revision->getSha1() );
+		$this->assertEquals( $row->rev_parent_id, $revision->getParentId() );
+		$this->assertEquals( $row->rev_timestamp, $revision->getTimestamp() );
+		$this->assertEquals( $row->rev_comment_text, $revision->getComment() );
+		$this->assertEquals( $row->rev_user_text, $revision->getUserText() );
 	}
 
 	public function provideDecompressRevisionText() {
@@ -491,25 +654,25 @@ class RevisionTest extends MediaWikiTestCase {
 		];
 		yield '(ISO-8859-1 encoding), string in string out' => [
 			'ISO-8859-1',
-			iconv( 'utf8', 'ISO-8859-1', "1®Àþ1" ),
+			iconv( 'utf-8', 'ISO-8859-1', "1®Àþ1" ),
 			[],
 			'1®Àþ1',
 		];
 		yield '(ISO-8859-1 encoding), serialized object in with gzip flags returns string' => [
 			'ISO-8859-1',
-			gzdeflate( iconv( 'utf8', 'ISO-8859-1', "4®Àþ4" ) ),
+			gzdeflate( iconv( 'utf-8', 'ISO-8859-1', "4®Àþ4" ) ),
 			[ 'gzip' ],
 			'4®Àþ4',
 		];
 		yield '(ISO-8859-1 encoding), serialized object in with object flags returns string' => [
 			'ISO-8859-1',
-			serialize( new TitleValue( 0, iconv( 'utf8', 'ISO-8859-1', "3®Àþ3" ) ) ),
+			serialize( new TitleValue( 0, iconv( 'utf-8', 'ISO-8859-1', "3®Àþ3" ) ) ),
 			[ 'object' ],
 			'3®Àþ3',
 		];
 		yield '(ISO-8859-1 encoding), serialized object in with object & gzip flags returns string' => [
 			'ISO-8859-1',
-			gzdeflate( serialize( new TitleValue( 0, iconv( 'utf8', 'ISO-8859-1', "2®Àþ2" ) ) ) ),
+			gzdeflate( serialize( new TitleValue( 0, iconv( 'utf-8', 'ISO-8859-1', "2®Àþ2" ) ) ) ),
 			[ 'gzip', 'object' ],
 			'2®Àþ2',
 		];
@@ -525,8 +688,12 @@ class RevisionTest extends MediaWikiTestCase {
 	 * @param mixed $expected
 	 */
 	public function testDecompressRevisionText( $legacyEncoding, $text, $flags, $expected ) {
-		$this->setMwGlobals( 'wgLegacyEncoding', $legacyEncoding );
-		$this->setMwGlobals( 'wgLanguageCode', 'en' );
+		$blobStore = $this->getBlobStore();
+		if ( $legacyEncoding ) {
+			$blobStore->setLegacyEncoding( $legacyEncoding, Language::factory( 'en' ) );
+		}
+
+		$this->setService( 'BlobStore', $blobStore );
 		$this->assertSame(
 			$expected,
 			Revision::decompressRevisionText( $text, $flags )
@@ -622,14 +789,20 @@ class RevisionTest extends MediaWikiTestCase {
 	 * @covers Revision::getRevisionText
 	 */
 	public function testGetRevisionText_external_oldId() {
-		$cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] );
+		$cache = $this->getWANObjectCache();
 		$this->setService( 'MainWANObjectCache', $cache );
+
 		$this->setService(
 			'ExternalStoreFactory',
 			new ExternalStoreFactory( [ 'ForTesting' ] )
 		);
 
-		$cacheKey = $cache->makeKey( 'revisiontext', 'textid', '7777' );
+		$lb = $this->getMockBuilder( LoadBalancer::class )
+			->disableOriginalConstructor()
+			->getMock();
+
+		$blobStore = new SqlBlobStore( $lb, $cache );
+		$this->setService( 'BlobStore', $blobStore );
 
 		$this->assertSame(
 			'AAAABBAAA',
@@ -641,6 +814,8 @@ class RevisionTest extends MediaWikiTestCase {
 				]
 			)
 		);
+
+		$cacheKey = $cache->makeKey( 'revisiontext', 'textid', 'tt:7777' );
 		$this->assertSame( 'AAAABBAAA', $cache->get( $cacheKey ) );
 	}
 
@@ -836,6 +1011,8 @@ class RevisionTest extends MediaWikiTestCase {
 				'fields' => [
 					'ar_id',
 					'ar_page_id',
+					'ar_namespace',
+					'ar_title',
 					'ar_rev_id',
 					'ar_text',
 					'ar_text_id',
@@ -864,6 +1041,8 @@ class RevisionTest extends MediaWikiTestCase {
 				'fields' => [
 					'ar_id',
 					'ar_page_id',
+					'ar_namespace',
+					'ar_title',
 					'ar_rev_id',
 					'ar_text',
 					'ar_text_id',
@@ -897,6 +1076,8 @@ class RevisionTest extends MediaWikiTestCase {
 				'fields' => [
 					'ar_id',
 					'ar_page_id',
+					'ar_namespace',
+					'ar_title',
 					'ar_rev_id',
 					'ar_text',
 					'ar_text_id',
@@ -933,6 +1114,8 @@ class RevisionTest extends MediaWikiTestCase {
 				'fields' => [
 					'ar_id',
 					'ar_page_id',
+					'ar_namespace',
+					'ar_title',
 					'ar_rev_id',
 					'ar_text',
 					'ar_text_id',
@@ -969,6 +1152,8 @@ class RevisionTest extends MediaWikiTestCase {
 				'fields' => [
 					'ar_id',
 					'ar_page_id',
+					'ar_namespace',
+					'ar_title',
 					'ar_rev_id',
 					'ar_text',
 					'ar_text_id',
@@ -1000,6 +1185,11 @@ class RevisionTest extends MediaWikiTestCase {
 	 */
 	public function testGetArchiveQueryInfo( $globals, $expected ) {
 		$this->setMwGlobals( $globals );
+
+		$revisionStore = $this->getRevisionStore();
+		$revisionStore->setContentHandlerUseDB( $globals['wgContentHandlerUseDB'] );
+		$this->setService( 'RevisionStore', $revisionStore );
+
 		$this->assertEquals(
 			$expected,
 			Revision::getArchiveQueryInfo()
@@ -1351,6 +1541,11 @@ class RevisionTest extends MediaWikiTestCase {
 	 */
 	public function testGetQueryInfo( $globals, $options, $expected ) {
 		$this->setMwGlobals( $globals );
+
+		$revisionStore = $this->getRevisionStore();
+		$revisionStore->setContentHandlerUseDB( $globals['wgContentHandlerUseDB'] );
+		$this->setService( 'RevisionStore', $revisionStore );
+
 		$this->assertEquals(
 			$expected,
 			Revision::getQueryInfo( $options )