X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FPageArchiveTest.php;h=623d4a65f173076eedd35586e24079ba1e10a269;hp=15b26c23e65779249a08932d9ed902df26f5bef8;hb=c1c0d243522d477799bb5ca325a100fa6a86a7fd;hpb=095a2a05b2aaccff26d7b871194a4edccd092707

diff --git a/tests/phpunit/includes/PageArchiveTest.php b/tests/phpunit/includes/PageArchiveTest.php
index 15b26c23e6..623d4a65f1 100644
--- a/tests/phpunit/includes/PageArchiveTest.php
+++ b/tests/phpunit/includes/PageArchiveTest.php
@@ -50,6 +50,10 @@ class PageArchiveTest extends MediaWikiTestCase {
 	protected function setUp() {
 		parent::setUp();
 
+		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
+		$this->setMwGlobals( 'wgActorTableSchemaMigrationStage', MIGRATION_OLD );
+		$this->overrideMwServices();
+
 		// First create our dummy page
 		$page = Title::newFromText( 'PageArchiveTest_thePage' );
 		$page = new WikiPage( $page );
@@ -84,28 +88,44 @@ class PageArchiveTest extends MediaWikiTestCase {
 	public function testUndeleteRevisions() {
 		// First make sure old revisions are archived
 		$dbr = wfGetDB( DB_REPLICA );
-		$res = $dbr->select( 'archive', '*', [ 'ar_rev_id' => $this->ipRevId ] );
+		$arQuery = Revision::getArchiveQueryInfo();
+		$res = $dbr->select(
+			$arQuery['tables'],
+			$arQuery['fields'],
+			[ 'ar_rev_id' => $this->ipRevId ],
+			__METHOD__,
+			[],
+			$arQuery['joins']
+		);
 		$row = $res->fetchObject();
 		$this->assertEquals( $this->ipEditor, $row->ar_user_text );
 
 		// Should not be in revision
-		$res = $dbr->select( 'revision', '*', [ 'rev_id' => $this->ipRevId ] );
+		$res = $dbr->select( 'revision', '1', [ 'rev_id' => $this->ipRevId ] );
 		$this->assertFalse( $res->fetchObject() );
 
 		// Should not be in ip_changes
-		$res = $dbr->select( 'ip_changes', '*', [ 'ipc_rev_id' => $this->ipRevId ] );
+		$res = $dbr->select( 'ip_changes', '1', [ 'ipc_rev_id' => $this->ipRevId ] );
 		$this->assertFalse( $res->fetchObject() );
 
 		// Restore the page
 		$this->archivedPage->undelete( [] );
 
 		// Should be back in revision
-		$res = $dbr->select( 'revision', '*', [ 'rev_id' => $this->ipRevId ] );
+		$revQuery = Revision::getQueryInfo();
+		$res = $dbr->select(
+			$revQuery['tables'],
+			$revQuery['fields'],
+			[ 'rev_id' => $this->ipRevId ],
+			__METHOD__,
+			[],
+			$revQuery['joins']
+		);
 		$row = $res->fetchObject();
 		$this->assertEquals( $this->ipEditor, $row->rev_user_text );
 
 		// Should be back in ip_changes
-		$res = $dbr->select( 'ip_changes', '*', [ 'ipc_rev_id' => $this->ipRevId ] );
+		$res = $dbr->select( 'ip_changes', [ 'ipc_hex' ], [ 'ipc_rev_id' => $this->ipRevId ] );
 		$row = $res->fetchObject();
 		$this->assertEquals( IP::toHex( $this->ipEditor ), $row->ipc_hex );
 	}
@@ -114,6 +134,9 @@ class PageArchiveTest extends MediaWikiTestCase {
 	 * @covers PageArchive::listRevisions
 	 */
 	public function testListRevisions() {
+		$this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
+		$this->overrideMwServices();
+
 		$revisions = $this->archivedPage->listRevisions();
 		$this->assertEquals( 2, $revisions->numRows() );
 
@@ -131,6 +154,7 @@ class PageArchiveTest extends MediaWikiTestCase {
 				'ar_minor_edit' => '0',
 				'ar_user' => '0',
 				'ar_user_text' => '2600:387:ed7:947e:8c16:a1ad:dd34:1dd7',
+				'ar_actor' => null,
 				'ar_len' => '11',
 				'ar_deleted' => '0',
 				'ar_rev_id' => '3',
@@ -145,7 +169,6 @@ class PageArchiveTest extends MediaWikiTestCase {
 				'ar_id' => '2',
 				'ar_namespace' => '0',
 				'ar_title' => 'PageArchiveTest_thePage',
-				'ar_text' => '',
 				'ar_text_id' => '3',
 				'ar_parent_id' => '2',
 			],
@@ -156,6 +179,7 @@ class PageArchiveTest extends MediaWikiTestCase {
 				'ar_minor_edit' => '0',
 				'ar_user' => '0',
 				'ar_user_text' => '127.0.0.1',
+				'ar_actor' => null,
 				'ar_len' => '7',
 				'ar_deleted' => '0',
 				'ar_rev_id' => '2',
@@ -170,7 +194,6 @@ class PageArchiveTest extends MediaWikiTestCase {
 				'ar_id' => '1',
 				'ar_namespace' => '0',
 				'ar_title' => 'PageArchiveTest_thePage',
-				'ar_text' => '',
 				'ar_text_id' => '2',
 				'ar_parent_id' => '0',
 			],