X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FRevisionTest.php;h=57c053160203c5d159445c248eb85ce6c12ac1b2;hp=a467346efa1dd38a9e95d17e308b4d1eec3a48d6;hb=faf7cc4a09848c538320bd2b9067b1a77c0a0183;hpb=1975297654267990d686da8c64d72f5a363305d1 diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php index a467346efa..57c0531602 100644 --- a/tests/phpunit/includes/RevisionTest.php +++ b/tests/phpunit/includes/RevisionTest.php @@ -1,5 +1,6 @@ assertNull( $rev->getContent(), 'no content object should be available' ); } + /** + * @covers Revision::__construct + * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + */ + public function testConstructFromArrayWithBadPageId() { + MediaWiki\suppressWarnings(); + $rev = new Revision( [ 'page' => 77777777 ] ); + $this->assertSame( 77777777, $rev->getPage() ); + MediaWiki\restoreWarnings(); + } + public function provideConstructFromArray_userSetAsExpected() { yield 'no user defaults to wgUser' => [ [ @@ -301,6 +313,19 @@ class RevisionTest extends MediaWikiTestCase { $assertions( $this, $rev ); } + /** + * @covers Revision::__construct + * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + */ + public function testConstructFromRowWithBadPageId() { + $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD ); + $this->overrideMwServices(); + MediaWiki\suppressWarnings(); + $rev = new Revision( (object)[ 'rev_page' => 77777777 ] ); + $this->assertSame( 77777777, $rev->getPage() ); + MediaWiki\restoreWarnings(); + } + public function provideGetRevisionText() { yield 'Generic test' => [ 'This is a goat of revision text.', @@ -465,7 +490,12 @@ class RevisionTest extends MediaWikiTestCase { $cache = $this->getWANObjectCache(); - $blobStore = new RevisionStore( $lb, $this->getBlobStore(), $cache ); + $blobStore = new RevisionStore( + $lb, + $this->getBlobStore(), + $cache, + MediaWikiServices::getInstance()->getCommentStore() + ); return $blobStore; } @@ -586,6 +616,8 @@ class RevisionTest extends MediaWikiTestCase { * @covers Revision::loadFromTitle */ public function testLoadFromTitle() { + $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD ); + $this->overrideMwServices(); $title = $this->getMockTitle(); $conditions = [ @@ -860,6 +892,24 @@ class RevisionTest extends MediaWikiTestCase { ); } + private function overrideCommentStore() { + $mockStore = $this->getMockBuilder( CommentStore::class ) + ->disableOriginalConstructor() + ->getMock(); + $mockStore->expects( $this->any() ) + ->method( 'getFields' ) + ->willReturn( [ 'commentstore' => 'fields' ] ); + $mockStore->expects( $this->any() ) + ->method( 'getJoin' ) + ->willReturn( [ + 'tables' => [ 'commentstore' => 'table' ], + 'fields' => [ 'commentstore' => 'field' ], + 'joins' => [ 'commentstore' => 'join' ], + ] ); + + $this->setService( 'CommentStore', $mockStore ); + } + public function provideSelectFields() { yield [ true, @@ -875,9 +925,7 @@ class RevisionTest extends MediaWikiTestCase { 'rev_len', 'rev_parent_id', 'rev_sha1', - 'rev_comment_text' => 'rev_comment', - 'rev_comment_data' => 'NULL', - 'rev_comment_cid' => 'NULL', + 'commentstore' => 'fields', 'rev_content_format', 'rev_content_model', ] @@ -896,9 +944,7 @@ class RevisionTest extends MediaWikiTestCase { 'rev_len', 'rev_parent_id', 'rev_sha1', - 'rev_comment_text' => 'rev_comment', - 'rev_comment_data' => 'NULL', - 'rev_comment_cid' => 'NULL', + 'commentstore' => 'fields', ] ]; } @@ -906,12 +952,11 @@ class RevisionTest extends MediaWikiTestCase { /** * @dataProvider provideSelectFields * @covers Revision::selectFields - * @todo a true unit test would mock CommentStore */ public function testSelectFields( $contentHandlerUseDB, $expected ) { $this->hideDeprecated( 'Revision::selectFields' ); $this->setMwGlobals( 'wgContentHandlerUseDB', $contentHandlerUseDB ); - $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD ); + $this->overrideCommentStore(); $this->assertEquals( $expected, Revision::selectFields() ); } @@ -932,9 +977,7 @@ class RevisionTest extends MediaWikiTestCase { 'ar_len', 'ar_parent_id', 'ar_sha1', - 'ar_comment_text' => 'ar_comment', - 'ar_comment_data' => 'NULL', - 'ar_comment_cid' => 'NULL', + 'commentstore' => 'fields', 'ar_content_format', 'ar_content_model', ] @@ -955,9 +998,7 @@ class RevisionTest extends MediaWikiTestCase { 'ar_len', 'ar_parent_id', 'ar_sha1', - 'ar_comment_text' => 'ar_comment', - 'ar_comment_data' => 'NULL', - 'ar_comment_cid' => 'NULL', + 'commentstore' => 'fields', ] ]; } @@ -965,12 +1006,11 @@ class RevisionTest extends MediaWikiTestCase { /** * @dataProvider provideSelectArchiveFields * @covers Revision::selectArchiveFields - * @todo a true unit test would mock CommentStore */ public function testSelectArchiveFields( $contentHandlerUseDB, $expected ) { $this->hideDeprecated( 'Revision::selectArchiveFields' ); $this->setMwGlobals( 'wgContentHandlerUseDB', $contentHandlerUseDB ); - $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD ); + $this->overrideCommentStore(); $this->assertEquals( $expected, Revision::selectArchiveFields() ); } @@ -1020,115 +1060,14 @@ class RevisionTest extends MediaWikiTestCase { } public function provideGetArchiveQueryInfo() { - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD' => [ - [ - 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD, - ], - [ - 'tables' => [ 'archive' ], - 'fields' => [ - 'ar_id', - 'ar_page_id', - 'ar_namespace', - 'ar_title', - 'ar_rev_id', - 'ar_text', - 'ar_text_id', - 'ar_timestamp', - 'ar_user_text', - 'ar_user', - 'ar_minor_edit', - 'ar_deleted', - 'ar_len', - 'ar_parent_id', - 'ar_sha1', - 'ar_comment_text' => 'ar_comment', - 'ar_comment_data' => 'NULL', - 'ar_comment_cid' => 'NULL', - ], - 'joins' => [], - ] - ]; - yield 'wgContentHandlerUseDB true, wgCommentTableSchemaMigrationStage OLD' => [ - [ - 'wgContentHandlerUseDB' => true, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD, - ], - [ - 'tables' => [ 'archive' ], - 'fields' => [ - 'ar_id', - 'ar_page_id', - 'ar_namespace', - 'ar_title', - 'ar_rev_id', - 'ar_text', - 'ar_text_id', - 'ar_timestamp', - 'ar_user_text', - 'ar_user', - 'ar_minor_edit', - 'ar_deleted', - 'ar_len', - 'ar_parent_id', - 'ar_sha1', - 'ar_comment_text' => 'ar_comment', - 'ar_comment_data' => 'NULL', - 'ar_comment_cid' => 'NULL', - 'ar_content_format', - 'ar_content_model', - ], - 'joins' => [], - ] - ]; - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage WRITE_BOTH' => [ - [ - 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH, - ], - [ - 'tables' => [ - 'archive', - 'comment_ar_comment' => 'comment', - ], - 'fields' => [ - 'ar_id', - 'ar_page_id', - 'ar_namespace', - 'ar_title', - 'ar_rev_id', - 'ar_text', - 'ar_text_id', - 'ar_timestamp', - 'ar_user_text', - 'ar_user', - 'ar_minor_edit', - 'ar_deleted', - 'ar_len', - 'ar_parent_id', - 'ar_sha1', - 'ar_comment_text' => 'COALESCE( comment_ar_comment.comment_text, ar_comment )', - 'ar_comment_data' => 'comment_ar_comment.comment_data', - 'ar_comment_cid' => 'comment_ar_comment.comment_id', - ], - 'joins' => [ - 'comment_ar_comment' => [ - 'LEFT JOIN', - 'comment_ar_comment.comment_id = ar_comment_id', - ], - ], - ] - ]; - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage WRITE_NEW' => [ + yield 'wgContentHandlerUseDB false' => [ [ 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_NEW, ], [ 'tables' => [ 'archive', - 'comment_ar_comment' => 'comment', + 'commentstore' => 'table', ], 'fields' => [ 'ar_id', @@ -1146,27 +1085,19 @@ class RevisionTest extends MediaWikiTestCase { 'ar_len', 'ar_parent_id', 'ar_sha1', - 'ar_comment_text' => 'COALESCE( comment_ar_comment.comment_text, ar_comment )', - 'ar_comment_data' => 'comment_ar_comment.comment_data', - 'ar_comment_cid' => 'comment_ar_comment.comment_id', - ], - 'joins' => [ - 'comment_ar_comment' => [ - 'LEFT JOIN', - 'comment_ar_comment.comment_id = ar_comment_id', - ], + 'commentstore' => 'field' ], + 'joins' => [ 'commentstore' => 'join' ], ] ]; - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage NEW' => [ + yield 'wgContentHandlerUseDB true' => [ [ - 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_NEW, + 'wgContentHandlerUseDB' => true, ], [ 'tables' => [ 'archive', - 'comment_ar_comment' => 'comment', + 'commentstore' => 'table', ], 'fields' => [ 'ar_id', @@ -1184,16 +1115,11 @@ class RevisionTest extends MediaWikiTestCase { 'ar_len', 'ar_parent_id', 'ar_sha1', - 'ar_comment_text' => 'comment_ar_comment.comment_text', - 'ar_comment_data' => 'comment_ar_comment.comment_data', - 'ar_comment_cid' => 'comment_ar_comment.comment_id', - ], - 'joins' => [ - 'comment_ar_comment' => [ - 'JOIN', - 'comment_ar_comment.comment_id = ar_comment_id', - ], + 'commentstore' => 'field', + 'ar_content_format', + 'ar_content_model', ], + 'joins' => [ 'commentstore' => 'join' ], ] ]; } @@ -1204,11 +1130,11 @@ class RevisionTest extends MediaWikiTestCase { */ public function testGetArchiveQueryInfo( $globals, $expected ) { $this->setMwGlobals( $globals ); + $this->overrideCommentStore(); $revisionStore = $this->getRevisionStore(); $revisionStore->setContentHandlerUseDB( $globals['wgContentHandlerUseDB'] ); $this->setService( 'RevisionStore', $revisionStore ); - $this->assertEquals( $expected, Revision::getArchiveQueryInfo() @@ -1216,14 +1142,13 @@ class RevisionTest extends MediaWikiTestCase { } public function provideGetQueryInfo() { - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD, opts none' => [ + yield 'wgContentHandlerUseDB false, opts none' => [ [ 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD, ], [], [ - 'tables' => [ 'revision' ], + 'tables' => [ 'revision', 'commentstore' => 'table' ], 'fields' => [ 'rev_id', 'rev_page', @@ -1236,21 +1161,18 @@ class RevisionTest extends MediaWikiTestCase { 'rev_len', 'rev_parent_id', 'rev_sha1', - 'rev_comment_text' => 'rev_comment', - 'rev_comment_data' => 'NULL', - 'rev_comment_cid' => 'NULL', + 'commentstore' => 'field', ], - 'joins' => [], + 'joins' => [ 'commentstore' => 'join' ], ], ]; - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD, opts page' => [ + yield 'wgContentHandlerUseDB false, opts page' => [ [ 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD, ], [ 'page' ], [ - 'tables' => [ 'revision', 'page' ], + 'tables' => [ 'revision', 'commentstore' => 'table', 'page' ], 'fields' => [ 'rev_id', 'rev_page', @@ -1263,9 +1185,7 @@ class RevisionTest extends MediaWikiTestCase { 'rev_len', 'rev_parent_id', 'rev_sha1', - 'rev_comment_text' => 'rev_comment', - 'rev_comment_data' => 'NULL', - 'rev_comment_cid' => 'NULL', + 'commentstore' => 'field', 'page_namespace', 'page_title', 'page_id', @@ -1278,17 +1198,17 @@ class RevisionTest extends MediaWikiTestCase { 'INNER JOIN', [ 'page_id = rev_page' ], ], + 'commentstore' => 'join', ], ], ]; - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD, opts user' => [ + yield 'wgContentHandlerUseDB false, opts user' => [ [ 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD, ], [ 'user' ], [ - 'tables' => [ 'revision', 'user' ], + 'tables' => [ 'revision', 'commentstore' => 'table', 'user' ], 'fields' => [ 'rev_id', 'rev_page', @@ -1301,9 +1221,7 @@ class RevisionTest extends MediaWikiTestCase { 'rev_len', 'rev_parent_id', 'rev_sha1', - 'rev_comment_text' => 'rev_comment', - 'rev_comment_data' => 'NULL', - 'rev_comment_cid' => 'NULL', + 'commentstore' => 'field', 'user_name', ], 'joins' => [ @@ -1314,17 +1232,17 @@ class RevisionTest extends MediaWikiTestCase { 'user_id = rev_user', ], ], + 'commentstore' => 'join', ], ], ]; - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD, opts text' => [ + yield 'wgContentHandlerUseDB false, opts text' => [ [ 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD, ], [ 'text' ], [ - 'tables' => [ 'revision', 'text' ], + 'tables' => [ 'revision', 'commentstore' => 'table', 'text' ], 'fields' => [ 'rev_id', 'rev_page', @@ -1337,9 +1255,7 @@ class RevisionTest extends MediaWikiTestCase { 'rev_len', 'rev_parent_id', 'rev_sha1', - 'rev_comment_text' => 'rev_comment', - 'rev_comment_data' => 'NULL', - 'rev_comment_cid' => 'NULL', + 'commentstore' => 'field', 'old_text', 'old_flags', ], @@ -1348,17 +1264,17 @@ class RevisionTest extends MediaWikiTestCase { 'INNER JOIN', [ 'rev_text_id=old_id' ], ], + 'commentstore' => 'join', ], ], ]; - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage OLD, opts 3' => [ + yield 'wgContentHandlerUseDB false, opts 3' => [ [ 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD, ], [ 'text', 'page', 'user' ], [ - 'tables' => [ 'revision', 'page', 'user', 'text' ], + 'tables' => [ 'revision', 'commentstore' => 'table', 'page', 'user', 'text' ], 'fields' => [ 'rev_id', 'rev_page', @@ -1371,9 +1287,7 @@ class RevisionTest extends MediaWikiTestCase { 'rev_len', 'rev_parent_id', 'rev_sha1', - 'rev_comment_text' => 'rev_comment', - 'rev_comment_data' => 'NULL', - 'rev_comment_cid' => 'NULL', + 'commentstore' => 'field', 'page_namespace', 'page_title', 'page_id', @@ -1400,17 +1314,17 @@ class RevisionTest extends MediaWikiTestCase { 'INNER JOIN', [ 'rev_text_id=old_id' ], ], + 'commentstore' => 'join', ], ], ]; - yield 'wgContentHandlerUseDB true, wgCommentTableSchemaMigrationStage OLD, opts none' => [ + yield 'wgContentHandlerUseDB true, opts none' => [ [ 'wgContentHandlerUseDB' => true, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD, ], [], [ - 'tables' => [ 'revision' ], + 'tables' => [ 'revision', 'commentstore' => 'table' ], 'fields' => [ 'rev_id', 'rev_page', @@ -1423,133 +1337,11 @@ class RevisionTest extends MediaWikiTestCase { 'rev_len', 'rev_parent_id', 'rev_sha1', - 'rev_comment_text' => 'rev_comment', - 'rev_comment_data' => 'NULL', - 'rev_comment_cid' => 'NULL', + 'commentstore' => 'field', 'rev_content_format', 'rev_content_model', ], - 'joins' => [], - ], - ]; - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage WRITE_BOTH, opts none' => [ - [ - 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH, - ], - [], - [ - 'tables' => [ - 'revision', - 'temp_rev_comment' => 'revision_comment_temp', - 'comment_rev_comment' => 'comment', - ], - 'fields' => [ - 'rev_id', - 'rev_page', - 'rev_text_id', - 'rev_timestamp', - 'rev_user_text', - 'rev_user', - 'rev_minor_edit', - 'rev_deleted', - 'rev_len', - 'rev_parent_id', - 'rev_sha1', - 'rev_comment_text' => 'COALESCE( comment_rev_comment.comment_text, rev_comment )', - 'rev_comment_data' => 'comment_rev_comment.comment_data', - 'rev_comment_cid' => 'comment_rev_comment.comment_id', - ], - 'joins' => [ - 'temp_rev_comment' => [ - 'LEFT JOIN', - 'temp_rev_comment.revcomment_rev = rev_id', - ], - 'comment_rev_comment' => [ - 'LEFT JOIN', - 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id', - ], - ], - ], - ]; - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage WRITE_NEW, opts none' => [ - [ - 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_NEW, - ], - [], - [ - 'tables' => [ - 'revision', - 'temp_rev_comment' => 'revision_comment_temp', - 'comment_rev_comment' => 'comment', - ], - 'fields' => [ - 'rev_id', - 'rev_page', - 'rev_text_id', - 'rev_timestamp', - 'rev_user_text', - 'rev_user', - 'rev_minor_edit', - 'rev_deleted', - 'rev_len', - 'rev_parent_id', - 'rev_sha1', - 'rev_comment_text' => 'COALESCE( comment_rev_comment.comment_text, rev_comment )', - 'rev_comment_data' => 'comment_rev_comment.comment_data', - 'rev_comment_cid' => 'comment_rev_comment.comment_id', - ], - 'joins' => [ - 'temp_rev_comment' => [ - 'LEFT JOIN', - 'temp_rev_comment.revcomment_rev = rev_id', - ], - 'comment_rev_comment' => [ - 'LEFT JOIN', - 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id', - ], - ], - ], - ]; - yield 'wgContentHandlerUseDB false, wgCommentTableSchemaMigrationStage NEW, opts none' => [ - [ - 'wgContentHandlerUseDB' => false, - 'wgCommentTableSchemaMigrationStage' => MIGRATION_NEW, - ], - [], - [ - 'tables' => [ - 'revision', - 'temp_rev_comment' => 'revision_comment_temp', - 'comment_rev_comment' => 'comment', - ], - 'fields' => [ - 'rev_id', - 'rev_page', - 'rev_text_id', - 'rev_timestamp', - 'rev_user_text', - 'rev_user', - 'rev_minor_edit', - 'rev_deleted', - 'rev_len', - 'rev_parent_id', - 'rev_sha1', - 'rev_comment_text' => 'comment_rev_comment.comment_text', - 'rev_comment_data' => 'comment_rev_comment.comment_data', - 'rev_comment_cid' => 'comment_rev_comment.comment_id', - ], - 'joins' => [ - 'temp_rev_comment' => [ - 'JOIN', - 'temp_rev_comment.revcomment_rev = rev_id', - ], - 'comment_rev_comment' => [ - 'JOIN', - 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id', - ], - ], + 'joins' => [ 'commentstore' => 'join' ], ], ]; } @@ -1560,6 +1352,7 @@ class RevisionTest extends MediaWikiTestCase { */ public function testGetQueryInfo( $globals, $options, $expected ) { $this->setMwGlobals( $globals ); + $this->overrideCommentStore(); $revisionStore = $this->getRevisionStore(); $revisionStore->setContentHandlerUseDB( $globals['wgContentHandlerUseDB'] );