X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FStorage%2FRevisionStoreTest.php;h=8e8de6ea3151a2486a3de2f813ac57c922299734;hp=18dbc25046c0a85c0fa48e9c60e4b9584dcccad7;hb=ee56f00ddf0609082f8ae9a4dc3e6e1b6f54ddfd;hpb=63eebc01c48aee45f9c219cadf2e0e81f5a2043e

diff --git a/tests/phpunit/includes/Storage/RevisionStoreTest.php b/tests/phpunit/includes/Storage/RevisionStoreTest.php
index 18dbc25046..8e8de6ea31 100644
--- a/tests/phpunit/includes/Storage/RevisionStoreTest.php
+++ b/tests/phpunit/includes/Storage/RevisionStoreTest.php
@@ -2,10 +2,16 @@
 
 namespace MediaWiki\Tests\Storage;
 
+use HashBagOStuff;
+use Language;
+use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionAccessException;
 use MediaWiki\Storage\RevisionStore;
 use MediaWiki\Storage\SqlBlobStore;
 use MediaWikiTestCase;
+use Title;
 use WANObjectCache;
+use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\LoadBalancer;
 
 class RevisionStoreTest extends MediaWikiTestCase {
@@ -25,7 +31,8 @@ class RevisionStoreTest extends MediaWikiTestCase {
 		return new RevisionStore(
 			$loadBalancer ? $loadBalancer : $this->getMockLoadBalancer(),
 			$blobStore ? $blobStore : $this->getMockSqlBlobStore(),
-			$WANObjectCache ? $WANObjectCache : $this->getHashWANObjectCache()
+			$WANObjectCache ? $WANObjectCache : $this->getHashWANObjectCache(),
+			MediaWikiServices::getInstance()->getCommentStore()
 		);
 	}
 
@@ -37,6 +44,14 @@ class RevisionStoreTest extends MediaWikiTestCase {
 			->disableOriginalConstructor()->getMock();
 	}
 
+	/**
+	 * @return \PHPUnit_Framework_MockObject_MockObject|Database
+	 */
+	private function getMockDatabase() {
+		return $this->getMockBuilder( Database::class )
+			->disableOriginalConstructor()->getMock();
+	}
+
 	/**
 	 * @return \PHPUnit_Framework_MockObject_MockObject|SqlBlobStore
 	 */
@@ -211,9 +226,10 @@ class RevisionStoreTest extends MediaWikiTestCase {
 	 * @covers \MediaWiki\Storage\RevisionStore::getQueryInfo
 	 */
 	public function testGetQueryInfo( $contentHandlerUseDb, $options, $expected ) {
+		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
+		$this->overrideMwServices();
 		$store = $this->getRevisionStore();
 		$store->setContentHandlerUseDB( $contentHandlerUseDb );
-		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
 		$this->assertEquals( $expected, $store->getQueryInfo( $options ) );
 	}
 
@@ -241,9 +257,10 @@ class RevisionStoreTest extends MediaWikiTestCase {
 	 * @covers \MediaWiki\Storage\RevisionStore::getArchiveQueryInfo
 	 */
 	public function testGetArchiveQueryInfo_contentHandlerDb() {
+		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
+		$this->overrideMwServices();
 		$store = $this->getRevisionStore();
 		$store->setContentHandlerUseDB( true );
-		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
 		$this->assertEquals(
 			[
 				'tables' => [
@@ -269,9 +286,10 @@ class RevisionStoreTest extends MediaWikiTestCase {
 	 * @covers \MediaWiki\Storage\RevisionStore::getArchiveQueryInfo
 	 */
 	public function testGetArchiveQueryInfo_noContentHandlerDb() {
+		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
+		$this->overrideMwServices();
 		$store = $this->getRevisionStore();
 		$store->setContentHandlerUseDB( false );
-		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
 		$this->assertEquals(
 			[
 				'tables' => [
@@ -291,4 +309,363 @@ class RevisionStoreTest extends MediaWikiTestCase {
 		);
 	}
 
+	public function testGetTitle_successFromPageId() {
+		$mockLoadBalancer = $this->getMockLoadBalancer();
+		// Title calls wfGetDB() so we have to set the main service
+		$this->setService( 'DBLoadBalancer', $mockLoadBalancer );
+
+		$db = $this->getMockDatabase();
+		// Title calls wfGetDB() which uses a regular Connection
+		$mockLoadBalancer->expects( $this->atLeastOnce() )
+			->method( 'getConnection' )
+			->willReturn( $db );
+
+		// First call to Title::newFromID, faking no result (db lag?)
+		$db->expects( $this->at( 0 ) )
+			->method( 'selectRow' )
+			->with(
+				'page',
+				$this->anything(),
+				[ 'page_id' => 1 ]
+			)
+			->willReturn( (object)[
+				'page_namespace' => '1',
+				'page_title' => 'Food',
+			] );
+
+		$store = $this->getRevisionStore( $mockLoadBalancer );
+		$title = $store->getTitle( 1, 2, RevisionStore::READ_NORMAL );
+
+		$this->assertSame( 1, $title->getNamespace() );
+		$this->assertSame( 'Food', $title->getDBkey() );
+	}
+
+	public function testGetTitle_successFromPageIdOnFallback() {
+		$mockLoadBalancer = $this->getMockLoadBalancer();
+		// Title calls wfGetDB() so we have to set the main service
+		$this->setService( 'DBLoadBalancer', $mockLoadBalancer );
+
+		$db = $this->getMockDatabase();
+		// Title calls wfGetDB() which uses a regular Connection
+		// Assert that the first call uses a REPLICA and the second falls back to master
+		$mockLoadBalancer->expects( $this->exactly( 2 ) )
+			->method( 'getConnection' )
+			->willReturn( $db );
+		// RevisionStore getTitle uses a ConnectionRef
+		$mockLoadBalancer->expects( $this->atLeastOnce() )
+			->method( 'getConnectionRef' )
+			->willReturn( $db );
+
+		// First call to Title::newFromID, faking no result (db lag?)
+		$db->expects( $this->at( 0 ) )
+			->method( 'selectRow' )
+			->with(
+				'page',
+				$this->anything(),
+				[ 'page_id' => 1 ]
+			)
+			->willReturn( false );
+
+		// First select using rev_id, faking no result (db lag?)
+		$db->expects( $this->at( 1 ) )
+			->method( 'selectRow' )
+			->with(
+				[ 'revision', 'page' ],
+				$this->anything(),
+				[ 'rev_id' => 2 ]
+			)
+			->willReturn( false );
+
+		// Second call to Title::newFromID, no result
+		$db->expects( $this->at( 2 ) )
+			->method( 'selectRow' )
+			->with(
+				'page',
+				$this->anything(),
+				[ 'page_id' => 1 ]
+			)
+			->willReturn( (object)[
+				'page_namespace' => '2',
+				'page_title' => 'Foodey',
+			] );
+
+		$store = $this->getRevisionStore( $mockLoadBalancer );
+		$title = $store->getTitle( 1, 2, RevisionStore::READ_NORMAL );
+
+		$this->assertSame( 2, $title->getNamespace() );
+		$this->assertSame( 'Foodey', $title->getDBkey() );
+	}
+
+	public function testGetTitle_successFromRevId() {
+		$mockLoadBalancer = $this->getMockLoadBalancer();
+		// Title calls wfGetDB() so we have to set the main service
+		$this->setService( 'DBLoadBalancer', $mockLoadBalancer );
+
+		$db = $this->getMockDatabase();
+		// Title calls wfGetDB() which uses a regular Connection
+		$mockLoadBalancer->expects( $this->atLeastOnce() )
+			->method( 'getConnection' )
+			->willReturn( $db );
+		// RevisionStore getTitle uses a ConnectionRef
+		$mockLoadBalancer->expects( $this->atLeastOnce() )
+			->method( 'getConnectionRef' )
+			->willReturn( $db );
+
+		// First call to Title::newFromID, faking no result (db lag?)
+		$db->expects( $this->at( 0 ) )
+			->method( 'selectRow' )
+			->with(
+				'page',
+				$this->anything(),
+				[ 'page_id' => 1 ]
+			)
+			->willReturn( false );
+
+		// First select using rev_id, faking no result (db lag?)
+		$db->expects( $this->at( 1 ) )
+			->method( 'selectRow' )
+			->with(
+				[ 'revision', 'page' ],
+				$this->anything(),
+				[ 'rev_id' => 2 ]
+			)
+			->willReturn( (object)[
+				'page_namespace' => '1',
+				'page_title' => 'Food2',
+			] );
+
+		$store = $this->getRevisionStore( $mockLoadBalancer );
+		$title = $store->getTitle( 1, 2, RevisionStore::READ_NORMAL );
+
+		$this->assertSame( 1, $title->getNamespace() );
+		$this->assertSame( 'Food2', $title->getDBkey() );
+	}
+
+	public function testGetTitle_successFromRevIdOnFallback() {
+		$mockLoadBalancer = $this->getMockLoadBalancer();
+		// Title calls wfGetDB() so we have to set the main service
+		$this->setService( 'DBLoadBalancer', $mockLoadBalancer );
+
+		$db = $this->getMockDatabase();
+		// Title calls wfGetDB() which uses a regular Connection
+		// Assert that the first call uses a REPLICA and the second falls back to master
+		$mockLoadBalancer->expects( $this->exactly( 2 ) )
+			->method( 'getConnection' )
+			->willReturn( $db );
+		// RevisionStore getTitle uses a ConnectionRef
+		$mockLoadBalancer->expects( $this->atLeastOnce() )
+			->method( 'getConnectionRef' )
+			->willReturn( $db );
+
+		// First call to Title::newFromID, faking no result (db lag?)
+		$db->expects( $this->at( 0 ) )
+			->method( 'selectRow' )
+			->with(
+				'page',
+				$this->anything(),
+				[ 'page_id' => 1 ]
+			)
+			->willReturn( false );
+
+		// First select using rev_id, faking no result (db lag?)
+		$db->expects( $this->at( 1 ) )
+			->method( 'selectRow' )
+			->with(
+				[ 'revision', 'page' ],
+				$this->anything(),
+				[ 'rev_id' => 2 ]
+			)
+			->willReturn( false );
+
+		// Second call to Title::newFromID, no result
+		$db->expects( $this->at( 2 ) )
+			->method( 'selectRow' )
+			->with(
+				'page',
+				$this->anything(),
+				[ 'page_id' => 1 ]
+			)
+			->willReturn( false );
+
+		// Second select using rev_id, result
+		$db->expects( $this->at( 3 ) )
+			->method( 'selectRow' )
+			->with(
+				[ 'revision', 'page' ],
+				$this->anything(),
+				[ 'rev_id' => 2 ]
+			)
+			->willReturn( (object)[
+				'page_namespace' => '2',
+				'page_title' => 'Foodey',
+			] );
+
+		$store = $this->getRevisionStore( $mockLoadBalancer );
+		$title = $store->getTitle( 1, 2, RevisionStore::READ_NORMAL );
+
+		$this->assertSame( 2, $title->getNamespace() );
+		$this->assertSame( 'Foodey', $title->getDBkey() );
+	}
+
+	/**
+	 * @covers \MediaWiki\Storage\RevisionStore::getTitle
+	 */
+	public function testGetTitle_correctFallbackAndthrowsExceptionAfterFallbacks() {
+		$mockLoadBalancer = $this->getMockLoadBalancer();
+		// Title calls wfGetDB() so we have to set the main service
+		$this->setService( 'DBLoadBalancer', $mockLoadBalancer );
+
+		$db = $this->getMockDatabase();
+		// Title calls wfGetDB() which uses a regular Connection
+		// Assert that the first call uses a REPLICA and the second falls back to master
+
+		// RevisionStore getTitle uses getConnectionRef
+		// Title::newFromID uses getConnection
+		foreach ( [ 'getConnection', 'getConnectionRef' ] as $method ) {
+			$mockLoadBalancer->expects( $this->exactly( 2 ) )
+				->method( $method )
+				->willReturnCallback( function ( $masterOrReplica ) use ( $db ) {
+					static $callCounter = 0;
+					$callCounter++;
+					// The first call should be to a REPLICA, and the second a MASTER.
+					if ( $callCounter === 1 ) {
+						$this->assertSame( DB_REPLICA, $masterOrReplica );
+					} elseif ( $callCounter === 2 ) {
+						$this->assertSame( DB_MASTER, $masterOrReplica );
+					}
+					return $db;
+				} );
+		}
+		// First and third call to Title::newFromID, faking no result
+		foreach ( [ 0, 2 ] as $counter ) {
+			$db->expects( $this->at( $counter ) )
+				->method( 'selectRow' )
+				->with(
+					'page',
+					$this->anything(),
+					[ 'page_id' => 1 ]
+				)
+				->willReturn( false );
+		}
+
+		foreach ( [ 1, 3 ] as $counter ) {
+			$db->expects( $this->at( $counter ) )
+				->method( 'selectRow' )
+				->with(
+					[ 'revision', 'page' ],
+					$this->anything(),
+					[ 'rev_id' => 2 ]
+				)
+				->willReturn( false );
+		}
+
+		$store = $this->getRevisionStore( $mockLoadBalancer );
+
+		$this->setExpectedException( RevisionAccessException::class );
+		$store->getTitle( 1, 2, RevisionStore::READ_NORMAL );
+	}
+
+	public function provideNewRevisionFromRow_legacyEncoding_applied() {
+		yield 'windows-1252, old_flags is empty' => [
+			'windows-1252',
+			'en',
+			[
+				'old_flags' => '',
+				'old_text' => "S\xF6me Content",
+			],
+			'Söme Content'
+		];
+
+		yield 'windows-1252, old_flags is null' => [
+			'windows-1252',
+			'en',
+			[
+				'old_flags' => null,
+				'old_text' => "S\xF6me Content",
+			],
+			'Söme Content'
+		];
+	}
+
+	/**
+	 * @dataProvider provideNewRevisionFromRow_legacyEncoding_applied
+	 *
+	 * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow
+	 * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow_1_29
+	 */
+	public function testNewRevisionFromRow_legacyEncoding_applied( $encoding, $locale, $row, $text ) {
+		$cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] );
+
+		$blobStore = new SqlBlobStore( wfGetLB(), $cache );
+		$blobStore->setLegacyEncoding( $encoding, Language::factory( $locale ) );
+
+		$store = $this->getRevisionStore( wfGetLB(), $blobStore, $cache );
+
+		$record = $store->newRevisionFromRow(
+			$this->makeRow( $row ),
+			0,
+			Title::newFromText( __METHOD__ . '-UTPage' )
+		);
+
+		$this->assertSame( $text, $record->getContent( 'main' )->serialize() );
+	}
+
+	/**
+	 * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow
+	 * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow_1_29
+	 */
+	public function testNewRevisionFromRow_legacyEncoding_ignored() {
+		$row = [
+			'old_flags' => 'utf-8',
+			'old_text' => 'Söme Content',
+		];
+
+		$cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] );
+
+		$blobStore = new SqlBlobStore( wfGetLB(), $cache );
+		$blobStore->setLegacyEncoding( 'windows-1252', Language::factory( 'en' ) );
+
+		$store = $this->getRevisionStore( wfGetLB(), $blobStore, $cache );
+
+		$record = $store->newRevisionFromRow(
+			$this->makeRow( $row ),
+			0,
+			Title::newFromText( __METHOD__ . '-UTPage' )
+		);
+		$this->assertSame( 'Söme Content', $record->getContent( 'main' )->serialize() );
+	}
+
+	private function makeRow( array $array ) {
+		$row = $array + [
+				'rev_id' => 7,
+				'rev_page' => 5,
+				'rev_text_id' => 11,
+				'rev_timestamp' => '20110101000000',
+				'rev_user_text' => 'Tester',
+				'rev_user' => 17,
+				'rev_minor_edit' => 0,
+				'rev_deleted' => 0,
+				'rev_len' => 100,
+				'rev_parent_id' => 0,
+				'rev_sha1' => 'deadbeef',
+				'rev_comment_text' => 'Testing',
+				'rev_comment_data' => '{}',
+				'rev_comment_cid' => 111,
+				'rev_content_format' => CONTENT_FORMAT_TEXT,
+				'rev_content_model' => CONTENT_MODEL_TEXT,
+				'page_namespace' => 0,
+				'page_title' => 'TEST',
+				'page_id' => 5,
+				'page_latest' => 7,
+				'page_is_redirect' => 0,
+				'page_len' => 100,
+				'user_name' => 'Tester',
+				'old_is' => 13,
+				'old_text' => 'Hello World',
+				'old_flags' => 'utf-8',
+			];
+
+		return (object)$row;
+	}
+
 }